You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/18 17:20:40 UTC
[01/15] git commit: test for names with spaces
Repository: incubator-usergrid
Updated Branches:
refs/heads/master 5a7915c58 -> 24425d5e6
refs/heads/two-dot-o 72a9e7f3b -> 070f15bfb
refs/heads/usergrid-93 [deleted] e820f5b2d
refs/pull/73/merge [deleted] fefe1be32
refs/pull/74/merge [deleted] f9f8b6fea
refs/pull/75/merge 04ca48f81 -> 4ea778eae (forced update)
test for names with spaces
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6af732b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6af732b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6af732b9
Branch: refs/heads/master
Commit: 6af732b93fccbb9970b5b04a0988182eb069dcf0
Parents: 7ea7503
Author: Scott Ganyo <sc...@ganyo.com>
Authored: Wed Mar 12 16:06:09 2014 -0700
Committer: Scott Ganyo <sc...@ganyo.com>
Committed: Wed Mar 12 16:06:09 2014 -0700
----------------------------------------------------------------------
sdks/ruby-on-rails/spec/usergrid_ironhorse/base_spec.rb | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6af732b9/sdks/ruby-on-rails/spec/usergrid_ironhorse/base_spec.rb
----------------------------------------------------------------------
diff --git a/sdks/ruby-on-rails/spec/usergrid_ironhorse/base_spec.rb b/sdks/ruby-on-rails/spec/usergrid_ironhorse/base_spec.rb
index 92d5249..7fc911b 100644
--- a/sdks/ruby-on-rails/spec/usergrid_ironhorse/base_spec.rb
+++ b/sdks/ruby-on-rails/spec/usergrid_ironhorse/base_spec.rb
@@ -57,12 +57,14 @@ describe Usergrid::Ironhorse::Base do
end
it 'be created and destroyed' do
- foo = Foo.create name: 'foo2'
+ foo = Foo.create name: 'foo man'
foo.persisted?.should be_true
- foo.name.should eq 'foo2'
+ foo.name.should eq 'foo man'
+ foo = Foo.find_by_name 'foo man'
+ foo.should_not be_nil
foo.destroy.should be_true
foo.persisted?.should be_false
- foo = Foo.find_by_name 'foo2'
+ foo = Foo.find_by_name 'foo man'
foo.should be_nil
end
[04/15] git commit: lock down rails version to 3.2.x
Posted by sn...@apache.org.
lock down rails version to 3.2.x
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/746384c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/746384c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/746384c2
Branch: refs/pull/75/merge
Commit: 746384c269823132f3715a974f112e5b92df18df
Parents: 6af732b
Author: Scott Ganyo <sc...@ganyo.com>
Authored: Wed Mar 12 16:06:34 2014 -0700
Committer: Scott Ganyo <sc...@ganyo.com>
Committed: Wed Mar 12 16:06:34 2014 -0700
----------------------------------------------------------------------
sdks/ruby-on-rails/usergrid_ironhorse.gemspec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/746384c2/sdks/ruby-on-rails/usergrid_ironhorse.gemspec
----------------------------------------------------------------------
diff --git a/sdks/ruby-on-rails/usergrid_ironhorse.gemspec b/sdks/ruby-on-rails/usergrid_ironhorse.gemspec
index 62b8ed7..2f77151 100644
--- a/sdks/ruby-on-rails/usergrid_ironhorse.gemspec
+++ b/sdks/ruby-on-rails/usergrid_ironhorse.gemspec
@@ -19,8 +19,8 @@ Gem::Specification.new do |gem|
gem.require_paths = ["lib"]
gem.add_dependency 'usergrid_iron', '0.9.1'
- gem.add_dependency 'activemodel'
- gem.add_dependency 'activerecord'
+ gem.add_dependency 'activemodel', '~> 3.2'
+ gem.add_dependency 'activerecord', '~> 3.2'
gem.add_dependency 'i18n'
gem.add_development_dependency 'rake'
[02/15] git commit: test for names with spaces
Posted by sn...@apache.org.
test for names with spaces
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6af732b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6af732b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6af732b9
Branch: refs/pull/75/merge
Commit: 6af732b93fccbb9970b5b04a0988182eb069dcf0
Parents: 7ea7503
Author: Scott Ganyo <sc...@ganyo.com>
Authored: Wed Mar 12 16:06:09 2014 -0700
Committer: Scott Ganyo <sc...@ganyo.com>
Committed: Wed Mar 12 16:06:09 2014 -0700
----------------------------------------------------------------------
sdks/ruby-on-rails/spec/usergrid_ironhorse/base_spec.rb | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6af732b9/sdks/ruby-on-rails/spec/usergrid_ironhorse/base_spec.rb
----------------------------------------------------------------------
diff --git a/sdks/ruby-on-rails/spec/usergrid_ironhorse/base_spec.rb b/sdks/ruby-on-rails/spec/usergrid_ironhorse/base_spec.rb
index 92d5249..7fc911b 100644
--- a/sdks/ruby-on-rails/spec/usergrid_ironhorse/base_spec.rb
+++ b/sdks/ruby-on-rails/spec/usergrid_ironhorse/base_spec.rb
@@ -57,12 +57,14 @@ describe Usergrid::Ironhorse::Base do
end
it 'be created and destroyed' do
- foo = Foo.create name: 'foo2'
+ foo = Foo.create name: 'foo man'
foo.persisted?.should be_true
- foo.name.should eq 'foo2'
+ foo.name.should eq 'foo man'
+ foo = Foo.find_by_name 'foo man'
+ foo.should_not be_nil
foo.destroy.should be_true
foo.persisted?.should be_false
- foo = Foo.find_by_name 'foo2'
+ foo = Foo.find_by_name 'foo man'
foo.should be_nil
end
[14/15] git commit: Merge pull request #73 from usergrid/usergrid-93
Posted by sn...@apache.org.
Merge pull request #73 from usergrid/usergrid-93
Usergrid 93
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/24425d5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/24425d5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/24425d5e
Branch: refs/pull/75/merge
Commit: 24425d5e61fabb08e632fcfbdfbb423b7ff6acaa
Parents: 5a7915c e820f5b
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Mar 18 09:05:45 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Mar 18 09:05:45 2014 -0700
----------------------------------------------------------------------
.../lib/usergrid_ironhorse/query.rb | 30 ++++++++++++++------
.../lib/usergrid_ironhorse/version.rb | 2 +-
.../spec/usergrid_ironhorse/base_spec.rb | 8 ++++--
sdks/ruby-on-rails/usergrid_ironhorse.gemspec | 4 +--
4 files changed, 29 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[12/15] git commit: Merge pull request #74 from
GERey/Fix_Core_Entity_Tests
Posted by sn...@apache.org.
Merge pull request #74 from GERey/Fix_Core_Entity_Tests
Fixing tests so that they properly check obj serialization.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/070f15bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/070f15bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/070f15bf
Branch: refs/heads/two-dot-o
Commit: 070f15bfb8ad0ca39d8515e27fcbf7c373d3ed99
Parents: 72a9e7f b6304a5
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Mar 18 09:04:06 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Mar 18 09:04:06 2014 -0700
----------------------------------------------------------------------
...MvccEntitySerializationStrategyImplTest.java | 57 ++++++++++----------
1 file changed, 28 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
[05/15] git commit: fix issue with find_by using exclamation point
Posted by sn...@apache.org.
fix issue with find_by using exclamation point
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6ab616b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6ab616b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6ab616b0
Branch: refs/pull/75/merge
Commit: 6ab616b0c2a1d6743f1825b1b65a09bd0892e893
Parents: 746384c
Author: Scott Ganyo <sc...@ganyo.com>
Authored: Wed Mar 12 16:07:05 2014 -0700
Committer: Scott Ganyo <sc...@ganyo.com>
Committed: Wed Mar 12 16:07:05 2014 -0700
----------------------------------------------------------------------
sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6ab616b0/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
----------------------------------------------------------------------
diff --git a/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb b/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
index 5945857..6868257 100644
--- a/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
+++ b/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
@@ -333,6 +333,12 @@ module Usergrid
def method_missing(method_name, *args)
method = method_name.to_s
+
+ if method.end_with? '!'
+ method.chop!
+ error_on_empty = true
+ end
+
if method.start_with? 'find_all_by_'
attribs = method.gsub /^find_all_by_/, ''
elsif method.start_with? 'find_by_'
@@ -350,11 +356,6 @@ module Usergrid
super
end
- if method.end_with? '!'
- method.chop!
- error_on_empty = true
- end
-
attribs = attribs.split '_and_'
conditions = {}
attribs.each { |attr| conditions[attr] = args.shift }
@@ -892,7 +893,7 @@ module Usergrid
return if loaded?
begin
@response = run_query
- @records = @response.entities.collect {|r| @model_class.model_name.constantize.new(r.data)}
+ @records = @response.entities.collect {|r| @model_class.model_name.constantize.new(r.data)}
rescue RestClient::ResourceNotFound
@records = []
end
[13/15] git commit: Merge pull request #73 from usergrid/usergrid-93
Posted by sn...@apache.org.
Merge pull request #73 from usergrid/usergrid-93
Usergrid 93
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/24425d5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/24425d5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/24425d5e
Branch: refs/heads/master
Commit: 24425d5e61fabb08e632fcfbdfbb423b7ff6acaa
Parents: 5a7915c e820f5b
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Mar 18 09:05:45 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Mar 18 09:05:45 2014 -0700
----------------------------------------------------------------------
.../lib/usergrid_ironhorse/query.rb | 30 ++++++++++++++------
.../lib/usergrid_ironhorse/version.rb | 2 +-
.../spec/usergrid_ironhorse/base_spec.rb | 8 ++++--
sdks/ruby-on-rails/usergrid_ironhorse.gemspec | 4 +--
4 files changed, 29 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[15/15] git commit: Merge c0d8fed0ff81c03606d2c4450a3261825234af12
into 24425d5e61fabb08e632fcfbdfbb423b7ff6acaa
Posted by sn...@apache.org.
Merge c0d8fed0ff81c03606d2c4450a3261825234af12 into 24425d5e61fabb08e632fcfbdfbb423b7ff6acaa
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4ea778ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4ea778ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4ea778ea
Branch: refs/pull/75/merge
Commit: 4ea778eae5c3ecf63419cf17cfef76d535d7e66b
Parents: 24425d5 c0d8fed
Author: Sungju Jin <su...@softwaregeeks.org>
Authored: Tue Mar 18 16:06:04 2014 +0000
Committer: Sungju Jin <su...@softwaregeeks.org>
Committed: Tue Mar 18 16:06:04 2014 +0000
----------------------------------------------------------------------
stack/pom.xml | 2 +-
.../security/providers/AbstractProvider.java | 14 +--
.../security/providers/FacebookProvider.java | 96 ++++++++++----
.../security/providers/FoursquareProvider.java | 58 +++++----
.../providers/PingIdentityProvider.java | 13 +-
.../providers/SignInProviderFactory.java | 12 +-
.../resources/usergrid-services-context.xml | 125 +++++++++++--------
7 files changed, 196 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
[06/15] git commit: fix issue with find_by using exclamation point
Posted by sn...@apache.org.
fix issue with find_by using exclamation point
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6ab616b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6ab616b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6ab616b0
Branch: refs/heads/master
Commit: 6ab616b0c2a1d6743f1825b1b65a09bd0892e893
Parents: 746384c
Author: Scott Ganyo <sc...@ganyo.com>
Authored: Wed Mar 12 16:07:05 2014 -0700
Committer: Scott Ganyo <sc...@ganyo.com>
Committed: Wed Mar 12 16:07:05 2014 -0700
----------------------------------------------------------------------
sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6ab616b0/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
----------------------------------------------------------------------
diff --git a/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb b/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
index 5945857..6868257 100644
--- a/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
+++ b/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
@@ -333,6 +333,12 @@ module Usergrid
def method_missing(method_name, *args)
method = method_name.to_s
+
+ if method.end_with? '!'
+ method.chop!
+ error_on_empty = true
+ end
+
if method.start_with? 'find_all_by_'
attribs = method.gsub /^find_all_by_/, ''
elsif method.start_with? 'find_by_'
@@ -350,11 +356,6 @@ module Usergrid
super
end
- if method.end_with? '!'
- method.chop!
- error_on_empty = true
- end
-
attribs = attribs.split '_and_'
conditions = {}
attribs.each { |attr| conditions[attr] = args.shift }
@@ -892,7 +893,7 @@ module Usergrid
return if loaded?
begin
@response = run_query
- @records = @response.entities.collect {|r| @model_class.model_name.constantize.new(r.data)}
+ @records = @response.entities.collect {|r| @model_class.model_name.constantize.new(r.data)}
rescue RestClient::ResourceNotFound
@records = []
end
[09/15] git commit: prepare new version
Posted by sn...@apache.org.
prepare new version
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e820f5b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e820f5b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e820f5b2
Branch: refs/heads/master
Commit: e820f5b2dadb613d4a73ab583c27091bffc96379
Parents: 88f37ce
Author: Scott Ganyo <sc...@ganyo.com>
Authored: Wed Mar 12 16:08:01 2014 -0700
Committer: Scott Ganyo <sc...@ganyo.com>
Committed: Wed Mar 12 16:08:01 2014 -0700
----------------------------------------------------------------------
sdks/ruby-on-rails/lib/usergrid_ironhorse/version.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e820f5b2/sdks/ruby-on-rails/lib/usergrid_ironhorse/version.rb
----------------------------------------------------------------------
diff --git a/sdks/ruby-on-rails/lib/usergrid_ironhorse/version.rb b/sdks/ruby-on-rails/lib/usergrid_ironhorse/version.rb
index 23d3598..6f80fd3 100644
--- a/sdks/ruby-on-rails/lib/usergrid_ironhorse/version.rb
+++ b/sdks/ruby-on-rails/lib/usergrid_ironhorse/version.rb
@@ -1,5 +1,5 @@
module Usergrid
module Ironhorse
- VERSION = '0.1.1'
+ VERSION = '0.1.2'
end
end
[08/15] git commit: fix issue with querying specific fields instead
of entire object
Posted by sn...@apache.org.
fix issue with querying specific fields instead of entire object
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/88f37ce6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/88f37ce6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/88f37ce6
Branch: refs/heads/master
Commit: 88f37ce60306321b36f3cd4c9c83533c5b41d785
Parents: 6ab616b
Author: Scott Ganyo <sc...@ganyo.com>
Authored: Wed Mar 12 16:07:34 2014 -0700
Committer: Scott Ganyo <sc...@ganyo.com>
Committed: Wed Mar 12 16:07:34 2014 -0700
----------------------------------------------------------------------
sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/88f37ce6/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
----------------------------------------------------------------------
diff --git a/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb b/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
index 6868257..f9db153 100644
--- a/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
+++ b/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
@@ -542,9 +542,9 @@ module Usergrid
where(conditions).delete_all
else
pluck :uuid
- response = run_query
- response.entities.each {|entity| entity.delete} # todo: can this be optimized into one call?
- response.entities.size
+ response = load
+ response.each {|entity| entity.delete} # todo: can this be optimized into one call?
+ response.size
end
end
@@ -893,7 +893,18 @@ module Usergrid
return if loaded?
begin
@response = run_query
+ if (!@options[:select] or @options[:select] == '*')
@records = @response.entities.collect {|r| @model_class.model_name.constantize.new(r.data)}
+ else # handle list
+ selects = @options[:select].split ','
+ @records = @response.entities.collect do |r|
+ data = {}
+ (0..selects.size).each do |i|
+ data[selects[i]] = r[i]
+ end
+ @model_class.model_name.constantize.new(data)
+ end
+ end
rescue RestClient::ResourceNotFound
@records = []
end
[07/15] git commit: fix issue with querying specific fields instead
of entire object
Posted by sn...@apache.org.
fix issue with querying specific fields instead of entire object
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/88f37ce6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/88f37ce6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/88f37ce6
Branch: refs/pull/75/merge
Commit: 88f37ce60306321b36f3cd4c9c83533c5b41d785
Parents: 6ab616b
Author: Scott Ganyo <sc...@ganyo.com>
Authored: Wed Mar 12 16:07:34 2014 -0700
Committer: Scott Ganyo <sc...@ganyo.com>
Committed: Wed Mar 12 16:07:34 2014 -0700
----------------------------------------------------------------------
sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/88f37ce6/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
----------------------------------------------------------------------
diff --git a/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb b/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
index 6868257..f9db153 100644
--- a/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
+++ b/sdks/ruby-on-rails/lib/usergrid_ironhorse/query.rb
@@ -542,9 +542,9 @@ module Usergrid
where(conditions).delete_all
else
pluck :uuid
- response = run_query
- response.entities.each {|entity| entity.delete} # todo: can this be optimized into one call?
- response.entities.size
+ response = load
+ response.each {|entity| entity.delete} # todo: can this be optimized into one call?
+ response.size
end
end
@@ -893,7 +893,18 @@ module Usergrid
return if loaded?
begin
@response = run_query
+ if (!@options[:select] or @options[:select] == '*')
@records = @response.entities.collect {|r| @model_class.model_name.constantize.new(r.data)}
+ else # handle list
+ selects = @options[:select].split ','
+ @records = @response.entities.collect do |r|
+ data = {}
+ (0..selects.size).each do |i|
+ data[selects[i]] = r[i]
+ end
+ @model_class.model_name.constantize.new(data)
+ end
+ end
rescue RestClient::ResourceNotFound
@records = []
end
[11/15] git commit: Fixing tests so that they properly check obj
serialization.
Posted by sn...@apache.org.
Fixing tests so that they properly check obj serialization.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b6304a51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b6304a51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b6304a51
Branch: refs/heads/two-dot-o
Commit: b6304a516b7bb9e93eacf0e4475f5f055364f312
Parents: 6979ae6
Author: grey <gr...@apigee.com>
Authored: Mon Mar 17 18:14:43 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Mar 17 18:14:43 2014 -0700
----------------------------------------------------------------------
...MvccEntitySerializationStrategyImplTest.java | 57 ++++++++++----------
1 file changed, 28 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b6304a51/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
index 5375ead..f8a51b3 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
@@ -52,7 +52,6 @@ import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertFalse;
import static junit.framework.TestCase.assertNotNull;
import static junit.framework.TestCase.assertNull;
-import static junit.framework.TestCase.assertSame;
import static junit.framework.TestCase.assertTrue;
import static org.mockito.Mockito.mock;
@@ -160,36 +159,36 @@ public class MvccEntitySerializationStrategyImplTest {
assertEquals( "Mvcc entities are the same", saved, returned );
- assertEquals( id, entity.getId() );
+ assertEquals( id, returned.getId() );
- Field<Boolean> boolFieldReturned = entity.getField( boolField.getName() );
+ Field<Boolean> boolFieldReturned = returned.getEntity().get().getField( boolField.getName() );
- assertSame( boolField, boolFieldReturned );
+ assertEquals( boolField, boolFieldReturned );
- Field<Double> doubleFieldReturned = entity.getField( doubleField.getName() );
+ Field<Double> doubleFieldReturned = returned.getEntity().get().getField( doubleField.getName() );
- assertSame( doubleField, doubleFieldReturned );
+ assertEquals( doubleField, doubleFieldReturned );
- Field<Integer> intFieldReturned = entity.getField( intField.getName() );
+ Field<Integer> intFieldReturned = returned.getEntity().get().getField( intField.getName() );
- assertSame( intField, intFieldReturned );
+ assertEquals( intField, intFieldReturned );
- Field<Long> longFieldReturned = entity.getField( longField.getName() );
+ Field<Long> longFieldReturned = returned.getEntity().get().getField( longField.getName() );
- assertSame( longField, longFieldReturned );
+ assertEquals( longField, longFieldReturned );
- Field<String> stringFieldReturned = entity.getField( stringField.getName() );
+ Field<String> stringFieldReturned = returned.getEntity().get().getField( stringField.getName() );
- assertSame( stringField, stringFieldReturned );
+ assertEquals( stringField, stringFieldReturned );
- Field<UUID> uuidFieldReturned = entity.getField( uuidField.getName() );
+ Field<UUID> uuidFieldReturned = returned.getEntity().get().getField( uuidField.getName() );
- assertSame( uuidField, uuidFieldReturned );
+ assertEquals( uuidField, uuidFieldReturned );
Set<Field> results = new HashSet<Field>();
- results.addAll( entity.getFields() );
+ results.addAll( returned.getEntity().get().getFields());
assertTrue( results.contains( boolField ) );
@@ -435,36 +434,36 @@ public class MvccEntitySerializationStrategyImplTest {
assertEquals( "Mvcc entities are the same", saved, returned );
- assertEquals( id, entity.getId() );
+ assertEquals( id, returned.getId() );
- Field<Boolean> boolFieldReturned = entity.getField( boolField.getName() );
+ Field<Boolean> boolFieldReturned = returned.getEntity().get().getField( boolField.getName() );
- assertSame( boolField, boolFieldReturned );
+ assertEquals( boolField, boolFieldReturned );
- Field<Double> doubleFieldReturned = entity.getField( doubleField.getName() );
+ Field<Double> doubleFieldReturned = returned.getEntity().get().getField( doubleField.getName() );
- assertSame( doubleField, doubleFieldReturned );
+ assertEquals( doubleField, doubleFieldReturned );
- Field<Integer> intFieldReturned = entity.getField( intField.getName() );
+ Field<Integer> intFieldReturned = returned.getEntity().get().getField( intField.getName() );
- assertSame( intField, intFieldReturned );
+ assertEquals( intField, intFieldReturned );
- Field<Long> longFieldReturned = entity.getField( longField.getName() );
+ Field<Long> longFieldReturned = returned.getEntity().get().getField( longField.getName() );
- assertSame( longField, longFieldReturned );
+ assertEquals( longField, longFieldReturned );
- Field<String> stringFieldReturned = entity.getField( stringField.getName() );
+ Field<String> stringFieldReturned = returned.getEntity().get().getField( stringField.getName() );
- assertSame( stringField, stringFieldReturned );
+ assertEquals( stringField, stringFieldReturned );
- Field<UUID> uuidFieldReturned = entity.getField( uuidField.getName() );
+ Field<UUID> uuidFieldReturned = returned.getEntity().get().getField( uuidField.getName() );
- assertSame( uuidField, uuidFieldReturned );
+ assertEquals( uuidField, uuidFieldReturned );
Set<Field> results = new HashSet<Field>();
- results.addAll( entity.getFields() );
+ results.addAll( returned.getEntity().get().getFields());
assertTrue( results.contains( boolField ) );
[03/15] git commit: lock down rails version to 3.2.x
Posted by sn...@apache.org.
lock down rails version to 3.2.x
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/746384c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/746384c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/746384c2
Branch: refs/heads/master
Commit: 746384c269823132f3715a974f112e5b92df18df
Parents: 6af732b
Author: Scott Ganyo <sc...@ganyo.com>
Authored: Wed Mar 12 16:06:34 2014 -0700
Committer: Scott Ganyo <sc...@ganyo.com>
Committed: Wed Mar 12 16:06:34 2014 -0700
----------------------------------------------------------------------
sdks/ruby-on-rails/usergrid_ironhorse.gemspec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/746384c2/sdks/ruby-on-rails/usergrid_ironhorse.gemspec
----------------------------------------------------------------------
diff --git a/sdks/ruby-on-rails/usergrid_ironhorse.gemspec b/sdks/ruby-on-rails/usergrid_ironhorse.gemspec
index 62b8ed7..2f77151 100644
--- a/sdks/ruby-on-rails/usergrid_ironhorse.gemspec
+++ b/sdks/ruby-on-rails/usergrid_ironhorse.gemspec
@@ -19,8 +19,8 @@ Gem::Specification.new do |gem|
gem.require_paths = ["lib"]
gem.add_dependency 'usergrid_iron', '0.9.1'
- gem.add_dependency 'activemodel'
- gem.add_dependency 'activerecord'
+ gem.add_dependency 'activemodel', '~> 3.2'
+ gem.add_dependency 'activerecord', '~> 3.2'
gem.add_dependency 'i18n'
gem.add_development_dependency 'rake'
[10/15] git commit: prepare new version
Posted by sn...@apache.org.
prepare new version
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e820f5b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e820f5b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e820f5b2
Branch: refs/pull/75/merge
Commit: e820f5b2dadb613d4a73ab583c27091bffc96379
Parents: 88f37ce
Author: Scott Ganyo <sc...@ganyo.com>
Authored: Wed Mar 12 16:08:01 2014 -0700
Committer: Scott Ganyo <sc...@ganyo.com>
Committed: Wed Mar 12 16:08:01 2014 -0700
----------------------------------------------------------------------
sdks/ruby-on-rails/lib/usergrid_ironhorse/version.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e820f5b2/sdks/ruby-on-rails/lib/usergrid_ironhorse/version.rb
----------------------------------------------------------------------
diff --git a/sdks/ruby-on-rails/lib/usergrid_ironhorse/version.rb b/sdks/ruby-on-rails/lib/usergrid_ironhorse/version.rb
index 23d3598..6f80fd3 100644
--- a/sdks/ruby-on-rails/lib/usergrid_ironhorse/version.rb
+++ b/sdks/ruby-on-rails/lib/usergrid_ironhorse/version.rb
@@ -1,5 +1,5 @@
module Usergrid
module Ironhorse
- VERSION = '0.1.1'
+ VERSION = '0.1.2'
end
end