ruby_odata 0.0.10 → 0.1.0

data/.gitignore

@@ -4,12 +4,18 @@ rerun.txt
 tmp
 tmp/*
 .eprj
-test/SampleService/App_Data/TestDB.mdf
-test/SampleService/App_Data/TestDB_Log.ldf
 pkg/*
 doc/*
 *.gem
 .bundle
 Gemfile.lock
 pkg/*
-test/applicationhost.config
+test/applicationhost.config
+.rvmrc
+.DS_Store
+*ReSharper*
+*.suo
+obj
+App_Data/
+*.pdb
+test/RubyODataService/RubyODataService/bin/*.xml

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+script: "bundle exec rake spec"

data/CHANGELOG.rdoc

@@ -68,4 +68,21 @@
   * Handled building results (classes) where the category element is missing but there is a title element instead. (Reported by mkoegel, issue #3 on github in the comments)
 * Other
   * Change HTTP port to 8989 since 8888 conflicts with the Intel AppStore
-  * Refactored service step for HTTP calls where the service address is defined within the step making it easier to make changes in the future.
+  * Refactored service step for HTTP calls where the service address is defined within the step making it easier to make changes in the future.
+
+=== 0.1.0
+* **BREAKING CHANGES**
+  * Previously the ruby_odata +Service.execute+ and +Service.save_changes+ used to return a single entity object if there was only one result returned. Now, the results are always an Enumerable (except in the case of boolean results like a delete), so if you just need one result, use the +first+ method on the result set
+* New Features
+  * Support for partial results (thanks arienmalec)
+  * Added support for single layer inheritance (thanks to http://odetocode.com/Blogs/scott/archive/2010/07/11/odata-and-ruby.aspx)
+  * Added support for querying links (see https://github.com/visoft/ruby_odata/issues/10)
+  * Added support for adding links between entities (add_link)
+  * Added support for lazy loading
+  * Added a convenience method (+first+) for accessing a single result by id
+  * Added basic reflection of the entity model via the ruby_odata service
+  * Added the ability to create ruby_odata models in a specified namespace to prevent conflicts with local models
+  * Added the ability to call function imports exposed by the WCF Data Service
+* Other
+  * Changed the test project (for Cucumber integration tests) to use SQL Compact 4, Entity Framework 4.1, and WCF Data Services October 2011 CTP
+  * Added {Pickle}[https://github.com/ianwhite/pickle] integration to simplify Cucumber step definitions

data/README.rdoc

@@ -9,10 +9,11 @@ The <b>Open Data Protocol</b> (OData) is a fantastic way to query and update dat
 * Issue tracking (hosted on GitHub): https://github.com/visoft/ruby_odata/issues
 * Wiki (hosted on GitHub): http://wiki.github.com/visoft/ruby_odata/
 * Gem (hosted on Gemcutter): http://gemcutter.org/gems/ruby_odata
-* Blog articles: {Introducing a Ruby OData Client Library}[http://bit.ly/IntroRubyOData]
-                 {Ruby OData Update v0.0.7}[http://bit.ly/ruby_odata007]
-                 {Ruby OData Update v0.0.8}[http://bit.ly/ruby_odata008]
-                 {Ruby OData Update v0.0.10}[http://bit.ly/ruby_odata0010]
+* Blog articles: 
+  * {Introducing a Ruby OData Client Library}[http://bit.ly/IntroRubyOData]
+  * {Ruby OData Update v0.0.7}[http://bit.ly/ruby_odata007]
+  * {Ruby OData Update v0.0.8}[http://bit.ly/ruby_odata008]
+  * {Ruby OData Update v0.0.10}[http://bit.ly/ruby_odata0010]
 
 == Installation
 You can install ruby_odata as a gem using:
@@ -26,13 +27,14 @@ There are various options that you can pass when creating an instance of the ser
 * password: password for http basic auth
 * verify_ssl: false if no verification, otherwise mode (OpenSSL::SSL::VERIFY_PEER is default)
 * additional_params: a hash of query string params that will be passed on all calls (query, new, update, delete, batch)
+* namespace: a string based namespace to create your objects in. You can specify the namespace using periods as separators (like .NET, for example <tt>VisoftInc.Sample.Models</tt>) or using double colons as separators (like Ruby <tt>VisoftInc::Sample::Models</tt>). By providing a namespace you can prevent naming collisions in your applications. 
 
 === Adding
 When you point at a service, an AddTo<EntityName> method is created for you.  This method takes in the new entity to create.  To commit the change, you need to call the save_changes method on the service.  To add a new category for example, you would simply do the following:
 
   require 'ruby_odata'
   
-  svc = OData::Service.new "http://127.0.0.1:8989/SampleService/Entities.svc"
+  svc = OData::Service.new "http://127.0.0.1:8989/SampleService/RubyOData.svc"
   new_category = Category.new
   new_category.Name = "Sample Category"
   svc.AddToCategories(new_category)
@@ -44,7 +46,7 @@ To update an object, simply pass the modified object to the update_object method
 
   require 'ruby_odata'
     
-  svc = OData::Service.new "http://127.0.0.1:8989/SampleService/Entities.svc"
+  svc = OData::Service.new "http://127.0.0.1:8989/SampleService/RubyOData.svc"
   new_category = Category.new
   new_category.Name = "Sample Category"
   svc.AddToCategories(new_category)
@@ -61,7 +63,7 @@ Deleting an object involves passing the tracked object to the delete_object meth
 
   require 'ruby_odata'
   
-  svc = OData::Service.new "http://127.0.0.1:8989/SampleService/Entities.svc"
+  svc = OData::Service.new "http://127.0.0.1:8989/SampleService/RubyOData.svc"
   new_category = Category.new
   new_category.Name = "Sample Category"
   svc.AddToCategories(new_category)
@@ -72,12 +74,19 @@ Deleting an object involves passing the tracked object to the delete_object meth
   result = svc.save_changes
   puts "Was the category deleted? #{result}"
 
+=== Add Link
+Adding a linkage between entities can now be performed outside of creation or modification of the objects. See the {OData documents}[http://www.odata.org/developers/protocols/operations#CreatingLinksbetweenEntries] for more details.
+To add a link between entities, simply call the +add_link+ method on the Service passing the parent object, the name of the navigation property, and the child object. Like all save operations, you need to call +save_changes+ to persist the changes.
+
+  svc.add_link(<Parent>, <Navigation Property Name>, <Child>)
+  svc.save_changes
+
 === Querying
 Querying is easy, for example to pull all the categories from the SampleService, you simply can run:
 
   require 'ruby_odata'
   
-  svc = OData::Service.new "http://127.0.0.1:8989/SampleService/Entities.svc"
+  svc = OData::Service.new "http://127.0.0.1:8989/SampleService/RubyOData.svc"
   svc.Categories
   categories = svc.execute
   puts categories.to_json
@@ -87,7 +96,7 @@ You can also expand, add filters, order, skip records, and take only the top X r
 === Expanding
 Expanding allows you to eagerly load other objects that are children of the root.
 You can use more than one expand on a query.  
-For expanding grandchild and lower entities, you must pass in the full path from the root, for example +Products.expand('Orders').expand('Orders/LineItems')+
+For expanding grandchild and lower entities, you must pass in the full path from the root, for example <tt>Products.expand('Orders').expand('Orders/LineItems')</tt>
 
   # Without expanding the query
   svc.Products(1)
@@ -98,9 +107,20 @@ For expanding grandchild and lower entities, you must pass in the full path from
   # With expanding the query
   svc.Products(1).expand('Category')
   prod1 = svc.execute
-  puts "Without expanding the query"
+  puts "With expanding the query"
   puts "#{prod1.to_json}\n"
 
+=== Lazy Loading
+If you want to implement lazy loading, the ruby_odata `Service` allows you to perform this. You simply need to call the `load_property` method on the `Service` passing in the object and the navigation property to fill.
+
+  # Without expanding the query
+  svc.Products(1)
+  prod1 = svc.execute.first
+  puts "#{prod1.to_json}\n"
+
+  # Use load_property for lazy loading
+  svc.load_property(prod1, "Category")
+  puts "#{prod1.to_json}\n"
 
 === Filtering
 The syntax for filtering can be found on the {OData Protocol URI Conventions}[http://www.odata.org/developers/protocols/uri-conventions#FilterSystemQueryOption] page.
@@ -133,7 +153,7 @@ The query operations follow a {fluent interface}[http://en.wikipedia.org/wiki/Fl
 
 === Order By
 You can order the results by properties of your choice, either ascending or descending.
-Order by are similar to +expand+s in that you can use more than one of them on a query.
+Order by are similar to +expands+ in that you can use more than one of them on a query.
 For expanding grandchild and lower entities, you must pass in the full path from the root like would do on an +expand+
 
   svc.Products.order_by("Name")
@@ -164,38 +184,76 @@ Top allows you only retrieve the top X number of records when querying.  This is
   svc.Products.top(5)
   products = svc.execute # => returns only the first 5 items	
 
+=== Navigation Property Links Only Query
+OData allows you to {query navigation properties and only return the links for the entities}[http://www.odata.org/developers/protocols/uri-conventions#AddressingLinksBetweenEntries] (instead of the data)
+  svc.Categories(1).links("Products")
+  product_links = svc.execute # => returns URIs for the products under the Category with an ID of 1
+
+=== Partial feeds
+OData allows services to do server-side paging in Atom by defining a next link. The default behavior is to repeatedly consume partial feeds until the result set is complete.
+
+  svc.Partials
+  results = svc.execute # => retrieves all results in the Partials collection
+
+If desired (e.g., because the result set is too large to fit in memory), explicit traversal of partial results can be requested via options:
+
+  svc = OData::Service.new "http://example.com/Example.svc", { :eager_partial => false }
+  svc.Partials
+  results = svc.execute # => retrieves the first set of results returned by the server
+  if svc.partial? # => true if the last result set was a partial result set (i.e., had a next link)
+    results.concat svc.next # => retrieves the next set of results
+  end
+  while svc.partial? # => to retrieve all partial result sets
+    results.concat svc.next
+  end
+
 === Authentication
 Basic HTTP Authentication is supported via sending a username and password as service constructor arguments:
 
   require 'ruby_odata'
   
-  svc = OData::Service.new "http://127.0.0.1:8989/SampleService/Entities.svc", { :username => "bob", :password=> "12345" }
+  svc = OData::Service.new "http://127.0.0.1:8989/SampleService/RubyOData.svc", { :username => "bob", :password=> "12345" }
 
 === SSL/https Certificate Verification
 The certificate verification mode can be passed in the options hash via the :verify_ssl key. For example, to ignore verification in order to use a self-signed certificate:
 
   require 'ruby_odata'
 
-  svc = OData::Service.new "https://127.0.0.1:44300/SampleService/Entities.svc", { :verify_ssl => false }
+  svc = OData::Service.new "https://127.0.0.1:44300/SampleService/RubyOData.svc", { :verify_ssl => false }
 
 Or an OpenSSL integer constant can be passed as well:
 
   require 'ruby_odata'
 
-  svc = OData::Service.new "https://127.0.0.1:44300/SampleService/Entities.svc", { :verify_ssl => OpenSSL::SSL::VERIFY_PEER }
+  svc = OData::Service.new "https://127.0.0.1:44300/SampleService/RubyOData.svc", { :verify_ssl => OpenSSL::SSL::VERIFY_PEER }
                                                                                                          
 Default verification is OpenSSL::SSL::VERIFY_PEER. Note due to the way Ruby's Request object implements certificate checking, you CAN NOT pass OpenSSL::SSL::VERIFY_NONE, you must instead pass a boolean false.
 
+== Function Imports / Custom Service Methods
+Function Imports are custom service methods exposed by the WCF Data Service. Each function import will be created as a method on the ruby_odata Service. When you make a call to one of these, they return a result immediately without the need to call +execute+ or +save_changes+.
+
+== Reflection
+Instead of relying on looking at the EDMX directly, ruby_odata allows you to perform basic reflection on objects
+=== Service Level Methods
+* *Collections* - You can look at the collections exposed by a service by accessing the +collections+ method, which is a hash. The key is the name of the collection and the value is the hash with +edmx_type+, which returns the name of the type from the EDMX and <tt>:type</tt>, which is the local type that is created for you
+* *Classes* - To see the generated classes, you can utilize the +classes+ method on the service. The return result is a hash where the key is the class name and the value is the class type.
+* <b>Function Imports</b> - You can find any function import (custom service methods) exposed by the service by accessing the +function_imports+ method. This is a hash where the key is the Function Import name and the value is metadata about the Function Import.
+
+=== Class Level Methods
+* *Properties* - You can call the class method +properties+ on a generated class to see the method (properties) that were created. The returned result is a hash where the key is the property name and the value is metadata for the property like if it is nullable, the EDM Type, etc.
+
 == Tests
-All of the tests are written using Cucumber going against a sample service (Found in /test/SampleService/*).  The SampleService is an ASP.NET Web Site running a SQLEXPRESS 2008 R2 Database (TestDB), as well as the ADO.NET Entity Framework and a WCF Data Service.  In order to run the tests, you need to spin up the SampleService and have it running on port 8989 (http://localhost:8989/SampleService).  
+All of the tests are written using Cucumber going against a sample service (Found in test/RubyODataService/RubyODataService/*).
+The SampleService is an ASP.NET Web Site running a SQL Compact 4 Database, which gets generated at runtime, as well as the ADO.NET Entity Framework 4.1 and WCF Data Services October 2011 CTP. The reason for the CTP is that WCF Data Services currently shipping with .NET 4 doesn't support Entity Framework 4.1's "Code First" approach (e.g. no EDMX, all POCOs)
+In order to run the tests, you need to spin up IIS running a virtual directory of SampleService on port 8989 (http://localhost:8989/SampleService) and another instance running on port 44300.
 
-One way to do this is to open the SampleService within Visual Studio 2010 and run it from there (must use IIS instead of development web server in order for basic auth tests to pass, however).  Another option is to use IIS Express. It is a free download from Microsoft. Once installed, there is a batch file found in /test called "iisExpress x64.bat", you can run the batch file and just close the command window. There is a also an "iisExpress x86.bat" file for those of you running a 32-bit machine.  The only difference is the path to the Program Files directory.  Once you run the batch file, the web server will spin up and you can find the instance in your systray just like if Visual Studio ran it for you.  To stop the server, right click on the icon in your systray and tell it to stop.
+*NOTE* The ports (8989 and 44300) and webserver (localhost by default) here are customizable thanks to <tt>/features/contants.rb</tt>. Take a look in there for the corresponding environment variables that you can set.
 
-Note there are also Cassini batch files that you can use as well, but the basic auth tests will fail if using this server (which doesn't support basic http authentication).
+The SampleService requires IIS or IIS Express. IIS Express is a free download from Microsoft and the preferred approach to running the application. Once installed, there is a batch file found in /test called "iisExpress x64.bat" that will spin up the appropriate instances needed for the Cucumber tests. There is a also an "iisExpress x86.bat" file for those of you running a 32-bit machine.  The only difference is the path to the Program Files directory.  Once you run the batch file, the web server will spin up.  To stop the server, use 'Q' and then enter or close the command window.
 
-If you are testing on a Windows machine, you may encounter a problem with using cucumber and Ruby 1.9.2.  You will get a message when you fire up cucumber about missing msvcrt-ruby18.dll.  The fix for this is to make sure you have the {RubyInstaller DevKit}[https://github.com/oneclick/rubyinstaller/wiki/Development-Kit] installed, then do the following:
+If you are testing on a Windows machine, you may encounter a problem with using Cucumber and Ruby 1.9.2.  You will get a message when you fire up cucumber about missing msvcrt-ruby18.dll.  The fix for this is to make sure you have the {RubyInstaller DevKit}[https://github.com/oneclick/rubyinstaller/wiki/Development-Kit] installed, then do the following:
   gem uninstall json
   gem install json --platform=ruby -v 1.4.6
 
-From the BASE ruby_odata directory, run cucumber, which will execute all of the tests.
+Once the SampleService is running, from the BASE ruby_odata directory, simply type +rake+, which will run the RSpec and Cucumber specs. You can also run them separately <tt>rake spec</tt> for RSpec and <tt>rake features</tt> for Cucumber.
 

data/config/cucumber.yml

@@ -1,7 +1,8 @@
 <%
 rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
-rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "#{rerun_opts} --format rerun --out rerun.txt --strict --tags ~@wip"
+rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format pretty #{rerun}"
+std_opts = "--format progress features --tags ~@wip"
 %>
-default: <%= std_opts %>
+default: <%= std_opts %> features
 wip: --tags @wip:3 --wip features
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

data/features/basic_auth.feature

@@ -1,7 +1,7 @@
 Feature: Service Should Access Basic Auth Protected Resources
   
 Background:
-  Given an ODataService exists with uri: "http://localhost:8989/SampleService/BasicAuth/Entities.svc" using username "admin" and password "passwd"
+  Given a HTTP BasicAuth ODataService exists using username "admin" and password "passwd"
   And blueprints exist for the service
 
 Scenario: Service should respond to valid collections
@@ -12,13 +12,11 @@ Scenario: Entity should fill values on protected resource
   And I save changes
   And I call "Categories" on the service with args: "1"
   When I run the query
-  Then the method "Id" on the result should equal: "1"
-  And the method "Name" on the result should equal: "Auth Test Category"
+  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 401 if invalid credentials provided to protected URL
-  Given an ODataService exists with uri: "http://localhost:8989/SampleService/BasicAuth/Entities.svc" using username "admin" and password "bad_pwd" it should throw an exception with message "401 Unauthorized"
+  Given a HTTP BasicAuth ODataService exists using username "admin" and password "bad_pwd" it should throw an exception with message "401 Unauthorized"
 
 Scenario: Should get 401 if no credentials provided to protected URL
-  Given an ODataService exists with uri: "http://localhost:8989/SampleService/BasicAuth/Entities.svc" it should throw an exception with message "401 Unauthorized"
-
-
+  Given a HTTP BasicAuth ODataService exists it should throw an exception with message "401 Unauthorized"

data/features/batch_request.feature

@@ -4,7 +4,7 @@ Feature: Batch request
   I want to be able to batch changes (Add/Update/Delete) and persist the batch instead of one at a time
   
 Background:
-  Given a sample HTTP ODataService exists
+  Given a HTTP ODataService exists
   And blueprints exist for the service
 
 Scenario: Save Changes should allow for batch additions
@@ -27,13 +27,13 @@ Scenario: Save Changes should allow for batch updates
   When I call "Products" on the service
   And I filter the query with: "Name eq 'Product 1'"
   And I run the query
-  And I set "Name" on the result to "Product 1 - Updated"
-  And I call "update_object" on the service with the last query result
+  And I set "Name" on the first result to "Product 1 - Updated"
+  And I call "update_object" on the service with the first last query result
   When I call "Products" on the service
   And I filter the query with: "Name eq 'Product 2'"
   And I run the query 
-  And I set "Name" on the result to "Product 2 - Updated"
-  And I call "update_object" on the service with the last query result
+  And I set "Name" on the first result to "Product 2 - Updated"
+  And I call "update_object" on the service with the first last query result
   When I save changes
   When I call "Products" on the service
   And I order by: "Name"
@@ -52,11 +52,11 @@ Scenario: Save Changes should allow for batch deletes
   When I call "Products" on the service
   And I filter the query with: "Name eq 'Product 2'"
   And I run the query
-  And I call "delete_object" on the service with the last query result
+  And I call "delete_object" on the service with the first last query result
   When I call "Products" on the service
   And I filter the query with: "Name eq 'Product 3'"
   And I run the query 
-  And I call "delete_object" on the service with the last query result
+  And I call "delete_object" on the service with the first last query result
   When I save changes
   When I call "Products" on the service
   And I order by: "Name"
@@ -67,7 +67,7 @@ Scenario: Save Changes should allow for batch deletes
   | Product 4 |
 
 Scenario: Save Changes should allow for a mix of adds, updates, and deletes to be batched
-  Given the following Products exist:
+  Given the following products exist:
   | Name      |
   | Product 1 |
   | Product 2 |
@@ -76,12 +76,12 @@ Scenario: Save Changes should allow for a mix of adds, updates, and deletes to b
   When I call "Products" on the service
   And I filter the query with: "Name eq 'Product 1'"
   And I run the query
-  And I set "Name" on the result to "Product 1 - Updated"
-  And I call "update_object" on the service with the last query result
+  And I set "Name" on the first result to "Product 1 - Updated"
+  And I call "update_object" on the service with the first last query result
   When I call "Products" on the service
   And I filter the query with: "Name eq 'Product 2'"
   And I run the query
-  And I call "delete_object" on the service with the last query result
+  And I call "delete_object" on the service with the first last query result
   When I save changes
   When I call "Products" on the service
   And I order by: "Name"

data/features/complex_types.feature

@@ -4,7 +4,7 @@ Feature: Complex types
   I want to be able to manage objects with complex types
 
 Background:
-  Given a sample HTTP ODataService exists
+  Given a HTTP ODataService exists
   And blueprints exist for the service
 
 Scenario: The proxy must generate classes for complex types if they exist
@@ -15,16 +15,16 @@ Scenario: Complex properties on an entity must be the correct type
   And I save changes		
   And I call "Products" on the service with args: "1"
   When I run the query
-  Then the result should have a method: "AuditFields"
-  And the method "AuditFields" on the result should be of type "AuditFields"
+  Then the first result should have a method: "AuditFields"
+  And the method "AuditFields" on the first result should be of type "AuditFields"
 
 Scenario: Complex properties on an entity must be filled
   Given I call "AddToProducts" on the service with a new "Product" object
   And I save changes
   And I call "Products" on the service with args: "1"
   When I run the query
-  Then the result should have a method: "AuditFields"
-  When I call "CreateDate" for "AuditFields" on the result 
+  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 
 
 # TODO: This scenario should have the AuditFields.CreatedBy field set in the Given
@@ -34,19 +34,19 @@ Scenario: Complex properties should be able to be added
   And I save changes
   And I call "Products" on the service with args: "1"
   When I run the query
-  Then the method "CreatedBy" on the result's method "AuditFields" should equal: "Cucumber"
-  
-Scenario: Complex propertis should be able to be updated
+  Then the method "CreatedBy" on the first result's method "AuditFields" should equal: "Machinist"
+
+Scenario: Complex properties should be able to be updated
   Given I call "AddToProducts" on the service with a new "Product" object
   And I save changes
   And I call "Products" on the service with args: "1"
   When I run the query
-  When I set "CreatedBy" on the result's method "AuditFields" to "This Test"
-  And I call "update_object" on the service with the last query result
+  When I set "CreatedBy" on the first result's method "AuditFields" to "This Test"
+  And I call "update_object" on the service with the first last query result
   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
-  Then the method "CreatedBy" on the result's method "AuditFields" should equal: "This Test"
+  Then the method "CreatedBy" on the first result's method "AuditFields" should equal: "This Test"
 
 

data/features/query_builder.feature

@@ -4,21 +4,21 @@ Feature: Query Builder
   I want to be able to perform valid OData protocol operations 
 
 Background:
-  Given a sample HTTP ODataService exists
+  Given a HTTP ODataService exists
   And blueprints exist for the service
 
-# Expand	
+# Expand
 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"
+  And I call "AddToProducts" on the service with a new "Product" object with Category: "@@LastSave.first"
   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
-  Then the method "Category" on the result should be of type "Category"
-  And the method "Name" on the result's method "Category" should equal: "Test Category"
-  And the method "Id" on the result's method "Category" should equal: "1"
+  Then the method "Category" on the first result should be of type "Category"
+  And the method "Name" on the first result's method "Category" should equal: "Test Category"
+  And the method "Id" on the first result's method "Category" should equal: "1"
 
 
 # Filters
@@ -29,12 +29,12 @@ Scenario: Filters should be allowed on the root level entity
   When I call "Products" on the service
   And I filter the query with: "Name eq 'Test Product'"
   And I run the query
-  Then the method "Name" on the result should equal: "Test Product"
+  Then the method "Name" on the first result should equal: "Test Product"
 
 
 # Order By
 Scenario: Order by should be allowed on the root level entity
-  Given the following Products exist:
+  Given the following products exist:
   | Name      |
   | Product 2 |
   | Product 4 |
@@ -53,7 +53,7 @@ Scenario: Order by should be allowed on the root level entity
   | Product 5 |
 
 Scenario: Order by should accept sorting descending
-  Given the following Products exist:
+  Given the following products exist:
   | Name      |
   | Product 2 |
   | Product 4 |
@@ -72,7 +72,7 @@ Scenario: Order by should accept sorting descending
   | Product 1 |
 
 Scenario: Order by should access sorting acsending
-  Given the following Products exist:
+  Given the following products exist:
   | Name      |
   | Product 2 |
   | Product 4 |
@@ -93,7 +93,7 @@ Scenario: Order by should access sorting acsending
 
 # Skip
 Scenario: Skip should be allowed on the root level entity
-  Given the following Products exist:
+  Given the following products exist:
   | Name      |
   | Product 1 |
   | Product 2 |
@@ -111,7 +111,7 @@ Scenario: Skip should be allowed on the root level entity
 
 # Top
 Scenario: Top should be allowed on the root level entity
-  Given the following Products exist:
+  Given the following products exist:
   | Name      |
   | Product 1 |
   | Product 2 |
@@ -128,7 +128,7 @@ Scenario: Top should be allowed on the root level entity
   | Product 3 |
 
 Scenario: Top should be able to be used along with skip for paging
-  Given the following Products exist:
+  Given the following products exist:
   | Name      |
   | Product 1 |
   | Product 2 |
@@ -146,8 +146,17 @@ Scenario: Top should be able to be used along with skip for paging
   | Product 4 |  
 
 
-
-
-  
-
-
+# Links
+Scenario: Navigation Properties should be able to represented as links
+  Given a category: "cat1" exists with Name: "Test Category"
+  And I save changes
+  And the following products exist:
+  | Name      | Category         |
+  | Product 1 | category: "cat1" |
+  | Product 2 | category: "cat1" |
+  | Product 3 | category: "cat1" |
+  When I call "Categories" on the service with args: "1"
+  And I ask for the links for "Products"
+  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)"