ruby_odata 0.1.0 → 0.1.6

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,47 +2,33 @@ 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)
-end
-
-Given /^a HTTP BasicAuth ODataService exists$/ do
-  @service = OData::Service.new(BASICAUTH_URL)
-end
-
-Given /^a HTTPS BasicAuth ODataService exists$/ do
-  @service = OData::Service.new(HTTPS_BASICAUTH_URL)
+  VCR.use_cassette("unsecured_metadata") do
+    @service = OData::Service.new(STANDARD_URL)
+  end
 end
 
 Given /^a HTTP BasicAuth ODataService exists using username "([^\"]*)" and password "([^\"]*)"$/ do |username, password|
   @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|  
-  lambda { @service = OData::Service.new(BASICAUTH_URL) }.should raise_error(/#{msg}.*/)
-end
-
-Given /^a HTTPS BasicAuth ODataService exists it should throw an exception with message containing "([^"]*)"$/ do |msg|
-  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
 
@@ -54,10 +40,6 @@ When /^I call "([^\"]*)" on the service$/ do |method|
   @service_query = @service.send(method)
 end
 
-Then /^the result should be "([^\"]*)"$/ do |result|
-  @service_result.should eq result 
-end
-
 Then /^the integer result should be ([^\"]*)$/ do |result|
   @service_result.should eq result.to_i
 end
@@ -122,18 +104,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 +158,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 +170,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,31 +190,10 @@ 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|
-      obj_hash[field] = result.send(field)
-    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|
@@ -251,14 +220,6 @@ When /^I set "([^\"]*)" on the result's method "([^\"]*)" to "([^\"]*)"$/ do |pr
 end
 
 # Type tests
-Then /^the "([^\"]*)" method should return a (.*)/ do |method_name, type|
-  methods = method_name.split '.'
-  if methods.length == 1
-    @service_result.send(method_name).class.to_s.should eq type
-  else
-    @service_result.send(methods[0]).send(methods[1]).class.to_s.should eq type
-  end
-end
 Then /^the "([^\"]*)" method on the object should return a (.*)/ do |method_name, type|
   methods = method_name.split '.'
   if methods.length == 1
@@ -274,16 +235,9 @@ end
 
 Then /^the new query result's time "([^\"]*)" should equal the saved query result$/ do |method_name|
   methods = method_name.split '.'
-  if methods.length == 1
-    @service_result.send(method_name).xmlschema(3).should eq @stored_query_result.send(method_name).xmlschema(3)
-  else
-    @service_result.send(methods[0]).send(methods[1]).xmlschema(3).should eq @stored_query_result.send(methods[0]).send(methods[1]).xmlschema(3)
-  end
+  @service_result.send(methods[0]).send(methods[1]).xmlschema(3).should eq @stored_query_result.send(methods[0]).send(methods[1]).xmlschema(3)
 end
 
-Then /^show me the results$/ do
-  puts @service_result
-end
 
 Then /^the result count should be (\d+)$/ do |expected_count|
   @service_result.count.should eq expected_count.to_i
@@ -299,4 +253,8 @@ Given /^I call the service method "([^"]*)"(?: with (.*))?$/ do |method, args|
   else
     @service_result = @service.send(method)
   end
-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,9 @@
 lib = File.expand_path(File.join(File.dirname(__FILE__), "../..", "lib"))
 
 require lib + '/ruby_odata'
-require 'machinist/object'
-require 'sham'
-require 'faker'
+require 'machinist'
+
+require 'simplecov'
+# require 'coveralls'
+
+# Coveralls.wear_merged!

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

data/features/support/pickle.rb

@@ -1,23 +1,28 @@
-require 'pickle/world'
-require File.expand_path('../../../lib/ruby_odata', __FILE__)
+require "pickle/world"
+require "vcr"
+require File.expand_path("../../../lib/ruby_odata", __FILE__)
 
 module OData
-
   module PickleAdapter
     include Pickle::Adapter::Base
-    
-    @@service = OData::Service.new "http://#{WEBSERVER}:#{HTTP_PORT_NUMBER}/SampleService/RubyOData.svc"
-    
+    @@service = nil
+    def self.get_service
+      return @@service if @@service
+      VCR.use_cassette("unsecured_metadata") do
+        return OData::Service.new "http://#{WEBSERVER}:#{HTTP_PORT_NUMBER}/SampleService/RubyOData.svc"
+      end
+    end
+
     # Do not consider these to be part of the class list
     def self.except_classes
       @@except_classes ||= []
     end
-    
+
     # Gets a list of the available models for this adapter
     def self.model_classes
-      @@service.classes.values
+      self.get_service.classes.values
     end
-    
+
     # get a list of column names for a given class
     def self.column_names(klass)
       klass.properties.keys
@@ -26,7 +31,9 @@ module OData
     # Get an instance by id of the model
     def self.get_model(klass, id, expand = false)
       collection = klass.to_s.split('::').last.pluralize
-      query = @@service.send collection, id
+      service = self.get_service
+
+      query = service.send collection, id
 
       if expand then
         # Expand all navigation properties
@@ -38,24 +45,28 @@ module OData
         end
       end
 
-      @@service.execute.first
+      service.execute.first
     end
 
     # Find the first instance matching conditions
     def self.find_first_model(klass, conditions)
       collection = klass.to_s.split('::').last.pluralize
-      q = @@service.send collection
+      service = self.get_service
+
+      q = service.send collection
       q.filter(conditions)
       q.take(1)
-      @@service.execute.first
+      service.execute.first
     end
 
     # Find all models matching conditions
     def self.find_all_models(klass, conditions)
       collection = klass.to_s.split('::').last.pluralize
-      q = @@service.send collection
+      service = self.get_service
+
+      q = service.send collection
       q.filter(conditions)
-      @@service.execute
+      service.execute
     end
 
     # Create a model using attributes
@@ -63,10 +74,10 @@ module OData
       instance = klass.send :make, attributes
 
       collection = klass.to_s.split('::').last.pluralize
-      @@service.send "AddTo#{collection}", instance
-      @@service.save_changes.first
+      service = self.get_service
+      service.send "AddTo#{collection}", instance
+      service.save_changes.first
     end
-    
   end
 end
 

data/features/support/vcr.rb

@@ -0,0 +1,24 @@
+require "vcr"
+require File.expand_path("../../../spec/support/sample_service_matcher",  __FILE__)
+
+VCR.configure do |c|
+  c.hook_into :webmock
+  c.cassette_library_dir     = "features/cassettes"
+  c.default_cassette_options = {
+    :record => :none,
+    :match_requests_on => [:method, OData::Support::SampleServiceMatcher]
+  }
+end
+
+VCR.cucumber_tags do |t|
+  t.tags  "@basic_auth",
+          "@batch_request",
+          "@complex_types",
+          "@error_handling",
+          "@query_builder",
+          "@service",
+          "@service_manage",
+          "@service_methods",
+          "@ssl",
+          "@type_conversion"
+end

data/features/type_conversion.feature

@@ -1,6 +1,7 @@
+@type_conversion
 Feature: Type conversion
   In order to accurately perform operations
-  As a user of the API 
+  As a user of the API
   I want types returned to be accurately represented
 
 Background:
@@ -9,29 +10,29 @@ Background:
 
 Scenario: Integers should be Fixnums
   Given I call "AddToProducts" on the service with a new "Product" object
-	And I save changes
+  And I save changes
   When I call "Products" on the service
   And I run the query
-  Then the "Id" method on the object should return a Fixnum 
-  
+  Then the "Id" method on the object should return a Fixnum
+
 Scenario: Decimals should be BigDecimals
-	Given I call "AddToProducts" on the service with a new "Product" object
+  Given I call "AddToProducts" on the service with a new "Product" object
   And I save changes
-	When I call "Products" on the service
+  When I call "Products" on the service
   And I run the query
   Then the "Price" method on the object should return a BigDecimal
 
 Scenario: DateTimes should be Times
-	Given I call "AddToProducts" on the service with a new "Product" object
+  Given I call "AddToProducts" on the service with a new "Product" object
   And I save changes
-	When I call "Products" on the service
+  When I call "Products" on the service
   And I run the query
-	Then the "AuditFields.CreateDate" method on the object should return a Time
- 
+  Then the "AuditFields.CreateDate" method on the object should return a Time
+
 Scenario: Verify that DateTimes don't change if not modified on an update
-	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"
+  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
   Then I store the first last query result for comparison
   When I set "Name" on the first result to "Changed Test Product"
@@ -44,10 +45,8 @@ Scenario: Verify that DateTimes don't change if not modified on an update
   Then the new query first result's time "AuditFields.CreateDate" should equal the saved query result
 
 Scenario: DateTimes should be able to be null
-	Given I call "AddToProducts" on the service with a new "Product" object
+  Given I call "AddToProducts" on the service with a new "Product" object
   And I save changes
-	When I call "Products" on the service
+  When I call "Products" on the service
   And I run the query
   Then the "DiscontinuedDate" method on the object should return a NilClass
-
-