usergrid_iron 0.0.7 → 0.0.8

data/README.md

@@ -181,6 +181,10 @@ usergrid_iron/spec/spec_settings.yaml to match.)
 
 ## Release notes
 
+### 0.0.8
+* Bug fixes
+  1. better handling of paging
+
 ### 0.0.7
 * Bug fixes
   1. multiple_entities? should check data['list']

data/lib/usergrid/core/collection.rb

@@ -3,7 +3,6 @@ module Usergrid
     include Enumerable
 
     attr_accessor :iterator_follows_cursor
-    attr_reader :query_params
 
     def initialize(url, api_url, options={}, response=nil)
       super url, api_url, options, response
@@ -55,16 +54,16 @@ module Usergrid
     # options: 'reversed', 'start', 'cursor', 'limit', 'permission'
     def update_query(updates, query=nil, options={})
       options = options.symbolize_keys
-      @query_params = query ? options.merge({ql: query}) : options
-      self.put(updates, {params: @query_params })
+      query_params = query ? options.merge({ql: query}) : options
+      self.put(updates, {params: query_params })
       self
     end
 
     # options: 'reversed', 'start', 'cursor', 'limit', 'permission'
     def query(query=nil, options={})
       options = options.symbolize_keys
-      @query_params = query ? options.merge({ql: query}) : options
-      self.get({params: @query_params })
+      query_params = query ? options.merge({ql: query}) : options
+      self.get({params: query_params })
       self
     end
 
@@ -81,7 +80,19 @@ module Usergrid
     end
 
     def next_page
-      query(nil, @query_params.merge({cursor: cursor}))
+      query(nil, query_params.merge({cursor: cursor}))
+    end
+
+    protected
+
+    def query_params
+      params = {}
+      if response.data['params']
+        response.data['params'].each do |k,v|
+          params[k] = v[0]
+        end
+      end
+      params
     end
   end
 end

data/lib/usergrid/version.rb

@@ -1,3 +1,3 @@
 module Usergrid
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/usergrid/core/collection_spec.rb

@@ -8,6 +8,7 @@ describe Usergrid::Collection do
     @entity_data = (1..25).collect do |i|
       { name: "name_#{i}", value: "value_#{i+1}" }
     end
+    (1..3).each {|i| @entity_data[i]['three'] = 3}
     @collection.create_entities @entity_data
   end
 
@@ -63,10 +64,10 @@ describe Usergrid::Collection do
   end
 
   it "should be able to page forward by cursor" do
-    @collection.query nil, limit: 2
+    @collection.query 'select * where three = 3', limit: 2
     @collection.next_page
-    @collection.size.should eq 2
-    @collection[0].name.should eq @entity_data[2][:name]
+    @collection.size.should eq 1
+    @collection[0].name.should eq @entity_data[3][:name]
   end
 
   it "should be able to update based on a query" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usergrid_iron
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -149,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3136296998900059944
+      hash: -759495065477750704
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3136296998900059944
+      hash: -759495065477750704
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24