odata 0.3.1 → 0.3.2

data/spec/odata/query/criteria_spec.rb

@@ -1,36 +1,69 @@
 require 'spec_helper'
 
 describe OData::Query::Criteria do
-  let(:subject) { OData::Query::Criteria.new(operation: 'filter', argument: "Name eq 'Bread'") }
-  let(:valid_operations) { [:filter, :order_by, :skip, :top, :select, :expand, :inline_count] }
+  let(:subject) { OData::Query::Criteria.new(property: :Name) }
 
-  it { expect(subject).to respond_to(:operation) }
-  it { expect(subject).to respond_to(:argument) }
+  it { expect(subject).to respond_to(:property) }
+  it { expect(subject.property).to eq(:Name)}
 
-  it { expect(subject.operation).to eq(:filter) }
-  it { expect(subject.argument).to eq("Name eq 'Bread'")}
+  it { expect(subject).to respond_to(:operator) }
+  it { expect(subject).to respond_to(:value) }
+  it { expect(subject).to respond_to(:to_s) }
 
-  it 'should require operation option' do
-    expect {
-      OData::Query::Criteria.new(argument: 'test')
-    }.to raise_error(ArgumentError, 'Missing required option: operation')
-  end
+  it { expect(subject).to respond_to(:eq) }
+  it { expect(subject).to respond_to(:ne) }
+  it { expect(subject).to respond_to(:gt) }
+  it { expect(subject).to respond_to(:ge) }
+  it { expect(subject).to respond_to(:lt) }
+  it { expect(subject).to respond_to(:le) }
 
-  it 'should require argument option' do
-    expect {
-      OData::Query::Criteria.new(operation: 'filter')
-    }.to raise_error(ArgumentError, 'Missing required option: argument')
-  end
+  describe 'operator method' do
+    it '#eq sets up criteria properly' do
+      criteria = subject.eq('Bread')
+      expect(criteria).to eq(subject)
+      expect(criteria.operator).to eq(:eq)
+      expect(criteria.value).to eq('Bread')
+      expect(criteria.to_s).to eq("Name eq 'Bread'")
+    end
+
+    it '#ne sets up criteria properly' do
+      criteria = subject.ne('Bread')
+      expect(criteria).to eq(subject)
+      expect(criteria.operator).to eq(:ne)
+      expect(criteria.value).to eq('Bread')
+      expect(criteria.to_s).to eq("Name ne 'Bread'")
+    end
 
-  it 'should validate operation option' do
-    valid_operations.each do |operation|
-      expect {
-        OData::Query::Criteria.new(operation: operation, argument: 'test')
-      }.to_not raise_error
+    it '#gt sets up criteria properly' do
+      criteria = subject.gt(5)
+      expect(criteria).to eq(subject)
+      expect(criteria.operator).to eq(:gt)
+      expect(criteria.value).to eq(5)
+      expect(criteria.to_s).to eq('Name gt 5')
     end
 
-    expect {
-      OData::Query::Criteria.new(operation: 'invalid', argument: 'test')
-    }.to raise_error(ArgumentError, 'Operation not supported: invalid')
+    it '#ge sets up criteria properly' do
+      criteria = subject.ge(5)
+      expect(criteria).to eq(subject)
+      expect(criteria.operator).to eq(:ge)
+      expect(criteria.value).to eq(5)
+      expect(criteria.to_s).to eq('Name ge 5')
+    end
+
+    it '#lt sets up criteria properly' do
+      criteria = subject.lt(5)
+      expect(criteria).to eq(subject)
+      expect(criteria.operator).to eq(:lt)
+      expect(criteria.value).to eq(5)
+      expect(criteria.to_s).to eq('Name lt 5')
+    end
+
+    it '#le sets up criteria properly' do
+      criteria = subject.le(5)
+      expect(criteria).to eq(subject)
+      expect(criteria.operator).to eq(:le)
+      expect(criteria.value).to eq(5)
+      expect(criteria.to_s).to eq('Name le 5')
+    end
   end
 end

data/spec/odata/query_spec.rb

@@ -1,58 +1,97 @@
 require 'spec_helper'
 
-describe OData::Query do
-  let(:subject) { OData::Query.new('Products') }
+describe OData::Query, vcr: {cassette_name: 'query_specs'} do
+  let(:subject) { OData::Query.new(entity_set) }
+  let(:entity_set) { OData::EntitySet.new(options) }
+  let(:options) { {
+      container: 'DemoService', namespace: 'ODataDemo', name: 'Products',
+      type: 'Product'
+  } }
 
-  it { expect(subject).to respond_to(:<<) }
-  it { expect(subject).to respond_to(:to_s) }
+  before(:example) do
+    OData::Service.open('http://services.odata.org/OData/OData.svc')
+  end
 
+  it { expect(subject).to respond_to(:to_s) }
   it { expect(subject.to_s).to eq('Products')}
 
-  it 'handles pagination operations' do
-    skip_criteria = OData::Query::Criteria.new(operation: 'skip', argument: 5)
-    top_criteria = OData::Query::Criteria.new(operation: 'top', argument: 5)
-    subject << top_criteria
-    subject << skip_criteria
-    expect(subject.to_s).to eq('Products?$skip=5&$top=5')
+  it { expect(subject).to respond_to(:[]) }
+  describe '#[]' do
+    it { expect(subject[:Name]).to be_a(OData::Query::Criteria) }
+    it { expect(subject[:Name].property).to eq(:Name) }
   end
 
-  it 'handles inline_count operations' do
-    criteria = OData::Query::Criteria.new(operation: 'inline_count', argument: 'allpages')
-    subject << criteria
-    expect(subject.to_s).to eq('Products?$inlinecount=allpages')
+  it { expect(subject).to respond_to(:where) }
+  describe '#where' do
+    let(:criteria) { subject[:Name].eq('Bread') }
+    let(:query_string) { "Products?$filter=Name eq 'Bread'" }
+
+    it { expect(subject.where(criteria)).to eq(subject) }
+    it { expect(subject.where(criteria).to_s).to eq(query_string) }
+  end
+
+  #it { expect(subject).to respond_to(:and) }
+  describe '#and' do
+    it { pending; fail }
+  end
+
+  #it { expect(subject).to respond_to(:or) }
+  describe '#or' do
+    it { pending; fail }
+  end
+
+  it { expect(subject).to respond_to(:skip) }
+  describe '#skip' do
+    it { expect(subject.skip(5)).to eq(subject) }
+    it 'properly formats query with skip specified' do
+      subject.skip(5)
+      expect(subject.to_s).to eq('Products?$skip=5')
+    end
+  end
+
+  it { expect(subject).to respond_to(:limit) }
+  describe '#limit' do
+
+    it { expect(subject.limit(5)).to eq(subject) }
+    it 'properly formats query with limit specified' do
+      subject.limit(5)
+      expect(subject.to_s).to eq('Products?$top=5')
+    end
   end
 
-  it 'handles select operations' do
-    criteria1 = OData::Query::Criteria.new(operation: 'select', argument: 'Name')
-    criteria2 = OData::Query::Criteria.new(operation: 'select', argument: 'Rating')
-    criteria3 = OData::Query::Criteria.new(operation: 'select', argument: 'Price')
-    subject << criteria1
-    subject << criteria2
-    subject << criteria3
-    expect(subject.to_s).to eq('Products?$select=Name,Rating,Price')
+  it { expect(subject).to respond_to(:include_count) }
+  describe '#include_count' do
+    it { expect(subject.include_count).to eq(subject) }
+    it 'properly formats query with include_count specified' do
+      subject.include_count
+      expect(subject.to_s).to eq('Products?$inlinecount=allpages')
+    end
   end
 
-  it 'handles expand operations' do
-    criteria1 = OData::Query::Criteria.new(operation: 'expand', argument: 'Supplier')
-    criteria2 = OData::Query::Criteria.new(operation: 'expand', argument: 'ProductDetail')
-    subject << criteria1
-    subject << criteria2
-    expect(subject.to_s).to eq('Products?$expand=Supplier,ProductDetail')
+  it { expect(subject).to respond_to(:select) }
+  describe '#select' do
+    it { expect(subject.select(:Name, :Price)).to eq(subject) }
+    it 'properly formats query with select operation specified' do
+      subject.select(:Name, :Price)
+      expect(subject.to_s).to eq('Products?$select=Name,Price')
+    end
   end
 
-  it 'handles order_by operations' do
-    criteria1 = OData::Query::Criteria.new(operation: 'order_by', argument: 'Price')
-    criteria2 = OData::Query::Criteria.new(operation: 'order_by', argument: 'Rating desc')
-    subject << criteria1
-    subject << criteria2
-    expect(subject.to_s).to eq('Products?$orderby=Price,Rating desc')
+  it { expect(subject).to respond_to(:expand) }
+  describe '#expand' do
+    it { expect(subject.expand(:Supplier)).to eq(subject) }
+    it 'properly formats query with expand operation specified' do
+      subject.expand(:Supplier)
+      expect(subject.to_s).to eq('Products?$expand=Supplier')
+    end
   end
 
-  it 'handles filter operations' do
-    criteria1 = OData::Query::Criteria.new(operation: 'filter', argument: 'Rating gt 2')
-    criteria2 = OData::Query::Criteria.new(operation: 'filter', argument: 'Price lt 15')
-    subject << criteria1
-    subject << criteria2
-    expect(subject.to_s).to eq('Products?$filter=Rating gt 2 and Price lt 15')
+  it { expect(subject).to respond_to(:order_by) }
+  describe '#order_by' do
+    it { expect(subject.order_by(:Name, :Price)).to eq(subject) }
+    it 'properly formats query with orderby operation specified' do
+      subject.order_by(:Name, :Price)
+      expect(subject.to_s).to eq('Products?$orderby=Name,Price')
+    end
   end
 end

data/spec/odata/service_registry_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe OData::ServiceRegistry do
+describe OData::ServiceRegistry, vcr: {cassette_name: 'service_registry_specs'} do
   let(:subject) { OData::ServiceRegistry }
   let(:sample_service) { OData::Service.open('http://services.odata.org/OData/OData.svc') }
 

data/spec/odata/service_spec.rb

@@ -1,18 +1,12 @@
 require 'spec_helper'
 
-describe OData::Service do
+describe OData::Service, vcr: {cassette_name: 'service_specs'} do
   let(:subject) { OData::Service.open('http://services.odata.org/OData/OData.svc') }
   let(:entity_types) { %w{Product FeaturedProduct ProductDetail Category Supplier Person Customer Employee PersonDetail Advertisement} }
   let(:entity_sets) { %w{Products ProductDetails Categories Suppliers Persons PersonDetails Advertisements} }
   let(:entity_set_types) { %w{Product ProductDetail Category Supplier Person PersonDetail Advertisement} }
   let(:complex_types) { %w{Address} }
 
-  # We're calling this as a private method because there should not be any
-  # reasons to have to flush the service registry except in testing.
-  after :each do
-    OData::ServiceRegistry.instance.send(:flush)
-  end
-
   describe '.open' do
     it { expect(OData::Service).to respond_to(:open) }
   end

data/spec/spec_helper.rb

@@ -10,14 +10,16 @@ end
 
 require 'odata'
 
-require 'webmock/rspec'
-if ENV['REAL_HTTP'] == 'true'
-  WebMock.allow_net_connect!
-else
-  WebMock.disable_net_connect!(allow_localhost: true, allow: 'codeclimate.com')
-end
-
+require 'securerandom'
 require 'timecop'
+require 'vcr'
+
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
+  c.hook_into :typhoeus
+  c.default_cassette_options = { record: :new_episodes, erb: true }
+  c.configure_rspec_metadata!
+end
 
 RSpec.configure do |config|
   if config.files_to_run.one?
@@ -26,7 +28,6 @@ RSpec.configure do |config|
 
   config.profile_examples = 3
   config.order = :random
-  Kernel.srand config.seed
 
   config.expect_with :rspec do |expectations|
     expectations.syntax = :expect
@@ -37,47 +38,9 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
-  config.before(:example) do
-    unless ENV['REAL_HTTP'] == 'true'
-      WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/$metadata').
-          to_return(status: 200, body: File.open('spec/fixtures/sample_service/metadata.xml'))
-
-      WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/Products').
-          to_return(status: 200, body: File.open('spec/fixtures/sample_service/products.xml'))
-
-      WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/Products?$inlinecount=allpages&$skip=0&$top=5').
-          to_return(status: 200, body: File.open('spec/fixtures/sample_service/products_skip0_top5.xml'))
-
-      WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/Products?$inlinecount=allpages&$skip=5&$top=5').
-          to_return(status: 200, body: File.open('spec/fixtures/sample_service/products_skip5_top5.xml'))
-
-      WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/Products?$inlinecount=allpages&$skip=10&$top=5').
-          to_return(status: 200, body: File.open('spec/fixtures/sample_service/products_skip10_top5.xml'))
-
-      WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/Products?$skip=0&$top=1').
-          to_return(status: 200, body: File.open('spec/fixtures/sample_service/first_product.xml'))
-
-      WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/Products/$count').
-          to_return(status: 200, :body => '11')
-
-      WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/Products(0)').
-          to_return(status: 200, body: File.open('spec/fixtures/sample_service/product_0.xml'))
-
-      WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/Products(99)').
-          to_return(status: 404, body: File.open('spec/fixtures/sample_service/product_not_found.xml'))
-
-      WebMock.stub_request(:get, "http://services.odata.org/OData/OData.svc/Products?$filter=Name eq 'Bread'").
-          to_return(status: 200, body: File.open('spec/fixtures/sample_service/product_filter_one.xml'))
-
-      WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/Products?$filter=Rating%20eq%203').
-          to_return(status: 200, body: File.open('spec/fixtures/sample_service/product_filter_many.xml'))
-    end
-  end
-
   config.after(:example) do
     # We're calling this as a private method because there should not be any
     # reasons to have to flush the service registry except in testing.
     OData::ServiceRegistry.instance.send(:flush)
-    WebMock.reset!
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odata
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - James Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 2.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 2.9.2
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: backports
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +186,14 @@ files:
 - spec/fixtures/sample_service/products_skip0_top5.xml
 - spec/fixtures/sample_service/products_skip10_top5.xml
 - spec/fixtures/sample_service/products_skip5_top5.xml
+- spec/fixtures/vcr_cassettes/entity_set_specs.yml
+- spec/fixtures/vcr_cassettes/entity_set_specs/bad_entry.yml
+- spec/fixtures/vcr_cassettes/entity_set_specs/existing_entry.yml
+- spec/fixtures/vcr_cassettes/entity_set_specs/new_entry.yml
+- spec/fixtures/vcr_cassettes/entity_specs.yml
+- spec/fixtures/vcr_cassettes/query_specs.yml
+- spec/fixtures/vcr_cassettes/service_registry_specs.yml
+- spec/fixtures/vcr_cassettes/service_specs.yml
 - spec/odata/entity_set_spec.rb
 - spec/odata/entity_spec.rb
 - spec/odata/properties/binary_spec.rb
@@ -254,6 +248,14 @@ test_files:
 - spec/fixtures/sample_service/products_skip0_top5.xml
 - spec/fixtures/sample_service/products_skip10_top5.xml
 - spec/fixtures/sample_service/products_skip5_top5.xml
+- spec/fixtures/vcr_cassettes/entity_set_specs.yml
+- spec/fixtures/vcr_cassettes/entity_set_specs/bad_entry.yml
+- spec/fixtures/vcr_cassettes/entity_set_specs/existing_entry.yml
+- spec/fixtures/vcr_cassettes/entity_set_specs/new_entry.yml
+- spec/fixtures/vcr_cassettes/entity_specs.yml
+- spec/fixtures/vcr_cassettes/query_specs.yml
+- spec/fixtures/vcr_cassettes/service_registry_specs.yml
+- spec/fixtures/vcr_cassettes/service_specs.yml
 - spec/odata/entity_set_spec.rb
 - spec/odata/entity_spec.rb
 - spec/odata/properties/binary_spec.rb