odata 0.6.12 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2b1cbedefd8c14ecae1b82a025be819ecd665cc
-  data.tar.gz: 084b1252cb352ab62d9a29bed15f95024dde2bb8
+  metadata.gz: 5381f4aa68afa778f56be63dc9864b456ee57f7f
+  data.tar.gz: a7e006c5b4f2590811c9813bdc2123494c50e814
 SHA512:
-  metadata.gz: 22565266600b828544e8822776716acd28bd7b5c94b63ec2a0a1001228302df477b173d83cbbd2d6e86cabe5979b1bd7dba06fcddb7c5c0d82d08cc370cd29ee
-  data.tar.gz: 04924842bffb503814cabc780333c7a7e21fb1b2f81c32612114b824d703c651f3b029d50811a82236c7480a4e27482e143460c7417392de27280f6cc8f15eb3
+  metadata.gz: a01f153de7461a09772d1cb7a63dec351d511967dff9820b9458fa96e9bc0e174bdf11c5dd2a6de2fc1fc71be96e27852849cf8b792db41c34eb03c4997b41bb
+  data.tar.gz: 8341abe5d59bbfabf16473087ab32080f6193d3e85fe92174f98b9f51427498ab5fc8fd66742d45f293b453bc87dc9a923bc230dddc65c63edd9447feb68d489

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.6.13
+
+* Minor bug fix in OData::Query::Result#each implementation.
+
 ## 0.6.12
 
 * Minor bug fix in OData::Query::Result#each implementation.

data/lib/odata/query/result.rb

@@ -17,12 +17,10 @@ module OData
       # @param block [block] a block to evaluate
       # @return [OData::Entity] each entity in turn for the query result
       def each(&block)
+        process_results(&block)
         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)
+          process_results(&block)
         end
       end
 
@@ -39,6 +37,13 @@ module OData
         query.entity_set.entity_options
       end
 
+      def process_results(&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)
+        end
+      end
+
       def next_page
         doc = ::Nokogiri::XML(result.body)
         doc.remove_namespaces!

data/lib/odata/version.rb

@@ -1,3 +1,3 @@
 module OData
-  VERSION = '0.6.12'
+  VERSION = '0.6.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odata
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.13
 platform: ruby
 authors:
 - James Thompson