ruby_odata 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -108,4 +108,11 @@
     * Added the ability to pass in :rest_options to the service constructor within the options hash.
 
 * Bug Fixes
-    * Prevented `svc.load_property` from mutating the obj's metadata uri (thanks [@sillylogger](https://github.com/sillylogger))
+    * Prevented `svc.load_property` from mutating the obj's metadata uri (thanks [@sillylogger](https://github.com/sillylogger))
+
+### 0.1.3
+* Bug Fixes
+    * Persists the additional_params for partial calls (thanks [@levelboy](https://github.com/levelboy))
+
+* Other
+    * Specified v2.3.4 of the addressable gem since there was a bug when testing ruby_odata against Ruby 1.8.7

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010, Visoft, Inc.
+Copyright (c) 2010-2013, Visoft, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/lib/ruby_odata/service.rb

@@ -437,7 +437,11 @@ class Service
   def extract_partial(doc)
     next_links = doc.xpath('//atom:link[@rel="next"]', @ds_namespaces)
     @has_partial = next_links.any?
-    @next_uri = next_links[0]['href'] if @has_partial
+    if @has_partial
+      uri = Addressable::URI.parse(next_links[0]['href']) 
+      uri.query_values = uri.query_values.merge @additional_params unless @additional_params.empty?
+      @next_uri = uri.to_s
+    end
   end
 
   def handle_partial

data/lib/ruby_odata/version.rb

@@ -1,5 +1,5 @@
 # The ruby_odata namespace
 module OData
   # The current version of ruby_odata
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/ruby_odata.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "ruby-odata"
 
+  s.add_dependency("addressable", ">= 2.3.4")
   s.add_dependency("i18n", "~> 0.6.0")
   s.add_dependency("activesupport", ">= 3.0.0")
   s.add_dependency("rest-client", ">= 1.5.1")

data/spec/service_spec.rb

@@ -377,6 +377,31 @@ module OData
         end
         results.count.should eq 3
       end
+
+      context "with additional_params" do
+        before(:each) do
+          stub_request(:get, "http://test.com/test.svc/$metadata?extra_param=value").
+         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/partial/partial_feed_metadata.xml", __FILE__)), :headers => {})
+
+          stub_request(:get, "http://test.com/test.svc/Partials?extra_param=value").
+            with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+            to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/partial/partial_feed_part_1.xml", __FILE__)), :headers => {})
+
+          stub_request(:get, "http://test.com/test.svc/Partials?$skiptoken='ERNSH'&extra_param=value").
+            with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+            to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/partial/partial_feed_part_2.xml", __FILE__)), :headers => {})
+        end
+
+        it "should persist the additional parameters for the next call" do
+          svc = OData::Service.new("http://test.com/test.svc/", :eager_partial => false, :additional_params => { :extra_param => 'value' })
+          svc.Partials
+          svc.execute
+          svc.next
+
+          a_request(:get, "http://test.com/test.svc/Partials?$skiptoken='ERNSH'&extra_param=value").should have_been_made
+        end
+      end
     end
 
     describe "link queries" do
@@ -733,7 +758,7 @@ module OData
 
     describe "restful options" do
       it "should allow " do
-        
+
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_odata
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -472,7 +488,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 502212128112312954
+      hash: -2874722226866545325
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -481,10 +497,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 502212128112312954
+      hash: -2874722226866545325
 requirements: []
 rubyforge_project: ruby-odata
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby consumer of OData services.