usergrid_ironhorse 0.0.5 → 0.1.0

data/README.md

@@ -149,6 +149,15 @@ usergrid_ironhorse/spec/spec_settings.yaml to match.)
 
 ## Release notes
 
+### 0.1.0
+* New Features
+  1. next_page() added to return the next page of results from the server. An example of this used in conjunction
+     with to_a() is in base_spec.rb (see "should be able to page through results").
+* Incompatible changes
+  1. each() iteration will now transparently cross page boundaries (as generally expected by Rails users).
+     You may use limit(n) to restrict the result set, but note that limit will retrieve the number of entities
+     specified as a single batch (no paging).
+
 ### 0.0.5
 * New Features
   1. support MassAssignmentSecurity (attr_accessible & attr_protected)

data/lib/usergrid_ironhorse/base.rb

@@ -192,7 +192,7 @@ module Usergrid
       # reflect that no changes should be made (since they can't be
       # persisted). Returns the frozen instance.
       #
-      # The row is simply removed with an SQL +DELETE+ statement on the
+      # The row is simply removed with a +DELETE+ statement on the
       # record's primary key, and no callbacks are executed.
       #
       # To enforce the object's +before_destroy+ and +after_destroy+

data/lib/usergrid_ironhorse/query.rb

@@ -128,6 +128,17 @@ module Usergrid
 
       def each
         to_a.each { |*block_args| yield(*block_args) }
+        while @response.data['cursor'] && !limit_value
+          next_page
+          to_a.each { |*block_args| yield(*block_args) }
+        end
+      end
+
+      def next_page
+        @options[:cursor] = @response.data['cursor']
+        @records = nil
+        load
+        self
       end
 
       # Returns +true+ if a record exists in the table that matches the +id+ or
@@ -859,6 +870,7 @@ module Usergrid
         options.merge!({:skip => @options[:skip].to_json}) if @options[:skip]
         options.merge!({:reversed => reversed?.to_json}) if reversed?
         options.merge!({:order => @options[:order]}) if @options[:order]
+        options.merge!({:cursor => @options[:cursor]}) if @options[:cursor]
         options
       end
 
@@ -879,8 +891,8 @@ module Usergrid
       def load
         return if loaded?
         begin
-          response = run_query
-          @records = response.entities.collect {|r| @model_class.model_name.constantize.new(r.data)}
+          @response = run_query
+          @records = @response.entities.collect {|r| @model_class.model_name.constantize.new(r.data)}
         rescue RestClient::ResourceNotFound
           @records = []
         end

data/lib/usergrid_ironhorse/version.rb

@@ -1,5 +1,5 @@
 module Usergrid
   module Ironhorse
-    VERSION = '0.0.5'
+    VERSION = '0.1.0'
   end
 end

data/spec/usergrid_ironhorse/base_spec.rb

@@ -16,7 +16,7 @@ describe Usergrid::Ironhorse::Base do
   after :all do
     @foo.delete
     @user.delete
-    #delete_application @application
+    #delete_application @application # not supported on server yet
   end
 
   class Foo < Usergrid::Ironhorse::Base; end
@@ -330,5 +330,47 @@ describe Usergrid::Ironhorse::Base do
       Foo._protected_attributes = nil
     end
 
+    it "should be able to page through results" do
+      bars = (1..15).collect do |i|
+        Bar.create! name: "name_#{i}", value: "value_#{i+1}"
+      end
+      query = Bar.all
+      page = query.to_a # first page
+      page.count.should eq 10
+      page = query.next_page # second page
+      count = 10
+      page.each do |bar|
+        bars[count].name.should eq bar.name
+        count += 1
+      end
+      count.should eq bars.count
+      bars.each {|bar| bar.delete}
+    end
+
+    it "should iterate past page boundaries" do
+      bars = (1..15).collect do |i|
+        Bar.create! name: "name_#{i}", value: "value_#{i+1}"
+      end
+      count = 0
+      Bar.all.each do |bar|
+        bars[count].name.should eq bar.name
+        count += 1
+      end
+      count.should eq bars.count
+      bars.each {|bar| bar.delete}
+    end
+
+    it "should honor limit" do
+      bars = (1..15).collect do |i|
+        Bar.create! name: "name_#{i}", value: "value_#{i+1}"
+      end
+      count = 0
+      Bar.limit(13).each do |bar|
+        bars[count].name.should eq bar.name
+        count += 1
+      end
+      count.should eq 13
+      bars.each {|bar| bar.delete}
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usergrid_ironhorse
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors: