odata 0.6.10 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85ba94e38c8e98ac39b5473ce471f035d127f968
-  data.tar.gz: a7330a45e25e9aa0f3d3eded2a2859caae7710f0
+  metadata.gz: a572559e7706b0bef39c622c2e4b3a4b4e5a7b21
+  data.tar.gz: cf9f5a4a0afce81ef6c0eb9cf2f7df1ec47d2cd2
 SHA512:
-  metadata.gz: 634d49a0e0aa249d6666c3d9b73c4443643fbd1050508661894ff8a9598c359d4d9b03b1bc49b7191d6e458a3db36abfb3a8292ec9f1db733877a6d6efdacf9a
-  data.tar.gz: c4cc4de9202a0fc17c8aa0b69b63f49f2d0ec8c056cd7cea3b340c3c9d80ef15dadc7658e630e40e677d63771eeb999893d3b92f6a76e81d48d5033023f54f34
+  metadata.gz: 5afefdbeb87aa038ce5d4bfea737712d8afbcb87ddc4e6a240eda5213d5d2969491b953a86e1827b84bc885739a4d4ba871451971e7fe1892f5f391901337fe9
+  data.tar.gz: 614b2f640935183abb86acc1823c808605e067fc6e217413079a5e0e0256a777338904edea14ab9e24c628c0cf3b8377ae35be698c5645871eafb3f96dc2b176

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.6.11
+
+* Added logic to allow OData::Query::Result#each to handle paginated results.
+
 ## 0.6.10
 
 * Changed how associations behave with mulitiplicity of one.

data/lib/odata/query/result.rb

@@ -17,15 +17,19 @@ module OData
       # @param block [block] a block to evaluate
       # @return [OData::Entity] each entity in turn for the query result
       def each(&block)
-        service.find_entities(result).each do |entity_xml|
-          entity = OData::Entity.from_xml(entity_xml, entity_options)
-          block_given? ? block.call(entity) : yield(entity)
+        until next_page.nil?
+          service.find_entities(result).each do |entity_xml|
+            entity = OData::Entity.from_xml(entity_xml, entity_options)
+            block_given? ? block.call(entity) : yield(entity)
+          end
+          result = service.execute(next_page_url)
         end
       end
 
       private
 
-      attr_reader :query, :result
+      attr_reader :query
+      attr_accessor :result
 
       def service
         query.entity_set.service
@@ -34,6 +38,16 @@ module OData
       def entity_options
         query.entity_set.entity_options
       end
+
+      def next_page
+        doc = ::Nokogiri::XML(result.body)
+        doc.remove_namespaces!
+        doc.xpath("/feed/link[@rel='next']").first
+      end
+
+      def next_page_url
+        next_page.attributes['href'].gsub(service.service_url, '')
+      end
     end
   end
 end

data/lib/odata/version.rb

@@ -1,3 +1,3 @@
 module OData
-  VERSION = '0.6.10'
+  VERSION = '0.6.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odata
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors:
 - James Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler