ruby_odata 0.1.0 → 0.1.6

data/spec/revised_service_spec.rb

@@ -10,7 +10,7 @@ module OData
       @cat_prod_service = OData::Service.new "http://test.com/test.svc"
     end
     subject { @cat_prod_service }
-    
+
     context "methods" do
       it { should respond_to :update_object }
       it { should respond_to :delete_object }
@@ -25,7 +25,7 @@ module OData
       it { should respond_to :collections }
       it { should respond_to :options }
       it { should respond_to :function_imports }
-    
+
       context "after parsing metadata" do
         it { should respond_to :Products }
         it { should respond_to :Categories }
@@ -43,7 +43,7 @@ module OData
       end
       it "should expose the local model type" do
         subject['Products'][:type].should eq Product
-        subject['Categories'][:type].should eq Category                
+        subject['Categories'][:type].should eq Category
       end
     end
     context "class metadata" do
@@ -51,6 +51,7 @@ module OData
       it { should_not be_empty}
       it { should have_key 'Product' }
       it { should have_key 'Category' }
+
       context "should have keys for each property" do
         subject { @cat_prod_service.class_metadata['Category'] }
         it { should have_key 'Id' }
@@ -69,6 +70,7 @@ module OData
           meta.fc_target_path.should be_nil
           meta.fc_keep_in_content.should be_nil
           meta.nav_prop.should eq false
+          meta.is_key.should eq true
         end
         it "should have correct PropertyMetadata for Category.Name" do
           meta = subject['Name']
@@ -78,6 +80,7 @@ module OData
           meta.fc_target_path.should be_nil
           meta.fc_keep_in_content.should be_nil
           meta.nav_prop.should eq false
+          meta.is_key.should eq false
         end
         it "should have correct PropertyMetadata for Category.Products" do
           meta = subject['Products']
@@ -88,6 +91,7 @@ module OData
           meta.fc_keep_in_content.should be_nil
           meta.nav_prop.should eq true
           meta.association.should_not be_nil
+          meta.is_key.should eq false
         end
       end
     end
@@ -115,7 +119,7 @@ module OData
         subject['EntityCategoryWebGet'][:parameters].should be_nil
         subject['EntitySingleCategoryWebGet'][:parameters].should be_a Hash
         subject['EntitySingleCategoryWebGet'][:parameters]['id'].should eq 'Edm.Int32'
-      end     
+      end
       context "after parsing function imports" do
         subject { @cat_prod_service }
         it { should respond_to :CleanDatabaseForTesting }
@@ -152,10 +156,10 @@ module OData
         subject { @cat_prod_service }
         before(:each) do
           stub_request(:post, "http://test.com/test.svc/CleanDatabaseForTesting").to_return(:status => 204)
-          
+
           stub_request(:get, "http://test.com/test.svc/EntityCategoryWebGet").
           to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/sample_service/result_entity_category_web_get.xml", __FILE__)), :headers => {})
-          
+
           stub_request(:get, "http://test.com/test.svc/EntitySingleCategoryWebGet?id=1").
           to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/sample_service/result_entity_single_category_web_get.xml", __FILE__)), :headers => {})
 
@@ -194,4 +198,105 @@ module OData
       end
     end
   end
+
+  describe "Keys" do
+    describe "Collection with an int64 key Named 'id'" do
+
+      before(:all) do
+        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/int64_ids/edmx_car_service.xml", __FILE__)), :headers => {})
+        @svc = OData::Service.new "http://test.com/test.svc/"
+      end
+
+      context "has the correct metadata" do
+        before(:all) do
+          @id_meta = @svc.class_metadata['Car']['id']
+        end
+
+        subject { @id_meta }
+
+        its(:name)                { should eq('id') }
+        its(:type)                { should eq('Edm.Int64') }
+        its(:nullable)            { should be_false }
+        its(:fc_target_path)      { should be_nil }
+        its(:fc_keep_in_content)  { should be_nil }
+      end
+
+      context "can parse Id correctly" do
+        before(:each) do
+          stub_request(:get, "http://test.com/test.svc/Cars(213L)").
+            with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+            to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/int64_ids/result_cars.xml", __FILE__)), :headers => {})
+
+          @svc.Cars(213)
+          results = @svc.execute
+          @car = results.first
+        end
+
+        subject { @car }
+
+        its(:id)      { should eq(213) }
+        its(:color)   { should eq('peach') }
+      end
+    end
+
+    describe "Collection with an int64 key named 'KeyId'" do
+
+      before(:all) do
+        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/int64_ids/edmx_boat_service.xml", __FILE__)), :headers => {})
+        @svc = OData::Service.new "http://test.com/test.svc/"
+      end
+
+      context "has the correct metadata" do
+        before(:all) do
+          @id_meta = @svc.class_metadata['Boat']['KeyId']
+        end
+
+        subject { @id_meta }
+
+        its(:name)                { should eq('KeyId') }
+        its(:type)                { should eq('Edm.Int64') }
+        its(:nullable)            { should be_false }
+        its(:fc_target_path)      { should be_nil }
+        its(:fc_keep_in_content)  { should be_nil }
+      end
+
+      context "can parse Id correctly" do
+        before(:each) do
+          stub_request(:get, "http://test.com/test.svc/Boats(213L)").
+            with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+            to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/int64_ids/result_boats.xml", __FILE__)), :headers => {})
+
+          @svc.Boats(213)
+          results = @svc.execute
+          @boat = results.first
+        end
+
+        subject { @boat }
+
+        its(:id)      { should eq(213) }
+        its(:color)   { should eq('blue') }
+      end
+    end
+  end
+
+  describe "Dual Namespaces" do
+    before(:all) do
+      stub_request(:get, "http://xxxx%5Cyyyy:zzzz@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/ms_system_center/edmx_ms_system_center_v2.xml", __FILE__)), :headers => {})
+    end
+    after(:all) do
+      VMM.constants.each do |constant|
+        VMM.send :remove_const, constant
+      end
+    end
+
+    it "should parse the service without errors" do
+      lambda { OData::Service.new "http://test.com/test.svc/", { :username => "xxxx\\yyyy", :password=> "zzzz", :verify_ssl => false, :namespace => "VMM" } }.should_not raise_error
+    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
@@ -36,6 +36,23 @@ module OData
           a_request(:get, "http://test.com/test.svc/$metadata?x=1&y=2").should have_been_made
         end
       end
+
+      describe "rest-client options" 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/edmx_empty.xml", __FILE__)), :headers => {})
+        end
+        it "should accept in options that will be passed to the rest-client lib" do
+          svc = OData::Service.new "http://test.com/test.svc/", { :rest_options => { :ssl_ca_file => "ca_certificate.pem" } }
+          svc.options[:rest_options].should eq Hash[:ssl_ca_file => "ca_certificate.pem"]
+        end
+        it "should merge the rest options with the built in options" do
+          svc = OData::Service.new "http://test.com/test.svc/", { :rest_options => { :ssl_ca_file => "ca_certificate.pem" } }
+          svc.instance_variable_get(:@rest_options).should eq Hash[:verify_ssl => 1, :user => nil, :password => nil, :ssl_ca_file => "ca_certificate.pem"]
+        end
+      end
     end
     describe "additional query string parameters" do
       before(:each) do
@@ -52,7 +69,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 +92,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 +120,28 @@ module OData
         a_request(:get, "http://test.com/test.svc/get_top_flight?x=1&y=2").should have_been_made
       end
     end
-    
+
+    describe "exception handling" do
+      before(:each) do
+        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?$select=Price").
+        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+        to_return(:status => 400, :body => File.new(File.expand_path("../fixtures/error_without_message.xml", __FILE__)), :headers => {})
+      end
+
+      it "includes a generic message if the error is not in the response" do
+        svc = OData::Service.new "http://test.com/test.svc/"
+        svc.Categories.select "Price"
+        expect { svc.execute }.to raise_error(OData::ServiceError) { |error|
+          error.http_code.should eq 400
+          error.message.should eq "Server returned error but no message."
+        }
+      end
+    end
+
     describe "lowercase collections" do
       before(:each) do
         # Required for the build_classes method
@@ -111,12 +149,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 +180,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 +246,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 +262,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 +309,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 +357,7 @@ module OData
         course.Category.should_not be_nil
       end
     end
-  
+
     describe "handling partial collections" do
       before(:each) do
         # Metadata
@@ -360,15 +398,40 @@ 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
       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 +444,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 +519,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)
@@ -466,59 +529,68 @@ module OData
           category.Products[0].Id.should eq 1
           category.Products[1].Id.should eq 2
         end
+
+        it "should not mutate the object's metadata" do
+          svc = OData::Service.new "http://test.com/test.svc/"
+          svc.Products(1)
+          product = svc.execute.first
+          original_metadata = product.__metadata.to_json
+          svc.load_property(product, "Category")
+          product.__metadata.to_json.should == original_metadata
+        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 +600,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 +613,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 +645,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 +665,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 +674,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 +691,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 +700,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)
@@ -704,8 +776,240 @@ module OData
         end
       end
     end
+
+    describe "JSON serialization of objects" do
+      before(:each) do
+        # Required for the build_classes method
+        stub_request(:get, "http://blabla:@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/ms_system_center/edmx_ms_system_center.xml", __FILE__)), :headers => {})
+
+        stub_request(:get, "http://blabla:@test.com/test.svc/VirtualMachines").
+        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+        to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/ms_system_center/virtual_machines.xml", __FILE__)), :headers => {})
+        svc = OData::Service.new "http://test.com/test.svc/", { :username => "blabla", :password=> "", :verify_ssl => false, :namespace => "VMM" }
+        svc.VirtualMachines
+        results = svc.execute
+        @json = results.first.as_json
+      end
+
+      it "Should quote Edm.Int64 properties" do
+        @json["PerfDiskBytesWrite"].should be_a(String)
+      end
+
+      it "Should output collections with metadata" do
+        @json["VMNetworkAssignments"].should be_a(Hash)
+        @json["VMNetworkAssignments"].should have_key("__metadata")
+        @json["VMNetworkAssignments"]["__metadata"].should be_a(Hash)
+        @json["VMNetworkAssignments"]["__metadata"].should have_key("type")
+        @json["VMNetworkAssignments"]["__metadata"]["type"].should eq("Collection(VMM.VMNetworkAssignment)")
+        @json["VMNetworkAssignments"].should have_key("results")
+        @json["VMNetworkAssignments"]["results"].should be_a(Array)
+        @json["VMNetworkAssignments"]["results"].should eq([])
+      end
+    end
+
+    describe "handling of Microsoft System Center 2012" do
+      before(:each) do
+        # Required for the build_classes method
+        stub_request(:get, "http://blabla:@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/ms_system_center/edmx_ms_system_center.xml", __FILE__)), :headers => {})
+
+        stub_request(:get, "http://blabla:@test.com/test.svc/VirtualMachines").
+        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+        to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/ms_system_center/virtual_machines.xml", __FILE__)), :headers => {})
+
+        stub_request(:get, "http://blabla:@test.com/test.svc/HardwareProfiles?$filter=Memory%20eq%203500").
+        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+        to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/ms_system_center/hardware_profiles.xml", __FILE__)), :headers => {})
+
+        stub_request(:get, "http://blabla:@test.com/test.svc/VMTemplates").
+        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+        to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/ms_system_center/vm_templates.xml", __FILE__)), :headers => {})
+      end
+
+      after(:all) do
+        VMM.constants.each do |constant|
+          VMM.send :remove_const, constant
+        end
+      end
+
+      it "should successfully parse null valued string properties" do
+        svc = OData::Service.new "http://test.com/test.svc/", { :username => "blabla", :password=> "", :verify_ssl => false, :namespace => "VMM" }
+        svc.VirtualMachines
+        results = svc.execute
+        results.first.should be_a_kind_of(VMM::VirtualMachine)
+        results.first.CostCenter.should be_nil
+      end
+
+      it "should successfully return a virtual machine" do
+        svc = OData::Service.new "http://test.com/test.svc/", { :username => "blabla", :password=> "", :verify_ssl => false, :namespace => "VMM" }
+        svc.VirtualMachines
+        results = svc.execute
+        results.first.should be_a_kind_of(VMM::VirtualMachine)
+      end
+
+      it "should successfully return a hardware profile for results that include a collection of complex types" do
+        svc = OData::Service.new "http://test.com/test.svc/", { :username => "blabla", :password=> "", :verify_ssl => false, :namespace => "VMM" }
+        svc.HardwareProfiles.filter("Memory eq 3500")
+        results = svc.execute
+        results.first.should be_a_kind_of(VMM::HardwareProfile)
+      end
+
+      it "should successfully return a collection of complex types" do
+        svc = OData::Service.new "http://test.com/test.svc/", { :username => "blabla", :password=> "", :verify_ssl => false, :namespace => "VMM" }
+        svc.HardwareProfiles.filter("Memory eq 3500")
+        results = svc.execute
+        granted_list = results.first.GrantedToList
+        granted_list.should be_a_kind_of(Array)
+        granted_list.first.should be_a_kind_of(VMM::UserAndRole)
+        granted_list.first.RoleName.should == "Important Tenant"
+      end
+
+
+      it "should successfully return results that include a collection of Edm types" do
+        svc = OData::Service.new "http://test.com/test.svc/", { :username => "blabla", :password=> "", :verify_ssl => false, :namespace => "VMM" }
+        svc.VMTemplates
+        results = svc.execute
+        results.first.should be_a_kind_of(VMM::VMTemplate)
+      end
+
+      it "should successfully return a collection of Edm types" do
+        svc = OData::Service.new "http://test.com/test.svc/", { :username => "blabla", :password=> "", :verify_ssl => false, :namespace => "VMM" }
+        svc.VMTemplates
+        results = svc.execute
+        boot_order = results.first.BootOrder
+        boot_order.should be_a_kind_of(Array)
+        boot_order.first.should be_a_kind_of(String)
+        boot_order.should eq ['CD', 'IdeHardDrive', 'PxeBoot', 'Floppy']
+      end
+    end
+
+    describe "handling of nested expands" do
+      before(:each) do
+        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/nested_expands/edmx_northwind.xml", __FILE__)), :headers => {})
+
+        stub_request(:get, "http://test.com/test.svc/Products?$expand=Category,Category/Products&$top=2").
+        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+        to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/nested_expands/northwind_products_category_expands.xml", __FILE__)), :headers => {})
+      end
+
+      it "should successfully parse the results" do
+        svc = OData::Service.new "http://test.com/test.svc", { :namespace => "NW" }
+        svc.Products.expand('Category').expand('Category/Products').top(2)
+        lambda { svc.execute }.should_not raise_exception
+      end
+
+      it "should successfully parse a Category as a Category" do
+        svc = OData::Service.new "http://test.com/test.svc", { :namespace => "NW" }
+        svc.Products.expand('Category').expand('Category/Products').top(2)
+        products = svc.execute
+        products.first.Category.should be_a_kind_of(NW::Category)
+      end
+
+      it "should successfully parse the Category properties" do
+        svc = OData::Service.new "http://test.com/test.svc", { :namespace => "NW" }
+        svc.Products.expand('Category').expand('Category/Products').top(2)
+        products = svc.execute
+        products.first.Category.CategoryID.should eq 1
+      end
+
+      it "should successfully parse the Category children Products" do
+        svc = OData::Service.new "http://test.com/test.svc", { :namespace => "NW" }
+        svc.Products.expand('Category').expand('Category/Products').top(2)
+        products = svc.execute
+        products.first.Category.Products.length.should eq 12
+      end
+
+      it "should successfully parse the Category's child Product properties" do
+        svc = OData::Service.new "http://test.com/test.svc", { :namespace => "NW" }
+        svc.Products.expand('Category').expand('Category/Products').top(2)
+        products = svc.execute
+        products.first.Category.Products.first.ProductName.should eq "Chai"
+      end
+    end
+
+    describe "handling of custom select queries" do
+
+      context "when results are found" do
+        before(:each) do
+          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?$select=Name,Price").
+          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_select_products_name_price.xml", __FILE__)), :headers => {})
+        end
+
+        subject do
+          svc = OData::Service.new "http://test.com/test.svc/"
+          svc.Products.select "Name", "Price"
+          svc.execute
+        end
+
+        it { should be_an Array }
+        it { should_not be_empty }
+        its(:first) { should be_a Product }
+      end
+
+      context "when there isn't a property by the name specified" do
+        before(:each) do
+          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?$select=Price").
+          with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+          to_return(:status => 400, :body => File.new(File.expand_path("../fixtures/sample_service/result_select_categories_no_property.xml", __FILE__)), :headers => {})
+        end
+
+        it "raises an exception" do
+          svc = OData::Service.new "http://test.com/test.svc/"
+          svc.Categories.select "Price"
+          expect { svc.execute }.to raise_error(OData::ServiceError) { |error|
+            error.http_code.should eq 400
+            error.message.should eq "Type 'RubyODataService.Category' does not have a property named 'Price' or there is no type with 'Price' name."
+          }
+        end
+      end
+
+      context "when a property requires $expand to traverse" do
+        before(:each) do
+          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?$select=Name,Products/Name").
+          with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+          to_return(:status => 400, :body => File.new(File.expand_path("../fixtures/sample_service/result_select_categories_travsing_no_expand.xml", __FILE__)), :headers => {})
+
+          stub_request(:get, "http://test.com/test.svc/Categories?$select=Name,Products/Name&$expand=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_select_categories_expand.xml", __FILE__)), :headers => {})
+        end
+
+        it "doesn't error" do
+          svc = OData::Service.new "http://test.com/test.svc/"
+          svc.Categories.select "Name", "Products/Name"
+          expect { svc.execute }.to_not raise_error
+        end
+
+        it "returns the classes with the properties filled in" do
+          svc = OData::Service.new "http://test.com/test.svc/"
+          svc.Categories.select "Name", "Products/Name"
+          results = svc.execute
+          category = results.first
+          category.Name.should eq "Category 0001"
+          product = category.Products.first
+          product.Name.should eq "Widget 0001"
+        end
+      end
+    end
   end
-    
   describe_private OData::Service do
     describe "parse value" do
       before(:each) do
@@ -714,13 +1018,13 @@ 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/"
         element_to_parse = Nokogiri::XML.parse('<d:AvailableFrom m:type="Edm.DateTime">2100-01-01T00:00:00</d:AvailableFrom>').elements[0]
-        lambda { svc.parse_value(element_to_parse) }.should_not raise_exception
+        lambda { svc.parse_value_xml(element_to_parse) }.should_not raise_exception
       end
     end
   end
-end
+end