ruby_odata 0.1.0 → 0.1.6

data/spec/spec_helper.rb

@@ -1,4 +1,7 @@
 require 'ruby_odata'
 require 'webmock/rspec'
+require 'simplecov'
+# require 'coveralls'
+# Coveralls.wear_merged!
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }

data/spec/support/sample_service_matcher.rb

@@ -0,0 +1,15 @@
+require 'uri'
+
+module OData
+  module Support
+    class SampleServiceMatcher
+      def self.call(req1, req2)
+        regexp = /^(https?:\/\/(?:[^@]*@)?)[^:]*(:\d+\/.*$)/i
+        request1 = req1.uri.match(regexp)
+        request2 = req2.uri.match(regexp)
+
+        (request1[1] == request2[1]) && (request1[2] == request2[2])
+      end
+    end
+  end
+end

data/test/blueprints.rb

@@ -1,22 +1,28 @@
-Sham.define do
-  category_name           { |i| "Category #{i}" }
-  product_name            { |i| "Widget #{i}" }
-  price(:unique => false) { ['5.00', '10.00', '20.00', '15.00' , '25.00', '7.50'].rand }
+class AuditFields
+  extend Machinist::Machinable
+end
+
+class Product
+  extend Machinist::Machinable
+end
+
+class Category
+  extend Machinist::Machinable
 end
 
 AuditFields.blueprint do
-  CreatedBy     "Machinist"
+  CreatedBy     { "Machinist" }
 end
 
 Product.blueprint do
-  Name          { Sham.product_name }
-  Description   "Test Widget"
-  Price         { Sham.price }
+  Name          { "Widget #{sn}" }
+  Description   { "Test Widget" }
+  Price         { ["10.25", "25.00", "50.00", "75.50", "100.00"].sample }
   Category      { Category.make }
   AuditFields   { AuditFields.make }
 end
 
 Category.blueprint do
-  Name          { Sham.category_name }
+  Name          { "Category #{sn}" }
   AuditFields   { AuditFields.make }
 end

data/test/usage_samples/querying.rb

@@ -8,7 +8,11 @@ ns_svc = OData::Service.new "http://#{WEBSERVER}:#{HTTP_PORT_NUMBER}/SampleServi
 puts "Querying for a list of data"
 svc.Categories
 categories = svc.execute
-puts categories.to_json 
+puts categories.to_json
+
+puts "Querying for a simple count"
+svc.Categories.count
+puts svc.execute
 
 puts "\n\nQuerying for a single result #execute"
 svc.Categories(1)

data/test/usage_samples/sample_data.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../../../lib/ruby_odata', __FILE__)
 require File.expand_path('../../../features/support/constants', __FILE__)
-require 'machinist/object'
-require 'sham'
-require 'faker'
+require "machinist"
 
 svc = OData::Service.new "http://#{WEBSERVER}:#{HTTP_PORT_NUMBER}/SampleService/RubyOData.svc"
 svc.CleanDatabaseForTesting #=> Comment this line out if you don't want to clear your test database

metadata

@@ -1,137 +1,253 @@
 --- !ruby/object:Gem::Specification
 name: ruby_odata
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - Damien White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.4
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70223407772000 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70223407772000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70223407771500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70223407771500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70223407771040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70223407771040
-- !ruby/object:Gem::Dependency
-  name: backports
-  requirement: &70223407770580 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70223407770580
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70223407770120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70223407770120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70223407769660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70223407769660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70223407769200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *70223407769200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: pickle
-  requirement: &70223407785100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.10
+        version: 0.4.11
   type: :development
   prerelease: false
-  version_requirements: *70223407785100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.11
 - !ruby/object:Gem::Dependency
-  name: faker
-  requirement: &70223407784640 !ruby/object:Gem::Requirement
-    none: false
+  name: machinist
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70223407784640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: machinist
-  requirement: &70223407784180 !ruby/object:Gem::Requirement
-    none: false
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.11.0
   type: :development
   prerelease: false
-  version_requirements: *70223407784180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: &70223407783720 !ruby/object:Gem::Requirement
-    none: false
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70223407783720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: guard-cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.7
 description: An OData Client Library for Ruby.  Use this to interact with OData services
 email:
 - damien.white@visoftinc.com
@@ -139,18 +255,42 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- CHANGELOG.rdoc
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".simplecov"
+- ".travis.yml"
+- ".yardopts"
+- CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - config/cucumber.yml
 - features/basic_auth.feature
 - features/batch_request.feature
+- features/cassettes/basic_auth_protected_resource.yml
+- features/cassettes/batch_request_additions.yml
+- features/cassettes/batch_request_deletes.yml
+- features/cassettes/batch_request_updates.yml
+- features/cassettes/clean_database_for_testing.yml
+- features/cassettes/cucumber_tags/basic_auth.yml
+- features/cassettes/cucumber_tags/batch_request.yml
+- features/cassettes/cucumber_tags/complex_types.yml
+- features/cassettes/cucumber_tags/error_handling.yml
+- features/cassettes/cucumber_tags/query_builder.yml
+- features/cassettes/cucumber_tags/service.yml
+- features/cassettes/cucumber_tags/service_manage.yml
+- features/cassettes/cucumber_tags/service_methods.yml
+- features/cassettes/cucumber_tags/ssl.yml
+- features/cassettes/cucumber_tags/type_conversion.yml
+- features/cassettes/service_manage_additions.yml
+- features/cassettes/service_manage_deletions.yml
+- features/cassettes/service_manage_deletions_2.yml
+- features/cassettes/unsecured_metadata.yml
 - features/complex_types.feature
+- features/error_handling.feature
 - features/query_builder.feature
 - features/service.feature
 - features/service_manage.feature
@@ -163,10 +303,13 @@ files:
 - features/support/env.rb
 - features/support/hooks.rb
 - features/support/pickle.rb
+- features/support/vcr.rb
 - features/type_conversion.feature
+- gemfiles/Gemfile.ruby187
 - lib/ruby_odata.rb
 - lib/ruby_odata/association.rb
 - lib/ruby_odata/class_builder.rb
+- lib/ruby_odata/exceptions.rb
 - lib/ruby_odata/helpers.rb
 - lib/ruby_odata/operation.rb
 - lib/ruby_odata/property_metadata.rb
@@ -178,12 +321,24 @@ files:
 - spec/class_builder_spec.rb
 - spec/fixtures/edmx_empty.xml
 - spec/fixtures/edmx_lowercase.xml
+- spec/fixtures/error_without_message.xml
 - spec/fixtures/feed_customization/edmx_feed_customization.xml
 - spec/fixtures/feed_customization/result_feed_customization_categories_expand.xml
 - spec/fixtures/feed_customization/result_feed_customization_products_expand.xml
 - spec/fixtures/inheritance/edmx_pluralsight.xml
 - spec/fixtures/inheritance/result_pluralsight_courses.xml
+- spec/fixtures/int64_ids/edmx_boat_service.xml
+- spec/fixtures/int64_ids/edmx_car_service.xml
+- spec/fixtures/int64_ids/result_boats.xml
+- spec/fixtures/int64_ids/result_cars.xml
 - spec/fixtures/links/result_links_query.xml
+- spec/fixtures/ms_system_center/edmx_ms_system_center.xml
+- spec/fixtures/ms_system_center/edmx_ms_system_center_v2.xml
+- spec/fixtures/ms_system_center/hardware_profiles.xml
+- spec/fixtures/ms_system_center/virtual_machines.xml
+- spec/fixtures/ms_system_center/vm_templates.xml
+- spec/fixtures/nested_expands/edmx_northwind.xml
+- spec/fixtures/nested_expands/northwind_products_category_expands.xml
 - spec/fixtures/partial/partial_feed_metadata.xml
 - spec/fixtures/partial/partial_feed_part_1.xml
 - spec/fixtures/partial/partial_feed_part_2.xml
@@ -194,6 +349,10 @@ files:
 - spec/fixtures/sample_service/result_entity_single_category_web_get.xml
 - spec/fixtures/sample_service/result_first_category_id.xml
 - spec/fixtures/sample_service/result_multiple_category_products.xml
+- spec/fixtures/sample_service/result_select_categories_expand.xml
+- spec/fixtures/sample_service/result_select_categories_no_property.xml
+- spec/fixtures/sample_service/result_select_categories_travsing_no_expand.xml
+- spec/fixtures/sample_service/result_select_products_name_price.xml
 - spec/fixtures/sample_service/result_single_category.xml
 - spec/fixtures/sample_service/result_single_product.xml
 - spec/fixtures/sample_service/result_single_product_not_found.xml
@@ -206,7 +365,9 @@ files:
 - spec/spec_helper.rb
 - spec/support/describe_private.rb
 - spec/support/element_helpers.rb
+- spec/support/sample_service_matcher.rb
 - test/RubyODataService/RubyODataService.sln
+- test/RubyODataService/RubyODataService/App_Data/.gitkeep
 - test/RubyODataService/RubyODataService/App_Start/EntityFramework.SqlServerCompact.cs
 - test/RubyODataService/RubyODataService/BasicAuth/RubyOData.svc
 - test/RubyODataService/RubyODataService/BasicAuth/RubyOData.svc.cs
@@ -314,33 +475,53 @@ files:
 - test/usage_samples/reflection.rb
 - test/usage_samples/sample_data.rb
 homepage: http://github.com/visoft/ruby_odata
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ruby-odata
-rubygems_version: 1.8.6
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby consumer of OData services.
 test_files:
 - features/basic_auth.feature
 - features/batch_request.feature
+- features/cassettes/basic_auth_protected_resource.yml
+- features/cassettes/batch_request_additions.yml
+- features/cassettes/batch_request_deletes.yml
+- features/cassettes/batch_request_updates.yml
+- features/cassettes/clean_database_for_testing.yml
+- features/cassettes/cucumber_tags/basic_auth.yml
+- features/cassettes/cucumber_tags/batch_request.yml
+- features/cassettes/cucumber_tags/complex_types.yml
+- features/cassettes/cucumber_tags/error_handling.yml
+- features/cassettes/cucumber_tags/query_builder.yml
+- features/cassettes/cucumber_tags/service.yml
+- features/cassettes/cucumber_tags/service_manage.yml
+- features/cassettes/cucumber_tags/service_methods.yml
+- features/cassettes/cucumber_tags/ssl.yml
+- features/cassettes/cucumber_tags/type_conversion.yml
+- features/cassettes/service_manage_additions.yml
+- features/cassettes/service_manage_deletions.yml
+- features/cassettes/service_manage_deletions_2.yml
+- features/cassettes/unsecured_metadata.yml
 - features/complex_types.feature
+- features/error_handling.feature
 - features/query_builder.feature
 - features/service.feature
 - features/service_manage.feature
@@ -353,17 +534,30 @@ test_files:
 - features/support/env.rb
 - features/support/hooks.rb
 - features/support/pickle.rb
+- features/support/vcr.rb
 - features/type_conversion.feature
 - spec/association_spec.rb
 - spec/class_builder_spec.rb
 - spec/fixtures/edmx_empty.xml
 - spec/fixtures/edmx_lowercase.xml
+- spec/fixtures/error_without_message.xml
 - spec/fixtures/feed_customization/edmx_feed_customization.xml
 - spec/fixtures/feed_customization/result_feed_customization_categories_expand.xml
 - spec/fixtures/feed_customization/result_feed_customization_products_expand.xml
 - spec/fixtures/inheritance/edmx_pluralsight.xml
 - spec/fixtures/inheritance/result_pluralsight_courses.xml
+- spec/fixtures/int64_ids/edmx_boat_service.xml
+- spec/fixtures/int64_ids/edmx_car_service.xml
+- spec/fixtures/int64_ids/result_boats.xml
+- spec/fixtures/int64_ids/result_cars.xml
 - spec/fixtures/links/result_links_query.xml
+- spec/fixtures/ms_system_center/edmx_ms_system_center.xml
+- spec/fixtures/ms_system_center/edmx_ms_system_center_v2.xml
+- spec/fixtures/ms_system_center/hardware_profiles.xml
+- spec/fixtures/ms_system_center/virtual_machines.xml
+- spec/fixtures/ms_system_center/vm_templates.xml
+- spec/fixtures/nested_expands/edmx_northwind.xml
+- spec/fixtures/nested_expands/northwind_products_category_expands.xml
 - spec/fixtures/partial/partial_feed_metadata.xml
 - spec/fixtures/partial/partial_feed_part_1.xml
 - spec/fixtures/partial/partial_feed_part_2.xml
@@ -374,6 +568,10 @@ test_files:
 - spec/fixtures/sample_service/result_entity_single_category_web_get.xml
 - spec/fixtures/sample_service/result_first_category_id.xml
 - spec/fixtures/sample_service/result_multiple_category_products.xml
+- spec/fixtures/sample_service/result_select_categories_expand.xml
+- spec/fixtures/sample_service/result_select_categories_no_property.xml
+- spec/fixtures/sample_service/result_select_categories_travsing_no_expand.xml
+- spec/fixtures/sample_service/result_select_products_name_price.xml
 - spec/fixtures/sample_service/result_single_category.xml
 - spec/fixtures/sample_service/result_single_product.xml
 - spec/fixtures/sample_service/result_single_product_not_found.xml
@@ -386,7 +584,9 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/describe_private.rb
 - spec/support/element_helpers.rb
+- spec/support/sample_service_matcher.rb
 - test/RubyODataService/RubyODataService.sln
+- test/RubyODataService/RubyODataService/App_Data/.gitkeep
 - test/RubyODataService/RubyODataService/App_Start/EntityFramework.SqlServerCompact.cs
 - test/RubyODataService/RubyODataService/BasicAuth/RubyOData.svc
 - test/RubyODataService/RubyODataService/BasicAuth/RubyOData.svc.cs