ruby_odata 0.0.9 → 0.0.10

data/spec/fixtures/sap/edmx_sap_demo_flight.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<edmx:Edmx Version="1.0" xmlns:edmx="http://schemas.microsoft.com/ado/2007/06/edmx" xmlns:gp="http://www.sap.com/Protocols/SAPData/GenericPlayer" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:sap="http://www.sap.com/Protocols/SAPData">
+	<edmx:DataServices m:DataServiceVersion="2.0">
+		<Schema Namespace="DEMO_FLIGHT" xmlns="http://schemas.microsoft.com/ado/2008/09/edm">
+			<EntityType Name="flight_data" m:HasStream="false" sap:content-version="1">
+				<Key>
+					<PropertyRef Name="scheme_id"/>
+					<PropertyRef Name="value"/>
+					<PropertyRef Name="scheme_agency_id"/>
+				</Key>
+				<Property Name="scheme_id" Type="Edm.String" Nullable="false" MaxLength="30" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="airlineid" Type="Edm.String" MaxLength="3" sap:label="Airline" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="value" Type="Edm.String" Nullable="false" MaxLength="72" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="scheme_agency_id" Type="Edm.String" Nullable="false" MaxLength="16" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+			</EntityType>
+			<EntityType Name="z_demo_flight" m:HasStream="false" sap:content-version="1">
+				<Key>
+					<PropertyRef Name="scheme_id"/>
+					<PropertyRef Name="scheme_agency_id"/>
+					<PropertyRef Name="value"/>
+				</Key>
+				<Property Name="cityto" Type="Edm.String" MaxLength="20" sap:label="Arrival city" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="scheme_id" Type="Edm.String" Nullable="false" MaxLength="30" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="curr" Type="Edm.String" MaxLength="5" sap:label="Airline local currency" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="businmax" Type="Edm.Int32" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="arrdate" Type="Edm.DateTime" Precision="8" sap:label="Arrival date" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="deptime" Type="Edm.Time" Precision="6" sap:label="Departure time" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="firstmax" Type="Edm.Int32" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="price" Type="Edm.Decimal" Precision="23" Scale="4" sap:label="Airfare" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="businfree" Type="Edm.Int32" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="scheme_agency_id" Type="Edm.String" Nullable="false" MaxLength="16" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="airline" Type="Edm.String" MaxLength="20" sap:label="Airline" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="economax" Type="Edm.Int32" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="cityfrom" Type="Edm.String" MaxLength="20" sap:label="Depart. city" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="airportfr" Type="Edm.String" MaxLength="3" sap:label="Departure airport" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="connectid" Type="Edm.String" MaxLength="4" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="firstfree" Type="Edm.Int32" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="econofree" Type="Edm.Int32" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="airlineid" Type="Edm.String" MaxLength="2" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="curr_iso" Type="Edm.String" MaxLength="3" sap:label="ISO code" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="value" Type="Edm.String" Nullable="false" MaxLength="72" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="flightdate" Type="Edm.DateTime" Nullable="true" Precision="0" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="airportto" Type="Edm.String" MaxLength="3" sap:label="Destination airport" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<Property Name="arrtime" Type="Edm.Time" Precision="6" sap:label="Arrival Time" sap:creatable="false" sap:updatable="false" sap:filterable="false"/>
+				<NavigationProperty Name="flight_data_r" Relationship="DEMO_FLIGHT.flight_data_r" FromRole="FromRole_z_demo_flight_flight_data" ToRole="ToRole_flight_data_z_demo_flight"/>
+			</EntityType>
+			<Association Name="flight_data_r" sap:content-version="1">
+				<End Type="DEMO_FLIGHT.z_demo_flight" Multiplicity="0..1" Role="FromRole_z_demo_flight_flight_data"/>
+				<End Type="DEMO_FLIGHT.flight_data" Multiplicity="0..1" Role="ToRole_flight_data_z_demo_flight"/>
+			</Association>
+			<EntityContainer Name="DEMO_FLIGHT" m:IsDefaultEntityContainer="true">
+				<EntitySet Name="flight_dataCollection" EntityType="DEMO_FLIGHT.flight_data" sap:content-version="1" sap:creatable="false" sap:updatable="false" sap:deletable="false"/>
+				<EntitySet Name="z_demo_flightCollection" EntityType="DEMO_FLIGHT.z_demo_flight" sap:content-version="1" sap:creatable="false" sap:updatable="false" sap:deletable="false"/>
+				<AssociationSet Name="AssocSet_flight_data_r" Association="DEMO_FLIGHT.flight_data_r" sap:content-version="1" sap:creatable="false" sap:updatable="false" sap:deletable="false">
+					<End EntitySet="z_demo_flightCollection" Role="FromRole_z_demo_flight_flight_data"/>
+					<End EntitySet="flight_dataCollection" Role="ToRole_flight_data_z_demo_flight"/>
+				</AssociationSet>
+			</EntityContainer>
+		</Schema>
+	</edmx:DataServices>
+</edmx:Edmx>

data/spec/fixtures/sap/result_sap_demo_flight_missing_category.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<atom:feed xml:base="HTTP://GW.ESWORKPLACE.SAP.COM:80/sap/opu/sdata/sap/DEMO_FLIGHT/" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:sap="http://www.sap.com/Protocols/SAPData">
+	<atom:id>HTTP://GW.ESWORKPLACE.SAP.COM:80/sap/opu/sdata/sap/DEMO_FLIGHT/z_demo_flightCollection</atom:id>
+	<atom:link href="z_demo_flightCollection" rel="self" type="application/atom+xml;type=feed"/>
+	<atom:title>zDemoFlightCollection</atom:title>
+	<atom:updated>2011-09-23T01:17:51Z</atom:updated>
+	<atom:entry>
+		<atom:content type="application/xml">
+			<m:properties>
+				<d:value>020408_AA001720081001</d:value>
+				<d:scheme_id>Z_DEMO_FLIGHT</d:scheme_id>
+				<d:scheme_agency_id>HU2_800</d:scheme_agency_id>
+				<d:cityto>SAN FRANCISCO</d:cityto>
+				<d:curr>USD</d:curr>
+				<d:businmax>0</d:businmax>
+				<d:arrdate m:Type="Edm.DateTime">2008-10-01T00:00:00</d:arrdate>
+				<d:deptime m:Type="Edm.Time">PT11H00M00S</d:deptime>
+				<d:firstmax>0</d:firstmax>
+				<d:price m:Type="Edm.Decimal">422.9400</d:price>
+				<d:businfree>0</d:businfree>
+				<d:airline>American Airlines</d:airline>
+				<d:economax>0</d:economax>
+				<d:cityfrom>NEW YORK</d:cityfrom>
+				<d:airportfr>JFK</d:airportfr>
+				<d:connectid>00000000</d:connectid>
+				<d:firstfree>0</d:firstfree>
+				<d:econofree>0</d:econofree>
+				<d:airlineid/>
+				<d:curr_iso>USD</d:curr_iso>
+				<d:flightdate m:Type="Edm.DateTime" m:null="true"/>
+				<d:airportto>SFO</d:airportto>
+				<d:arrtime m:Type="Edm.Time">PT14H01M00S</d:arrtime>
+			</m:properties>
+		</atom:content>
+		<atom:id>HTTP://GW.ESWORKPLACE.SAP.COM:80/sap/opu/sdata/sap/DEMO_FLIGHT/z_demo_flightCollection(value='020408_AA001720081001',scheme_id='Z_DEMO_FLIGHT',scheme_agency_id='HU2_800')</atom:id>
+		<atom:link href="z_demo_flightCollection(value='020408_AA001720081001',scheme_id='Z_DEMO_FLIGHT',scheme_agency_id='HU2_800')" rel="self" type="application/atom+xml;type=entry"/>
+		<atom:link gateway:abap_name="FLIGHT_DATA_R" href="z_demo_flightCollection(value='020408_AA001720081001',scheme_id='Z_DEMO_FLIGHT',scheme_agency_id='HU2_800')/flight_data_r" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/flight_data_r" type="application/atom+xml;type=entry" title="flight_data_r" xmlns:gateway="http://www.sap.com/Protocols/Gateway">
+			<sap:icon/>
+		</atom:link>
+		<atom:title>z_demo_flight</atom:title>
+		<atom:updated>2011-09-23T01:17:51Z</atom:updated>
+		<sap:icon/>
+	</atom:entry>
+	<atom:entry>
+		<atom:content type="application/xml">
+			<m:properties>
+				<d:value>020408_AA001720081029</d:value>
+				<d:scheme_id>Z_DEMO_FLIGHT</d:scheme_id>
+				<d:scheme_agency_id>HU2_800</d:scheme_agency_id>
+				<d:cityto>SAN FRANCISCO</d:cityto>
+				<d:curr>USD</d:curr>
+				<d:businmax>0</d:businmax>
+				<d:arrdate m:Type="Edm.DateTime">2008-10-29T00:00:00</d:arrdate>
+				<d:deptime m:Type="Edm.Time">PT11H00M00S</d:deptime>
+				<d:firstmax>0</d:firstmax>
+				<d:price m:Type="Edm.Decimal">422.9400</d:price>
+				<d:businfree>0</d:businfree>
+				<d:airline>American Airlines</d:airline>
+				<d:economax>0</d:economax>
+				<d:cityfrom>NEW YORK</d:cityfrom>
+				<d:airportfr>JFK</d:airportfr>
+				<d:connectid>00000000</d:connectid>
+				<d:firstfree>0</d:firstfree>
+				<d:econofree>0</d:econofree>
+				<d:airlineid/>
+				<d:curr_iso>USD</d:curr_iso>
+				<d:flightdate m:Type="Edm.DateTime" m:null="true"/>
+				<d:airportto>SFO</d:airportto>
+				<d:arrtime m:Type="Edm.Time">PT14H01M00S</d:arrtime>
+			</m:properties>
+		</atom:content>
+		<atom:id>HTTP://GW.ESWORKPLACE.SAP.COM:80/sap/opu/sdata/sap/DEMO_FLIGHT/z_demo_flightCollection(value='020408_AA001720081029',scheme_id='Z_DEMO_FLIGHT',scheme_agency_id='HU2_800')</atom:id>
+		<atom:link href="z_demo_flightCollection(value='020408_AA001720081029',scheme_id='Z_DEMO_FLIGHT',scheme_agency_id='HU2_800')" rel="self" type="application/atom+xml;type=entry"/>
+		<atom:link gateway:abap_name="FLIGHT_DATA_R" href="z_demo_flightCollection(value='020408_AA001720081029',scheme_id='Z_DEMO_FLIGHT',scheme_agency_id='HU2_800')/flight_data_r" rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/flight_data_r" type="application/atom+xml;type=entry" title="flight_data_r" xmlns:gateway="http://www.sap.com/Protocols/Gateway">
+			<sap:icon/>
+		</atom:link>
+		<atom:title>z_demo_flight</atom:title>
+		<atom:updated>2011-09-23T01:17:51Z</atom:updated>
+		<sap:icon/>
+	</atom:entry>
+</atom:feed>

data/spec/property_metadata_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+module OData
+  describe PropertyMetadata do
+    describe "#initialize" do
+      it "parses an EDMX property with the essentials (name, type, nullable)" do        
+        property_element = RSpecSupport::ElementHelpers.string_to_element('<Property Name="Id" Type="Edm.String" Nullable="false" />')
+        property_metadata = PropertyMetadata.new property_element
+        property_metadata.name.should eq "Id"
+        property_metadata.type.should eq "Edm.String"
+        property_metadata.nullable.should eq false
+      end
+      it "parses an EDMX property where nullable is true" do
+        property_element = RSpecSupport::ElementHelpers.string_to_element('<Property Name="Id" Type="Edm.String" Nullable="true" />')
+        property_metadata = PropertyMetadata.new property_element
+        property_metadata.nullable.should eq true
+      end      
+      it "parses an EDMX property with nil for missing attributes" do        
+        property_element = RSpecSupport::ElementHelpers.string_to_element('<Property Name="Id" Type="Edm.String" Nullable="false" />')
+        property_metadata = PropertyMetadata.new property_element
+        property_metadata.fc_target_path.should be_nil
+        property_metadata.fc_keep_in_content.should be_nil
+      end
+      it "parses an EDMX property with false for missing Nullable attribute" do        
+        property_element = RSpecSupport::ElementHelpers.string_to_element('<Property Name="Id" Type="Edm.String" />')
+        property_metadata = PropertyMetadata.new property_element
+        property_metadata.nullable.should eq false
+      end      
+      it "parses an EDMX property with the fc_target_path and fc_keep_in_content attribute" do        
+        property_element = RSpecSupport::ElementHelpers.string_to_element('<Property Name="Title" Type="Edm.String" Nullable="true" m:FC_TargetPath="SyndicationTitle" m:FC_ContentKind="text" m:FC_KeepInContent="false" />')
+        property_metadata = PropertyMetadata.new property_element
+        property_metadata.fc_target_path.should eq "SyndicationTitle"
+        property_metadata.fc_keep_in_content.should eq false
+      end
+      it "parses an EDMX property where fc_keep_in_content is true" do        
+        property_element = RSpecSupport::ElementHelpers.string_to_element('<Property Name="Title" Type="Edm.String" Nullable="true" m:FC_TargetPath="SyndicationTitle" m:FC_ContentKind="text" m:FC_KeepInContent="true" />')
+        property_metadata = PropertyMetadata.new property_element
+        property_metadata.fc_keep_in_content.should eq true
+      end      
+    end
+  end
+end

data/spec/query_builder_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module OData
+  describe QueryBuilder do
+    describe "#initialize" do
+      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'
+        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 }
+        builder.top(10)
+        builder.query.should eq "Products?$top=10&x=1&y=2"
+      end
+    end
+  end
+end

data/spec/service_spec.rb

@@ -19,7 +19,71 @@ module OData
         
         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
+          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 additional query string parameters" do
+          svc = OData::Service.new "http://test.com/test.svc/", { :additional_params => { :x=>1, :y=>2 } }
+          svc.options[:additional_params].should eq Hash[:x=>1, :y=>2]
+        end
+        it "should call the correct metadata uri when additional_params are passed in" do
+          svc = OData::Service.new "http://test.com/test.svc/", { :additional_params => { :x => 1, :y => 2 } }
+          a_request(:get, "http://test.com/test.svc/$metadata?x=1&y=2").should have_been_made
+        end
+      end
     end
+
+    describe "additional query string parameters" do
+      before(:each) do
+        # Required for the build_classes method
+        stub_request(:any, /http:\/\/test\.com\/test\.svc(?:.*)/).
+        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+        to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/sap/edmx_sap_demo_flight.xml", __FILE__)), :headers => {})
+      end
+      it "should pass the parameters as part of a query" do
+        svc = OData::Service.new "http://test.com/test.svc/", { :additional_params => { :x=>1, :y=>2 } }
+        svc.flight_dataCollection
+        svc.execute
+        a_request(:get, "http://test.com/test.svc/flight_dataCollection?x=1&y=2").should have_been_made
+      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   
+        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
+      end
+      it "should pass the parameters as part of an update" do
+        svc = OData::Service.new "http://test.com/test.svc/", { :additional_params => { :x=>1, :y=>2 } }
+        existing_flight = ZDemoFlight.new
+        existing_flight.__metadata = { :uri => "http://test.com/test.svc/flight_dataCollection/1" }
+        svc.update_object(existing_flight)
+        svc.save_changes
+        a_request(:put, "http://test.com/test.svc/flight_dataCollection/1?x=1&y=2").should have_been_made
+      end
+      it "should pass the parameters as part of a delete" do
+        svc = OData::Service.new "http://test.com/test.svc/", { :additional_params => { :x=>1, :y=>2 } }
+        existing_flight = ZDemoFlight.new
+        existing_flight.__metadata = { :uri => "http://test.com/test.svc/flight_dataCollection/1" }
+        svc.delete_object(existing_flight)
+        svc.save_changes
+        a_request(:delete, "http://test.com/test.svc/flight_dataCollection/1?x=1&y=2").should have_been_made
+      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  
+        svc.AddToflight_dataCollection(new_flight)
+        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
+      end
+    end    
     
     describe "lowercase collections" do
       before(:each) do
@@ -39,5 +103,165 @@ module OData
         lambda { svc.send('acronyms') }.should_not raise_error
       end
     end
+
+    describe "handling of SAP results" 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/sap/edmx_sap_demo_flight.xml", __FILE__)), :headers => {})
+
+        stub_request(:get, "http://test.com/test.svc/z_demo_flightCollection").
+        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate'}).
+        to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/sap/result_sap_demo_flight_missing_category.xml", __FILE__)), :headers => {})
+      end
+
+      it "should handle entities without a category element" do
+        svc = OData::Service.new "http://test.com/test.svc/"
+        svc.z_demo_flightCollection
+        results = svc.execute
+        results.first.should be_a_kind_of(ZDemoFlight)
+      end
+    end
+  
+    describe "collections, objects, 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'}).
+        to_return(:status => 200, :body => File.new(File.expand_path("../fixtures/feed_customization/result_feed_customization_categories_expand.xml", __FILE__)), :headers => {})
+      end
+      after(:each) do
+        Object.send(:remove_const, 'Product')
+        Object.send(:remove_const, 'Category')
+      end
+      describe "handling feed customizations" do
+        describe "property metadata" do
+          it "should fill the class_metadata hash" do
+            svc = OData::Service.new "http://test.com/test.svc/"
+            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/"
+            svc.class_metadata['Product'].should have_key 'ID'
+            svc.class_metadata['Product'].should have_key 'Name'
+            svc.class_metadata['Product'].should have_key 'Description'
+          end
+          it "should have a PropertyMetadata object for each property class_metadata hash" do
+            svc = OData::Service.new "http://test.com/test.svc/"
+            svc.class_metadata['Product']['ID'].should be_a OData::PropertyMetadata
+            svc.class_metadata['Product']['Name'].should be_a OData::PropertyMetadata
+            svc.class_metadata['Product']['Description'].should be_a OData::PropertyMetadata
+          end
+          it "should have the correct PropertyMetadata object for Id" do
+            svc = OData::Service.new "http://test.com/test.svc/"
+            meta = svc.class_metadata['Product']['ID']
+            meta.name.should eq 'ID'
+            meta.type.should eq 'Edm.Int32'
+            meta.nullable.should eq false
+            meta.fc_target_path.should be_nil
+            meta.fc_keep_in_content.should be_nil
+          end
+          it "should have the correct PropertyMetadata object for Name" do
+            svc = OData::Service.new "http://test.com/test.svc/"
+            meta = svc.class_metadata['Product']['Name']
+            meta.name.should eq 'Name'
+            meta.type.should eq 'Edm.String'
+            meta.nullable.should eq true
+            meta.fc_target_path.should eq "SyndicationTitle"
+            meta.fc_keep_in_content.should eq false
+          end
+          it "should have the correct PropertyMetadata object for Description" do
+            svc = OData::Service.new "http://test.com/test.svc/"
+            meta = svc.class_metadata['Product']['Description']
+            meta.name.should eq 'Description'
+            meta.type.should eq 'Edm.String'
+            meta.nullable.should eq true
+            meta.fc_target_path.should eq "SyndicationSummary"
+            meta.fc_keep_in_content.should eq false
+          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/"
+            svc.Products
+            results = svc.execute
+            results.first.Name.should eq "Bread"
+          end
+          it "should handle properties where a property is represented in the syndication summary instead of the properties collection" do
+            svc = OData::Service.new "http://test.com/test.svc/"
+            svc.Products
+            results = svc.execute
+            results.first.Description.should eq "Whole grain bread"
+          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
+  end
+  
+  describe_private OData::Service do
+    describe "parse value" 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 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
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,4 @@
 require 'ruby_odata'
-require 'webmock/rspec'
+require 'webmock/rspec'
+
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }