ruby_odata 0.1.0 → 0.1.1

data/features/cassettes/service_manage_deletions.yml

@@ -0,0 +1,58 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://win7dev:8989/SampleService/RubyOData.svc/Products(1)
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Length:
+      - '1431'
+      Content-Type:
+      - application/atom+xml;type=entry;charset=utf-8
+      Server:
+      - Microsoft-IIS/7.5
+      Set-Cookie:
+      - ASP.NET_SessionId=pqd44q53aamnklanqbym2pcu; path=/; HttpOnly
+      X-Content-Type-Options:
+      - nosniff
+      Dataserviceversion:
+      - 1.0;
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Powered-By:
+      - ASP.NET
+      Date:
+      - Tue, 07 Aug 2012 21:47:37 GMT
+    body:
+      encoding: US-ASCII
+      string: <?xml version="1.0" encoding="utf-8"?><entry xml:base="http://win7dev:8989/SampleService/RubyOData.svc/"
+        xmlns="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:georss="http://www.georss.org/georss"
+        xmlns:gml="http://www.opengis.net/gml"><id>http://win7dev:8989/SampleService/RubyOData.svc/Products(1)</id><category
+        term="RubyODataService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"
+        /><link rel="edit" title="Product" href="Products(1)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Category"
+        type="application/atom+xml;type=entry" title="Category" href="Products(1)/Category"
+        /><title /><updated>2012-08-07T21:47:38Z</updated><author><name /></author><content
+        type="application/xml"><m:properties><d:Id m:type="Edm.Int32">1</d:Id><d:Name>Test
+        Product</d:Name><d:Description>Test Widget</d:Description><d:Price m:type="Edm.Decimal">10.25</d:Price><d:DiscontinuedDate
+        m:type="Edm.DateTime" m:null="true" /><d:CategoryId m:type="Edm.Int32">1</d:CategoryId><d:AuditFields
+        m:type="RubyODataService.AuditFields"><d:CreateDate m:type="Edm.DateTime">2012-08-07T21:47:38.157</d:CreateDate><d:ModifiedDate
+        m:type="Edm.DateTime">2012-08-07T21:47:38.157</d:ModifiedDate><d:CreatedBy>Machinist</d:CreatedBy></d:AuditFields></m:properties></content></entry>
+    http_version: !!null 
+  recorded_at: Tue, 07 Aug 2012 21:47:38 GMT
+recorded_with: VCR 2.2.4

data/features/cassettes/service_manage_deletions_2.yml

@@ -0,0 +1,58 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://win7dev:8989/SampleService/RubyOData.svc/Products(1)
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Length:
+      - '1439'
+      Content-Type:
+      - application/atom+xml;type=entry;charset=utf-8
+      Server:
+      - Microsoft-IIS/7.5
+      Set-Cookie:
+      - ASP.NET_SessionId=1jtoo2ua0isload4ewywcbyh; path=/; HttpOnly
+      X-Content-Type-Options:
+      - nosniff
+      Dataserviceversion:
+      - 1.0;
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Powered-By:
+      - ASP.NET
+      Date:
+      - Tue, 07 Aug 2012 21:47:37 GMT
+    body:
+      encoding: US-ASCII
+      string: <?xml version="1.0" encoding="utf-8"?><entry xml:base="http://win7dev:8989/SampleService/RubyOData.svc/"
+        xmlns="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:georss="http://www.georss.org/georss"
+        xmlns:gml="http://www.opengis.net/gml"><id>http://win7dev:8989/SampleService/RubyOData.svc/Products(1)</id><category
+        term="RubyODataService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"
+        /><link rel="edit" title="Product" href="Products(1)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Category"
+        type="application/atom+xml;type=entry" title="Category" href="Products(1)/Category"
+        /><title /><updated>2012-08-07T21:47:38Z</updated><author><name /></author><content
+        type="application/xml"><m:properties><d:Id m:type="Edm.Int32">1</d:Id><d:Name>Changed
+        Test Product</d:Name><d:Description>Test Widget</d:Description><d:Price m:type="Edm.Decimal">10.25</d:Price><d:DiscontinuedDate
+        m:type="Edm.DateTime" m:null="true" /><d:CategoryId m:type="Edm.Int32">1</d:CategoryId><d:AuditFields
+        m:type="RubyODataService.AuditFields"><d:CreateDate m:type="Edm.DateTime">2012-08-07T21:47:38.157</d:CreateDate><d:ModifiedDate
+        m:type="Edm.DateTime">2012-08-07T21:47:38.157</d:ModifiedDate><d:CreatedBy>Machinist</d:CreatedBy></d:AuditFields></m:properties></content></entry>
+    http_version: !!null 
+  recorded_at: Tue, 07 Aug 2012 21:47:38 GMT
+recorded_with: VCR 2.2.4

data/features/cassettes/unsecured_metadata.yml

@@ -0,0 +1,89 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://win7dev:8989/SampleService/RubyOData.svc/$metadata
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Length:
+      - '4055'
+      Content-Type:
+      - application/xml;charset=utf-8
+      Server:
+      - Microsoft-IIS/7.5
+      Set-Cookie:
+      - ASP.NET_SessionId=tvkikr3xqyy43kcx0mk1uwdr; path=/; HttpOnly
+      X-Content-Type-Options:
+      - nosniff
+      Dataserviceversion:
+      - 1.0;
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Powered-By:
+      - ASP.NET
+      Date:
+      - Tue, 07 Aug 2012 21:47:40 GMT
+    body:
+      encoding: US-ASCII
+      string: <?xml version="1.0" encoding="utf-8"?><edmx:Edmx Version="1.0" xmlns:edmx="http://schemas.microsoft.com/ado/2007/06/edmx"><edmx:DataServices
+        m:DataServiceVersion="1.0" m:MaxDataServiceVersion="3.0" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"><Schema
+        Namespace="RubyODataService" xmlns="http://schemas.microsoft.com/ado/2008/09/edm"><EntityType
+        Name="Product"><Key><PropertyRef Name="Id" /></Key><Property Name="Id" Type="Edm.Int32"
+        Nullable="false" p6:StoreGeneratedPattern="Identity" xmlns:p6="http://schemas.microsoft.com/ado/2009/02/edm/annotation"
+        /><Property Name="Name" Type="Edm.String" MaxLength="4000" FixedLength="false"
+        Unicode="true" /><Property Name="Description" Type="Edm.String" MaxLength="4000"
+        FixedLength="false" Unicode="true" /><Property Name="Price" Type="Edm.Decimal"
+        Nullable="false" Precision="18" Scale="2" /><Property Name="DiscontinuedDate"
+        Type="Edm.DateTime" /><Property Name="CategoryId" Type="Edm.Int32" Nullable="false"
+        /><Property Name="AuditFields" Type="RubyODataService.AuditFields" Nullable="false"
+        /><NavigationProperty Name="Category" Relationship="RubyODataService.Category_Products"
+        ToRole="Category_Products_Source" FromRole="Category_Products_Target" /></EntityType><ComplexType
+        Name="AuditFields"><Property Name="CreateDate" Type="Edm.DateTime" Nullable="false"
+        /><Property Name="ModifiedDate" Type="Edm.DateTime" Nullable="false" /><Property
+        Name="CreatedBy" Type="Edm.String" MaxLength="4000" FixedLength="false" Unicode="true"
+        /></ComplexType><EntityType Name="Category"><Key><PropertyRef Name="Id" /></Key><Property
+        Name="Id" Type="Edm.Int32" Nullable="false" p6:StoreGeneratedPattern="Identity"
+        xmlns:p6="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Property
+        Name="Name" Type="Edm.String" MaxLength="4000" FixedLength="false" Unicode="true"
+        /><Property Name="AuditFields" Type="RubyODataService.AuditFields" Nullable="false"
+        /><NavigationProperty Name="Products" Relationship="RubyODataService.Category_Products"
+        ToRole="Category_Products_Target" FromRole="Category_Products_Source" /></EntityType><EntityType
+        Name="EdmMetadata"><Key><PropertyRef Name="Id" /></Key><Property Name="Id"
+        Type="Edm.Int32" Nullable="false" p6:StoreGeneratedPattern="Identity" xmlns:p6="http://schemas.microsoft.com/ado/2009/02/edm/annotation"
+        /><Property Name="ModelHash" Type="Edm.String" MaxLength="4000" FixedLength="false"
+        Unicode="true" /></EntityType><Association Name="Category_Products"><End Type="RubyODataService.Product"
+        Role="Category_Products_Target" Multiplicity="*" /><End Type="RubyODataService.Category"
+        Role="Category_Products_Source" Multiplicity="1"><OnDelete Action="Cascade"
+        /></End><ReferentialConstraint><Principal Role="Category_Products_Source"><PropertyRef
+        Name="Id" /></Principal><Dependent Role="Category_Products_Target"><PropertyRef
+        Name="CategoryId" /></Dependent></ReferentialConstraint></Association><EntityContainer
+        Name="RubyODataContext" m:IsDefaultEntityContainer="true"><EntitySet Name="Products"
+        EntityType="RubyODataService.Product" /><EntitySet Name="Categories" EntityType="RubyODataService.Category"
+        /><EntitySet Name="EdmMetadatas" EntityType="RubyODataService.EdmMetadata"
+        /><AssociationSet Name="Category_Products" Association="RubyODataService.Category_Products"><End
+        Role="Category_Products_Target" EntitySet="Products" /><End Role="Category_Products_Source"
+        EntitySet="Categories" /></AssociationSet><FunctionImport Name="CleanDatabaseForTesting"
+        m:HttpMethod="POST" /><FunctionImport Name="EntityCategoryWebGet" ReturnType="Collection(RubyODataService.Category)"
+        EntitySet="Categories" m:HttpMethod="GET" /><FunctionImport Name="CategoryNames"
+        ReturnType="Collection(Edm.String)" m:HttpMethod="GET" /><FunctionImport Name="FirstCategoryId"
+        ReturnType="Edm.Int32" m:HttpMethod="GET" /><FunctionImport Name="EntitySingleCategoryWebGet"
+        ReturnType="RubyODataService.Category" EntitySet="Categories" m:HttpMethod="GET"><Parameter
+        Name="id" Type="Edm.Int32" /></FunctionImport></EntityContainer></Schema></edmx:DataServices></edmx:Edmx>
+    http_version: !!null 
+  recorded_at: Tue, 07 Aug 2012 21:47:41 GMT
+recorded_with: VCR 2.2.4

data/features/complex_types.feature

@@ -1,3 +1,4 @@
+@complex_types
 Feature: Complex types
   In order to fully support OData services
   As a user of ruby_odata
@@ -12,7 +13,7 @@ Scenario: The proxy must generate classes for complex types if they exist
 
 Scenario: Complex properties on an entity must be the correct type
   Given I call "AddToProducts" on the service with a new "Product" object
-  And I save changes		
+  And I save changes
   And I call "Products" on the service with args: "1"
   When I run the query
   Then the first result should have a method: "AuditFields"
@@ -25,10 +26,10 @@ Scenario: Complex properties on an entity must be filled
   When I run the query
   Then the first result should have a method: "AuditFields"
   When I call "CreateDate" for "AuditFields" on the first result
-  Then the operation should not be null 
+  Then the operation should not be null
 
 # TODO: This scenario should have the AuditFields.CreatedBy field set in the Given
-# instead it is set by the blueprint  
+# instead it is set by the blueprint
 Scenario: Complex properties should be able to be added
   Given I call "AddToProducts" on the service with a new "Product" object
   And I save changes

data/features/error_handling.feature

@@ -0,0 +1,14 @@
+@error_handling
+Feature: Error handling
+  In order to assist debugging
+  As a user
+  I want more debug information when an error occurs communicating with the server
+
+Background:
+  Given a HTTP ODataService exists
+  And blueprints exist for the service
+
+Scenario: Violate a data type conversion (empty string to decimal)
+  Given I call "AddToProducts" on the service with a new "Product" object with Price: ""
+  When I save changes it should throw an exception with message containing "HTTP Error 400"
+

data/features/query_builder.feature

@@ -1,7 +1,8 @@
+@query_builder
 Feature: Query Builder
   In order to query OData services
   As a user
-  I want to be able to perform valid OData protocol operations 
+  I want to be able to perform valid OData protocol operations
 
 Background:
   Given a HTTP ODataService exists
@@ -12,7 +13,7 @@ Scenario: Navigation Properties should be able to be eager loaded
   Given I call "AddToCategories" on the service with a new "Category" object with Name: "Test Category"
   And I save changes
   And I call "AddToProducts" on the service with a new "Product" object with Category: "@@LastSave.first"
-  And I save changes	
+  And I save changes
   And I call "Products" on the service with args: "1"
   And I expand the query to include "Category"
   When I run the query
@@ -99,14 +100,14 @@ Scenario: Skip should be allowed on the root level entity
   | Product 2 |
   | Product 3 |
   | Product 4 |
-  | Product 5 | 
+  | Product 5 |
   When I call "Products" on the service
   And I skip 3
   And I run the query
   Then the result should be:
   | Name      |
   | Product 4 |
-  | Product 5 |  
+  | Product 5 |
 
 
 # Top
@@ -117,14 +118,14 @@ Scenario: Top should be allowed on the root level entity
   | Product 2 |
   | Product 3 |
   | Product 4 |
-  | Product 5 | 
+  | Product 5 |
   When I call "Products" on the service
   And I ask for the top 3
   And I run the query
   Then the result should be:
   | Name      |
   | Product 1 |
-  | Product 2 | 
+  | Product 2 |
   | Product 3 |
 
 Scenario: Top should be able to be used along with skip for paging
@@ -134,8 +135,8 @@ Scenario: Top should be able to be used along with skip for paging
   | Product 2 |
   | Product 3 |
   | Product 4 |
-  | Product 5 | 
-  | Product 6 |  
+  | Product 5 |
+  | Product 6 |
   When I call "Products" on the service
   And I skip 2
   And I ask for the top 2
@@ -143,7 +144,7 @@ Scenario: Top should be able to be used along with skip for paging
   Then the result should be:
   | Name      |
   | Product 3 |
-  | Product 4 |  
+  | Product 4 |
 
 
 # Links
@@ -160,3 +161,23 @@ Scenario: Navigation Properties should be able to represented as links
   And I run the query
   Then the result count should be 3
   Then the method "path" on the first result should equal: "/SampleService/RubyOData.svc/Products(1)"
+
+# Count
+Scenario: Count should be able to be used on a root collection
+  Given 4 products exist
+  When I call "Products" on the service
+  And I ask for the count
+  And I run the query
+  Then the integer result should be 4
+
+Scenario: Count should be able to be used on with a filter
+  Given the following products exist:
+  | Name      |
+  | Product 1 |
+  | Product 2 |
+  When I call "Products" on the service
+  And I filter the query with: "Name eq 'Product 2'"
+  And I ask for the count
+  And I run the query
+  Then the integer result should be 1
+

data/features/service.feature

@@ -1,3 +1,4 @@
+@service
 Feature: Service Should Generate a Proxy
   In order to consume the OData
   As a user
@@ -30,7 +31,7 @@ Scenario: Entity should have the correct accessors
   When I run the query
   Then the first result should have a method: "Id"
   And the first result should have a method: "Name"
-  
+
 Scenario: Entity should fill values
   Given I call "AddToCategories" on the service with a new "Category" object with Name: "Test Category"
   And I save changes
@@ -39,9 +40,9 @@ Scenario: Entity should fill values
   Then the method "Id" on the first result should equal: "1"
   And the method "Name" on the first result should equal: "Test Category"
 
-Scenario: Navigation Properties should be included in results	
+Scenario: Navigation Properties should be included in results
   Given I call "AddToProducts" on the service with a new "Product" object
-  And I save changes		
+  And I save changes
   And I call "Products" on the service with args: "1"
   When I run the query
   Then the first result should have a method: "Category"

data/features/service_manage.feature

@@ -1,3 +1,4 @@
+@service_manage
 Feature: Service management
   In order to manage entities
   As a admin
@@ -9,7 +10,7 @@ Background:
 
 Scenario: Service should respond to AddToEntityName for adding objects
   Given I call "AddToProducts" on the service with a new "Product" object with Name: "Sample Product"
-  When I save changes
+  When I save changes within a cassette named "service_manage_additions"
   Then the first save result should be of type "Product"
   And the method "Name" on the first save result should equal: "Sample Product"
 
@@ -19,7 +20,7 @@ Scenario: Service should allow for deletes
   Then the first save result should be of type "Product"
   When I call "delete_object" on the service with the first last save result
   And I save changes
-  Then the save result should equal: "true" 
+  Then the save result should equal: "true"
   And no "Products" should exist
 
 Scenario: Untracked entities shouldn't be able to be deleted
@@ -29,7 +30,7 @@ Scenario: Entities should be able to be updated
   Given I call "AddToProducts" on the service with a new "Product" object with Name: "Test Product"
   When I save changes
   And I call "Products" on the service with args: "1"
-  And I run the query
+  And I run the query within a cassette named "service_manage_deletions"
   Then the method "Name" on the first result should equal: "Test Product"
   When I set "Name" on the first result to "Changed Test Product"
   Then the method "Name" on the first result should equal: "Changed Test Product"
@@ -37,7 +38,7 @@ Scenario: Entities should be able to be updated
   And I save changes
   Then the save result should equal: "true"
   When I call "Products" on the service with args: "1"
-  And I run the query
+  And I run the query within a cassette named "service_manage_deletions_2"
   Then the method "Name" on the first result should equal: "Changed Test Product"
 
 Scenario: Untracked entities shouldn't be able to be updated
@@ -47,7 +48,7 @@ Scenario: Related entities shouldn't be recreated on a child add
   Given I call "AddToCategories" on the service with a new "Category" object with Name: "Test Category"
   And I save changes
   And I call "AddToProducts" on the service with a new "Product" object with Category: "@@LastSave.first"
-  And I save changes	
+  And I save changes
   And I call "Products" on the service with args: "1"
   And I expand the query to include "Category"
   When I run the query

data/features/service_methods.feature

@@ -1,3 +1,4 @@
+@service_methods
 Feature: Service methods
   In order to use a WCF Data Service more efficiently
   As a consumer
@@ -5,9 +6,9 @@ Feature: Service methods
 
 Background:
   Given a HTTP ODataService exists
-  And blueprints exist for the service  
+  And blueprints exist for the service
+
 
-  
 Scenario: A custom web get (no parameters) that returns an entity
   Given a category exists
   And I call the service method "EntityCategoryWebGet"

data/features/ssl.feature

@@ -1,13 +1,14 @@
+@ssl
 Feature: Service Should Access Basic Resources via SSL using a self-signed certificate
-  
-Background:
-  Given a HTTPS BasicAuth ODataService exists using self-signed certificate and username "admin" and password "passwd"
-  And blueprints exist for the service
 
 Scenario: Service should respond to valid collections
+  Given a HTTPS BasicAuth ODataService exists using self-signed certificate and username "admin" and password "passwd"
+  And blueprints exist for the service
   Then I should be able to call "Products" on the service
 
 Scenario: Entity should fill values on protected resource
+  Given a HTTPS BasicAuth ODataService exists using self-signed certificate and username "admin" and password "passwd"
+  And blueprints exist for the service
   Given I call "AddToCategories" on the service with a new "Category" object with Name: "Auth Test Category"
   And I save changes
   And I call "Categories" on the service with args: "1"
@@ -15,7 +16,6 @@ Scenario: Entity should fill values on protected resource
   Then the method "Id" on the first result should equal: "1"
   And the method "Name" on the first result should equal: "Auth Test Category"
 
-Scenario: Should get SSL failure if SSL used with self-signed certificate and not passing "false" as :verify_ssl option
-  Given a HTTPS BasicAuth ODataService exists it should throw an exception with message containing "SSL Verification failed"
-
-
+# TODO: Commented this scenario out because it requires the server to be online in order for the tests to run. Would like to move this to a mocked test that would accomplish the same thing...
+# Scenario: Should get SSL failure if SSL used with self-signed certificate and not passing "false" as :verify_ssl option
+#   Given a HTTPS BasicAuth ODataService exists it should throw an exception with message containing "SSL Verification failed"

data/features/step_definitions/service_steps.rb

@@ -2,20 +2,22 @@ STANDARD_URL = "http://#{WEBSERVER}:#{HTTP_PORT_NUMBER}/SampleService/RubyOData.
 BASICAUTH_URL = "http://#{WEBSERVER}:#{HTTP_PORT_NUMBER}/SampleService/BasicAuth/RubyOData.svc"
 HTTPS_BASICAUTH_URL = "https://#{WEBSERVER}:#{HTTPS_PORT_NUMBER}/SampleService/BasicAuth/RubyOData.svc"
 
-When /^(.*) first (last query )?result('s)?(.*)$/ do |pre, last_query, apos, post|
-  step = "#{pre} #{last_query}result#{apos}#{post}"
+When /^(.*) first (last query )?result(\'s)?(.*)$/ do |pre, last_query, apos, post|
+  the_step = "#{pre} #{last_query}result#{apos}#{post}"
   first_result
-  When step
+  step the_step
 end
 
 When /^(.*) first (last )?save result(.*)$/ do |pre, last, post|
-  step = "#{pre} #{last}save result#{post}"
+  the_step = "#{pre} #{last}save result#{post}"
   first_save
-  When step
+  step the_step
 end
 
 Given /^a HTTP ODataService exists$/ do
-  @service = OData::Service.new(STANDARD_URL)
+  VCR.use_cassette("unsecured_metadata") do
+    @service = OData::Service.new(STANDARD_URL)
+  end
 end
 
 Given /^a HTTP BasicAuth ODataService exists$/ do
@@ -30,11 +32,11 @@ Given /^a HTTP BasicAuth ODataService exists using username "([^\"]*)" and passw
   @service = OData::Service.new(BASICAUTH_URL, { :username => username, :password => password })
 end
 
-Given /^a HTTP BasicAuth ODataService exists using username "([^\"]*)" and password "([^\"]*)" it should throw an exception with message "([^\"]*)"$/ do |username, password, msg|  
+Given /^a HTTP BasicAuth ODataService exists using username "([^\"]*)" and password "([^\"]*)" it should throw an exception with message "([^\"]*)"$/ do |username, password, msg|
   lambda { @service = OData::Service.new(BASICAUTH_URL, { :username => username, :password => password }) }.should raise_error(msg)
 end
 
-Given /^a HTTP BasicAuth ODataService exists it should throw an exception with message containing "([^\"]*)"$/ do |msg|  
+Given /^a HTTP BasicAuth ODataService exists it should throw an exception with message containing "([^\"]*)"$/ do |msg|
   lambda { @service = OData::Service.new(BASICAUTH_URL) }.should raise_error(/#{msg}.*/)
 end
 
@@ -42,7 +44,7 @@ Given /^a HTTPS BasicAuth ODataService exists it should throw an exception with
   lambda { @service = OData::Service.new(HTTPS_BASICAUTH_URL) }.should raise_error(/#{msg}.*/)
 end
 
-Given /^a HTTP BasicAuth ODataService exists it should throw an exception with message "([^\"]*)"$/ do |msg|  
+Given /^a HTTP BasicAuth ODataService exists it should throw an exception with message "([^\"]*)"$/ do |msg|
   lambda { @service = OData::Service.new(BASICAUTH_URL) }.should raise_error(msg)
 end
 
@@ -55,7 +57,7 @@ When /^I call "([^\"]*)" on the service$/ do |method|
 end
 
 Then /^the result should be "([^\"]*)"$/ do |result|
-  @service_result.should eq result 
+  @service_result.should eq result
 end
 
 Then /^the integer result should be ([^\"]*)$/ do |result|
@@ -122,18 +124,22 @@ When /^I ask for the top (\d+)$/ do |top|
   @service_query.top(top)
 end
 
+When /^I ask for the count$/ do
+  @service_query.count
+end
+
 When /^I ask for the links for "([^\"]*)"$/ do |nav_prop|
   @service_query.links(nav_prop)
 end
 
 Then /^the method "([^\"]*)" on the result should be of type "([^\"]*)"$/ do |method, type|
-  result = @service_result.send(method.to_sym) 
+  result = @service_result.send(method.to_sym)
   result.class.to_s.should eq type
 end
 
 Given /^I call "([^\"]*)" on the service with a new "([^\"]*)" object(?: with (.*))?$/ do |method, object, fields|
   fields_hash = parse_fields_string(fields)
-  
+
   obj = object.constantize.send(:make, fields_hash)
   @service.send(method.to_sym, obj)
 end
@@ -172,6 +178,10 @@ Given /^I call "([^\"]*)" on the service with a new "([^\"]*)" object it should
   lambda { @service.send(method.to_sym, obj) }.should raise_error(msg)
 end
 
+When /^I save changes it should throw an exception with message containing "([^"]*)"$/ do |msg|
+  lambda { @service.save_changes }.should raise_error(/#{msg}.*/)
+end
+
 Then /^no "([^\"]*)" should exist$/ do |collection|
   @service.send(collection)
   results = @service.execute
@@ -180,19 +190,19 @@ end
 
 Then /^the primitive results should be:$/ do |table|
   # table is a Cucumber::Ast::Table
-  values = table.hashes  
+  values = table.hashes
   result_table = Cucumber::Ast::Table.new(values)
   table.diff!(result_table)
 end
 
 Then /^the result should be:$/ do |table|
   # table is a Cucumber::Ast::Table
-  
+
   fields = table.hashes[0].keys
-  
+
   # Build an array of hashes so that we can compare tables
   results = []
-  
+
   @service_result.each do |result|
     obj_hash = Hash.new
     fields.each do |field|
@@ -200,20 +210,20 @@ Then /^the result should be:$/ do |table|
     end
     results << obj_hash
   end
-  
+
   result_table = Cucumber::Ast::Table.new(results)
-  
+
   table.diff!(result_table)
 end
 
 Then /^the save result should be:$/ do |table|
   # table is a Cucumber::Ast::Table
-  
+
   fields = table.hashes[0].keys
-  
+
   # Build an array of hashes so that we can compare tables
   results = []
-  
+
   @saved_result.each do |result|
     obj_hash = Hash.new
     fields.each do |field|
@@ -221,10 +231,10 @@ Then /^the save result should be:$/ do |table|
     end
     results << obj_hash
   end
-  
+
   result_table = Cucumber::Ast::Table.new(results)
-  
-  table.diff!(result_table) 	
+
+  table.diff!(result_table)
 end
 
 Then /^a class named "([^\"]*)" should exist$/ do |klass_name|
@@ -299,4 +309,8 @@ Given /^I call the service method "([^"]*)"(?: with (.*))?$/ do |method, args|
   else
     @service_result = @service.send(method)
   end
+end
+
+When /^(.*) within a cassette named "([^"]*)"$/ do |the_step, cassette_name|
+  VCR.use_cassette(cassette_name) { step the_step }
 end

data/features/support/env.rb

@@ -1,6 +1,4 @@
 lib = File.expand_path(File.join(File.dirname(__FILE__), "../..", "lib"))
 
 require lib + '/ruby_odata'
-require 'machinist/object'
-require 'sham'
-require 'faker'
+require "machinist"

data/features/support/hooks.rb

@@ -1,4 +1,5 @@
 Before do
-  Sham.reset
-  RestClient.post "http://#{WEBSERVER}:#{HTTP_PORT_NUMBER}/SampleService/RubyOData.svc/CleanDatabaseForTesting", {}
+  VCR.use_cassette("clean_database_for_testing") do
+    RestClient.post "http://#{WEBSERVER}:#{HTTP_PORT_NUMBER}/SampleService/RubyOData.svc/CleanDatabaseForTesting", {}
+  end
 end