ruby_odata 0.1.0 → 0.1.1

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_odata
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
+date: 2012-08-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70223407772000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     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
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70223407771500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +53,15 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70223407771500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70223407771040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +69,15 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70223407771040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: backports
-  requirement: &70223407770580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,84 +85,172 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70223407770580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70223407770120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     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
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70223407769660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     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
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70223407769200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     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
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: pickle
-  requirement: &70223407785100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     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
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.11
 - !ruby/object:Gem::Dependency
-  name: faker
-  requirement: &70223407784640 !ruby/object:Gem::Requirement
+  name: machinist
+  requirement: !ruby/object:Gem::Requirement
     none: false
     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
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: machinist
-  requirement: &70223407784180 !ruby/object:Gem::Requirement
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.8.8
   type: :development
   prerelease: false
-  version_requirements: *70223407784180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.8
 - !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: &70223407783720 !ruby/object:Gem::Requirement
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *70223407783720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: guard-cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.4
 description: An OData Client Library for Ruby.  Use this to interact with OData services
 email:
 - damien.white@visoftinc.com
@@ -142,15 +261,37 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
-- CHANGELOG.rdoc
+- .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 +304,12 @@ files:
 - features/support/env.rb
 - features/support/hooks.rb
 - features/support/pickle.rb
+- features/support/vcr.rb
 - features/type_conversion.feature
 - 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
@@ -206,7 +349,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
@@ -325,22 +470,48 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 737449873321699372
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 737449873321699372
 requirements: []
 rubyforge_project: ruby-odata
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 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,6 +524,7 @@ 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
@@ -386,7 +558,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

data/CHANGELOG.rdoc

@@ -1,88 +0,0 @@
-= ruby_odata Change Log
-
-=== 0.0.1 
-* New Features
-  * Basic CRUD Operations
-  * Query Enhancement: Filters
-  * Query Enhancement: Expands
-
-=== 0.0.2
-* New Features
-  * Query Enhancement: Order By (both desc and asc)
-
-=== 0.0.3
-* Bug Fixes
-  * Rearranged code to match the gem name.  Things were mismatched between odata_ruby and ruby_odata.
-
-=== 0.0.4
-* New Features
-  * Query Enhancement: skip
-  * Query Enhancement: top
-  * Ability to perform paging using skip and top together
-  * Updated README with examples for order_by, skip, and top
-  
-=== 0.0.5
-* Bug Fixes
-  * Works with Ruby 1.9.1
-  * Works with ActiveSupport 3.0.0.beta4
-  
-=== 0.0.6
-* New Features
-  * Ability to batch saves (Adds, Updates, Deletes); this will help save on network chatter
-
-=== 0.0.7
-* New Features
-  * Complex Types are now supported
-  * Support for Edm.Int16, Edm.Int32, Edm.Int64
-  * Support for Edm.Decimal
-  * Support for Edm.DateTime
-  
-=== 0.0.8
-* New Features
-  * Basic HTTP Authentication (thanks J.D. Mullin)
-  * Modified cucumber tests to setup the test database so you no longer need to copy them yourself
-  * Support for nullable elements returned from the Data Service (m:null ="true")
-* Bug Fixes
-  * ActiveSupport 2.3.x (tested 2.3.11) and 3.0.x (tested 3.0.4) are now supported
-  * Works with Ruby 1.9.2
-
-=== 0.0.9
-* New Features
-  * Support for self-signed SSL certificates (thanks J.D. Mullin)
-  * Refactored building classes/collections to only make one call to the service
-  * Added support for a WCF service with lowercase entities (reported by Klaus Rohe)
-* Bug Fixes
-  * Fixed issue with passing a service URL with a trailing slash
-* Other
-  * Cleaned up testing by adding a default task to the Rakefile that runs RSpec and Cucumber
-
-=== 0.0.10
-* New Features
-  * Added the ability to pass additional parameters that are appended to the query string for requests
-  * Added initial support for feed customizations (SyndicationTitle and SyndicationSummary)
-  * Enhanced ruby_odata's awareness of classes based on the metadata instead of relying on results that are returned
-* Bug Fixes
-  * Fixed issues with nested collections (eager loading)
-  * Handled ArgumentError on the Time.parse for older versions of Ruby; used DateTime.parse instead if Time.parse fails
-  * Removed the camelize method call when building the root URL for collections (Reported by mkoegel, issue #3 on github)
-  * 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.
-
-=== 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