ruby_odata 0.1.0 → 0.1.1

data/spec/query_builder_spec.rb

@@ -1,34 +1,98 @@
-require 'spec_helper'
+require "spec_helper"
 
 module OData
   describe QueryBuilder do
     describe "#initialize" do
-      it "handles additional parameters" do        
-        builder = QueryBuilder.new 'Products', { :x=>1, :y=>2 }
+      it "handles additional parameters" do
+        builder = QueryBuilder.new "Products", { :x=>1, :y=>2 }
         builder.query.should eq "Products?x=1&y=2"
       end
-      it "handles empty additional parameters" do        
-        builder = QueryBuilder.new 'Products'
+      it "handles empty additional parameters" do
+        builder = QueryBuilder.new "Products"
         builder.query.should eq "Products"
-      end      
-    end
-    describe "#query" do
-      it "should append additional parameters to the end" do
-        builder = QueryBuilder.new 'Products', { :x=>1, :y=>2 }
+      end
+      it "should append additional parameters to the end of the query" do
+        builder = QueryBuilder.new "Products", { :x=>1, :y=>2 }
         builder.top(10)
         builder.query.should eq "Products?$top=10&x=1&y=2"
       end
+    end
+
+    describe "#links" do
       it "should properly handle queries for links" do
-        builder = QueryBuilder.new 'Categories(1)'
-        builder.links('Products')
+        builder = QueryBuilder.new "Categories(1)"
+        builder.links("Products")
         builder.query.should eq "Categories(1)/$links/Products"
       end
       it "should properly handle queries for links with additional operations" do
-        builder = QueryBuilder.new 'Categories(1)'
-        builder.links('Products')
+        builder = QueryBuilder.new "Categories(1)"
+        builder.links("Products")
         builder.top(5)
         builder.query.should eq "Categories(1)/$links/Products?$top=5"
       end
+      it "should throw an execption if count was already called on the builder" do
+        builder = QueryBuilder.new "Categories(1)"
+        builder.count
+        lambda { builder.links("Products") }.should raise_error(OData::NotSupportedError, "You cannot call both the `links` method and the `count` method in the same query.")
+      end
+    end
+
+    describe "#count" do
+      it "should accept the count method" do
+        builder = QueryBuilder.new "Products"
+        lambda { builder.count }.should_not raise_error
+      end
+      it "should properly handle the count method" do
+        builder = QueryBuilder.new "Products"
+        builder.count
+        builder.query.should eq "Products/$count"
+      end
+      it "should properly handle the count method with additional operators" do
+        builder = QueryBuilder.new "Products"
+        builder.filter("Name eq 'Widget 1'")
+        builder.count
+        builder.query.should eq "Products/$count?$filter=Name+eq+%27Widget+1%27"
+      end
+      it "should throw an execption if links was already called on the builder" do
+        builder = QueryBuilder.new "Categories(1)"
+        builder.links("Products")
+        lambda { builder.count }.should raise_error(OData::NotSupportedError, "You cannot call both the `links` method and the `count` method in the same query.")
+      end
+    end
+
+    describe "#navigate" do
+      it "should allow a user to drill down into a navigaion property on an initial query" do
+        builder = QueryBuilder.new "Genres('Horror Movies')"
+        builder.navigate("Titles")
+        builder.filter("Name eq 'Halloween'")
+        builder.query.should eq "Genres('Horror%20Movies')/Titles?$filter=Name+eq+%27Halloween%27"
+      end
+      it "should allow for multiple levels of drill down" do
+        builder = QueryBuilder.new "Genres('Horror Movies')"
+        builder.navigate("Titles('6aBu')")
+        builder.navigate("Awards")
+        builder.filter("Type eq 'Afi'")
+        builder.query.should eq "Genres('Horror%20Movies')/Titles('6aBu')/Awards?$filter=Type+eq+%27Afi%27"
+      end
+      it "should allow for a drill down plus links" do
+        builder = QueryBuilder.new "Genres('Horror Movies')"
+        builder.navigate("Titles('6aBu')")
+        builder.links("Awards")
+        builder.query.should eq "Genres('Horror%20Movies')/Titles('6aBu')/$links/Awards"
+      end
+      it "should allow for a drill down plus count" do
+        builder = QueryBuilder.new "Genres('Horror Movies')"
+        builder.navigate("Titles")
+        builder.count
+        builder.query.should eq "Genres('Horror%20Movies')/Titles/$count"
+      end
+    end
+
+    describe "#query" do
+      it "should encode spaces in IDs" do
+        builder = QueryBuilder.new "Categories('Cool Stuff')"
+        builder.query.should eq "Categories('Cool%20Stuff')"
+      end
     end
   end
 end

data/spec/service_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 module OData
   describe Service do
     describe "#initialize" do
-      it "truncates passed in end slash from uri when making the request" do      
+      it "truncates passed in end slash from uri when making the request" do
         # Required for the build_classes method
         stub_request(:get, "http://test.com/test.svc/$metadata").
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/edmx_empty.xml", __FILE__)), :headers => {})
-        
+
         svc = OData::Service.new "http://test.com/test.svc/"
       end
       it "doesn't error with lowercase entities" do
@@ -16,10 +16,10 @@ module OData
         stub_request(:get, "http://test.com/test.svc/$metadata").
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/edmx_lowercase.xml", __FILE__)), :headers => {})
-        
+
         lambda { OData::Service.new "http://test.com/test.svc" }.should_not raise_error
       end
-      
+
       describe "additional query string parameters" do
         before(:each) do
           # Required for the build_classes method
@@ -52,7 +52,7 @@ module OData
       end
       it "should pass the parameters as part of a save" do
         svc = OData::Service.new "http://test.com/test.svc/", { :additional_params => { :x=>1, :y=>2 } }
-        new_flight = ZDemoFlight.new   
+        new_flight = ZDemoFlight.new
         svc.AddToflight_dataCollection(new_flight)
         svc.save_changes
         a_request(:post, "http://test.com/test.svc/flight_dataCollection?x=1&y=2").should have_been_made
@@ -75,9 +75,9 @@ module OData
       end
       it "should pass the parameters as part of a batch save" do
         svc = OData::Service.new "http://test.com/test.svc/", { :additional_params => { :x=>1, :y=>2 } }
-        new_flight = ZDemoFlight.new  
+        new_flight = ZDemoFlight.new
         svc.AddToflight_dataCollection(new_flight)
-        new_flight2 = ZDemoFlight.new  
+        new_flight2 = ZDemoFlight.new
         svc.AddToflight_dataCollection(new_flight2)
         svc.save_changes
         a_request(:post, "http://test.com/test.svc/$batch?x=1&y=2").should have_been_made
@@ -103,7 +103,7 @@ module OData
         a_request(:get, "http://test.com/test.svc/get_top_flight?x=1&y=2").should have_been_made
       end
     end
-    
+
     describe "lowercase collections" do
       before(:each) do
         # Required for the build_classes method
@@ -111,12 +111,12 @@ module OData
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/edmx_lowercase.xml", __FILE__)), :headers => {})
       end
-      
+
       it "should respond_to a lowercase collection" do
         svc = OData::Service.new "http://test.com/test.svc"
         svc.respond_to?('acronyms').should be_true
       end
-      
+
       it "should allow a lowercase collections to be queried" do
         svc = OData::Service.new "http://test.com/test.svc"
         lambda { svc.send('acronyms') }.should_not raise_error
@@ -142,19 +142,19 @@ module OData
         results.first.should be_a_kind_of(ZDemoFlight)
       end
     end
-  
+
     describe "collections, objects, metadata etc" do
       before(:each) do
         # Metadata
         stub_request(:get, "http://test.com/test.svc/$metadata").
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/feed_customization/edmx_feed_customization.xml", __FILE__)), :headers => {})
-        
+
         # Content - Products
         stub_request(:get, /http:\/\/test\.com\/test\.svc\/Products(?:.*)/).
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/feed_customization/result_feed_customization_products_expand.xml", __FILE__)), :headers => {})
-        
+
         # Content - Categories expanded Products
         stub_request(:get, /http:\/\/test\.com\/test\.svc\/Categories(?:.*)/).
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
@@ -208,9 +208,9 @@ module OData
             meta.nullable.should eq true
             meta.fc_target_path.should eq "SyndicationSummary"
             meta.fc_keep_in_content.should eq false
-          end        
-        end         
-        
+          end
+        end
+
         describe "single class" do
           it "should handle properties where a property is represented in the syndication title instead of the properties collection" do
             svc = OData::Service.new "http://test.com/test.svc/"
@@ -224,46 +224,46 @@ module OData
             results = svc.execute
             results.first.Description.should eq "Whole grain bread"
           end
-        end 
-        
+        end
+
         describe "expanded inline class" do
           it "should handle properties where a property is represented in the syndication title instead of the properties collection" do
             svc = OData::Service.new "http://test.com/test.svc/"
             svc.Categories
             results = svc.execute
-  
+
             beverages = results[1]
-  
+
             milk = beverages.Products.first
             milk.Name.should eq "Milk"
             milk.Description.should eq "Low fat milk"
-  
+
             lemonade = beverages.Products.last
             lemonade.Name.should eq "Pink Lemonade"
             lemonade.Description.should eq "36 Ounce Cans (Pack of 3)"
           end
         end
       end
-    
+
       describe "handling inline collections/properties" do
         it "should make plural named properties arrays and not a single class" do
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.Categories
           results = svc.execute
           food = results[0]
-          
+
           food.Products.should be_an Array
         end
-        
+
         it "should not make an array if the navigation property name is singular" do
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.Products
           results = svc.execute
           product = results.first
           product.Category.should_not be_an Array
-        end      
+        end
       end
-      
+
       describe "navigation properties" do
         it "should fill in PropertyMetadata for navigation properties" do
           svc = OData::Service.new "http://test.com/test.svc/"
@@ -271,27 +271,27 @@ module OData
         end
       end
     end
-  
+
     describe "single layer inheritance" do
       before(:each) do
         # Metadata
         stub_request(:get, "http://test.com/test.svc/$metadata").
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/inheritance/edmx_pluralsight.xml", __FILE__)), :headers => {})
-        
+
         # Content - Courses
         stub_request(:get, /http:\/\/test\.com\/test\.svc\/Courses(?:.*)/).
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/inheritance/result_pluralsight_courses.xml", __FILE__)), :headers => {})
       end
-      
+
       it "should build all inherited attributes" do
         OData::Service.new "http://test.com/test.svc/"
         methods = Course.instance_methods.reject {|m| Object.methods.index(m)}
-        
+
         # Ruby 1.9 uses symbols, and 1.8 uses strings, so this normalizes the data
         methods.map! {|m| m.to_sym}
-        
+
         methods.should include(:Title)
         methods.should include(:Description)
         methods.should include(:VideoLength)
@@ -319,7 +319,7 @@ module OData
         course.Category.should_not be_nil
       end
     end
-  
+
     describe "handling partial collections" do
       before(:each) do
         # Metadata
@@ -361,14 +361,14 @@ module OData
         results.count.should eq 3
       end
     end
-  
+
     describe "link queries" do
       before(:each) do
         # Required for the build_classes method
         stub_request(:get, /http:\/\/test\.com\/test\.svc\/\$metadata(?:\?.+)?/).
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/sample_service/edmx_categories_products.xml", __FILE__)), :headers => {})
-        
+
         stub_request(:get, "http://test.com/test.svc/Categories(1)/$links/Products").
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/links/result_links_query.xml", __FILE__)), :headers => {})
@@ -381,72 +381,72 @@ module OData
         results.first.should be_a_kind_of(URI)
         results[0].path.should eq "/SampleService/RubyOData.svc/Products(1)"
         results[1].path.should eq "/SampleService/RubyOData.svc/Products(2)"
-        results[2].path.should eq "/SampleService/RubyOData.svc/Products(3)"        
+        results[2].path.should eq "/SampleService/RubyOData.svc/Products(3)"
       end
     end
-    
+
     describe "sample service" do
       before(:each) do
         # Required for the build_classes method
         stub_request(:get, /http:\/\/test\.com\/test\.svc\/\$metadata(?:\?.+)?/).
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/sample_service/edmx_categories_products.xml", __FILE__)), :headers => {})
-        
+
         stub_request(:get, /http:\/\/test\.com\/test\.svc\/Products\(\d\)/).
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/sample_service/result_single_product.xml", __FILE__)), :headers => {})
-        
+
         stub_request(:get, /http:\/\/test\.com\/test\.svc\/Products\(\d{2,}\)/).
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/sample_service/result_single_product_not_found.xml", __FILE__)), :headers => {})
-        
+
         stub_request(:get, "http://test.com/test.svc/Products(1)/Category").
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/sample_service/result_single_category.xml", __FILE__)), :headers => {})
-        
+
         stub_request(:get, "http://test.com/test.svc/Categories(1)").
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/sample_service/result_single_category.xml", __FILE__)), :headers => {})
-        
+
         stub_request(:get, "http://test.com/test.svc/Categories(1)/Products").
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/sample_service/result_multiple_category_products.xml", __FILE__)), :headers => {})
-        
+
         stub_request(:post, "http://test.com/test.svc/Categories(1)/$links/Products").to_return(:status => 204)
         stub_request(:post, "http://test.com/test.svc/$batch").to_return(:status => 202)
       end
-            
+
       describe "lazy loading" do
         after(:each) do
           Object.send(:remove_const, 'Product') if Object.const_defined? 'Product'
           Object.send(:remove_const, 'Category') if Object.const_defined? 'Category'
         end
-        
+
         it "should have a load property method" do
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.should respond_to(:load_property)
         end
-      
+
         it "should throw an exception if the object isn't tracked" do
           svc = OData::Service.new "http://test.com/test.svc/"
           new_object = Product.new
-          lambda { svc.load_property(new_object, "Category") }.should raise_error(ArgumentError, "You cannot load a property on an entity that isn't tracked")
+          lambda { svc.load_property(new_object, "Category") }.should raise_error(NotSupportedError, "You cannot load a property on an entity that isn't tracked")
         end
-      
+
         it "should throw an exception if there isn't a method matching the navigation property passed in" do
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.Products(1)
           product = svc.execute.first
-          lambda { svc.load_property(product, "NoMatchingMethod") }.should raise_error(ArgumentError, "'NoMatchingMethod' is not a valid navigation property")        
+          lambda { svc.load_property(product, "NoMatchingMethod") }.should raise_error(ArgumentError, "'NoMatchingMethod' is not a valid navigation property")
         end
-      
+
         it "should throw an exception if the method passed in is a standard property (non-navigation)" do
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.Products(1)
           product = svc.execute.first
-          lambda { svc.load_property(product, "Name") }.should raise_error(ArgumentError, "'Name' is not a valid navigation property")        
+          lambda { svc.load_property(product, "Name") }.should raise_error(ArgumentError, "'Name' is not a valid navigation property")
         end
-      
+
         it "should fill a single navigation property" do
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.Products(1)
@@ -456,7 +456,7 @@ module OData
           product.Category.Id.should eq 1
           product.Category.Name.should eq 'Category 1'
         end
-      
+
         it "should fill a collection navigation property" do
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.Categories(1)
@@ -467,58 +467,58 @@ module OData
           category.Products[1].Id.should eq 2
         end
       end
-    
+
       describe "find, create, add, update, and delete" do
         after(:each) do
           Object.send(:remove_const, 'Product') if Object.const_defined? 'Product'
           Object.send(:remove_const, 'Category') if Object.const_defined? 'Category'
         end
-        
+
         it "should implement an AddTo method for collection" do
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.should respond_to :AddToCategories
           svc.should respond_to :AddToProducts
         end
-        
+
         it "should create objects with an initialize method that can build the object from a hash" do
           svc = OData::Service.new "http://test.com/test.svc/"
           product = Product.new 'Id' => 1000, 'Name' => 'New Product'
           product.Id.should eq 1000
           product.Name.should eq 'New Product'
         end
-        
+
         it "should create objects that rejects keys that don't have corresponding methods" do
           svc = OData::Service.new "http://test.com/test.svc/"
           lambda { Product.new 'NotAProperty' => true }.should raise_error NoMethodError
         end
-        
+
         it "should create objects that expose a properties class method that lists the properties for the object" do
           svc = OData::Service.new "http://test.com/test.svc/"
           Product.properties.should include 'Id'
           Product.properties.should include 'Name'
-          Product.properties.should include 'Category'          
+          Product.properties.should include 'Category'
         end
-        
+
         it "should have full metadata for a property returned from the properties method" do
           svc = OData::Service.new "http://test.com/test.svc/"
           Product.properties['Category'].should be_a PropertyMetadata
           Product.properties['Category'].nav_prop.should be_true
         end
-        
+
         it "should create objects that expose an id property" do
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.Products(1)
           product = svc.execute.first
           product.should respond_to :id
         end
-        
+
         it "should extract the id from the metadata" do
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.Products(1)
           product = svc.execute.first
           product.id.should eq 1
         end
-        
+
         describe "Class.first method" do
           it "should exist on the create server objects" do
             svc = OData::Service.new "http://test.com/test.svc/"
@@ -528,7 +528,7 @@ module OData
             svc = OData::Service.new "http://test.com/test.svc/"
             product = Product.first(nil)
             product.should be_nil
-          end          
+          end
           it "should return nil if an id isn't found" do
             svc = OData::Service.new "http://test.com/test.svc/"
             product = Product.first(1234567890)
@@ -541,29 +541,29 @@ module OData
           end
         end
       end
-      
+
       describe "namespaces" do
         after(:each) do
           VisoftInc::Sample::Models.send(:remove_const, 'Product')        if VisoftInc::Sample::Models.const_defined? 'Product'
           VisoftInc::Sample::Models.send(:remove_const, 'Category')       if VisoftInc::Sample::Models.const_defined? 'Category'
-          
+
           VisoftInc::Sample.send(:remove_const, 'Models')                 if VisoftInc::Sample.const_defined? 'Models'
-          VisoftInc.send(:remove_const, 'Sample')                         if VisoftInc.const_defined? 'Sample'          
+          VisoftInc.send(:remove_const, 'Sample')                         if VisoftInc.const_defined? 'Sample'
           Object.send(:remove_const, 'VisoftInc')                         if Object.const_defined? 'VisoftInc'
         end
-        
+
         it "should create models in the specified namespace if the option is set (using a .NET style namespace with dots)" do
           svc = OData::Service.new "http://test.com/test.svc/", { :namespace => 'VisoftInc.Sample.Models' }
           defined?(VisoftInc::Sample::Models::Product).nil?.should be_false, 'VisoftInc::Sample::Models::Product was expected to be defined, but was not'
           defined?(VisoftInc::Sample::Models::Category).nil?.should be_false, 'VisoftInc::Sample::Models::Category was expected to be defined, but was not'
         end
-        
+
         it "should create models in the specified namespace if the option is set (using Ruby style namespaces with double colons)" do
           svc = OData::Service.new "http://test.com/test.svc/", { :namespace => 'VisoftInc::Sample::Models' }
           defined?(VisoftInc::Sample::Models::Product).nil?.should be_false, 'VisoftInc::Sample::Models::Product was expected to be defined, but was not'
           defined?(VisoftInc::Sample::Models::Category).nil?.should be_false, 'VisoftInc::Sample::Models::Category was expected to be defined, but was not'
         end
-        
+
         it "should fill object defined in a namespace" do
           svc = OData::Service.new "http://test.com/test.svc/", { :namespace => 'VisoftInc::Sample::Models' }
           svc.Categories(1)
@@ -573,19 +573,19 @@ module OData
           category.Id.should eq 1
           category.Name.should eq 'Category 1'
         end
-        
+
         it "should fill the class_metadata hash" do
           svc = OData::Service.new "http://test.com/test.svc/", { :namespace => 'VisoftInc::Sample::Models' }
           svc.class_metadata.should_not be_empty
         end
-        
+
         it "should add a key (based on the name) for each property class_metadata hash" do
           svc = OData::Service.new "http://test.com/test.svc/", { :namespace => 'VisoftInc::Sample::Models' }
           svc.class_metadata['VisoftInc::Sample::Models::Product'].should have_key 'Id'
           svc.class_metadata['VisoftInc::Sample::Models::Product'].should have_key 'Name'
           svc.class_metadata['VisoftInc::Sample::Models::Product'].should have_key 'Description'
         end
-        
+
         it "should lazy load objects defined in a namespace" do
           svc = OData::Service.new "http://test.com/test.svc/", { :namespace => 'VisoftInc::Sample::Models' }
           svc.Categories(1)
@@ -593,7 +593,7 @@ module OData
           svc.load_property category, 'Products'
           category.Products.should_not be_nil
           category.Products.first.Id.should eq 1
-          category.Products.first.Name.should eq 'Widget 1'          
+          category.Products.first.Name.should eq 'Widget 1'
         end
       end
 
@@ -602,15 +602,15 @@ module OData
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.should respond_to(:add_link)
         end
-        
+
         it "shouldn't be allowed if a parent isn't tracked" do
           svc = OData::Service.new "http://test.com/test.svc/"
           category = Category.new :Name => 'New Category'
           property = nil # Not needed for this test
           product = nil # Not needed for this test
-          lambda { svc.add_link(category, property, product) }.should raise_error(ArgumentError, "You cannot add a link on an entity that isn't tracked (Category)")
+          lambda { svc.add_link(category, property, product) }.should raise_error(NotSupportedError, "You cannot add a link on an entity that isn't tracked (Category)")
         end
-        
+
         it "shouldn't be allowed if a property isn't found on the parent" do
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.Categories(1)
@@ -619,7 +619,7 @@ module OData
           product = nil # Not needed for this test
           lambda { svc.add_link(category, property, product) }.should raise_error(ArgumentError, "'NotAProperty' is not a valid navigation property for Category")
         end
-        
+
         it "shouldn't be allowed if a property isn't a navigation property on the parent" do
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.Categories(1)
@@ -628,16 +628,16 @@ module OData
           product = nil # Not needed for this test
           lambda { svc.add_link(category, property, product) }.should raise_error(ArgumentError, "'Name' is not a valid navigation property for Category")
         end
-        
+
         it "shouldn't be allowed if a child isn't tracked" do
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.Categories(1)
           category = svc.execute.first
           property = 'Products'
-          product = Product.new :Name => 'Widget 1' 
-          lambda { svc.add_link(category, property, product) }.should raise_error(ArgumentError, "You cannot add a link on a child entity that isn't tracked (Product)")
+          product = Product.new :Name => 'Widget 1'
+          lambda { svc.add_link(category, property, product) }.should raise_error(NotSupportedError, "You cannot add a link on a child entity that isn't tracked (Product)")
         end
-        
+
         it "should perform a post against the correct URL with the correct body on a single_save" do
           svc = OData::Service.new "http://test.com/test.svc/"
           svc.Categories(1)
@@ -705,7 +705,7 @@ module OData
       end
     end
   end
-    
+
   describe_private OData::Service do
     describe "parse value" do
       before(:each) do
@@ -714,7 +714,7 @@ module OData
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
         to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/edmx_empty.xml", __FILE__)), :headers => {})
       end
-      
+
       it "should not error on an 'out of range' date" do
         # This date was returned in the Netflix OData service and failed with an ArgumentError: out of range using 1.8.7 (2010-12-23 patchlevel 330) [i386-mingw32]
         svc = OData::Service.new "http://test.com/test.svc/"

data/spec/support/sample_service_matcher.rb

@@ -0,0 +1,15 @@
+require 'uri'
+
+module OData
+  module Support
+    class SampleServiceMatcher
+      def self.call(req1, req2)
+        regexp = /^(https?:\/\/(?:[^@]*@)?)[^:]*(:\d+\/.*$)/i
+        request1 = req1.uri.match(regexp)
+        request2 = req2.uri.match(regexp)
+
+        (request1[1] == request2[1]) && (request1[2] == request2[2])
+      end
+    end
+  end
+end