odata 0.0.8 → 0.0.9

data/spec/odata/entity_set_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe OData::EntitySet do
+  let(:subject) { OData::EntitySet.new(options) }
+  let(:options) { {
+      container: 'DemoService', namespace: 'ODataDemo', name: 'Products',
+      type: 'Product'
+  } }
+
+  before(:example) do
+    OData::Service.open('http://services.odata.org/OData/OData.svc')
+  end
+
+  # Basic Instance Methods
+  it { expect(subject).to respond_to(:name, :type, :container, :namespace) }
+
+  it { expect(subject.name).to eq('Products') }
+  it { expect(subject.container).to eq('DemoService') }
+  it { expect(subject.namespace).to eq('ODataDemo') }
+  it { expect(subject.type).to eq('Product') }
+
+  describe '#each' do
+    it { expect(subject).to respond_to(:each) }
+    it { expect(lambda {
+      @counter = 0
+      subject.each {|entity| @counter += 1}
+      @counter
+    }.call).to eq(11) }
+    it { expect(lambda {
+      @entities = []
+      subject.each {|entity| @entities << entity}
+      @entities
+    }.call.shuffle.first).to be_a(OData::Entity) }
+  end
+
+  describe '#count' do
+    it { expect(subject).to respond_to(:count) }
+    it { expect(subject.count).to eq(11) }
+  end
+end

data/spec/odata/entity_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe OData::Entity do
+  let(:subject) { OData::Entity.new(options) }
+  let(:options) { {
+      type:       'ODataDemo.Product',
+      namespace:  'ODataDemo'
+  } }
+
+  it { expect(subject).to respond_to(:name, :type, :namespace) }
+
+  it { expect(subject.name).to eq('Product') }
+  it { expect(subject.type).to eq('ODataDemo.Product') }
+  it { expect(subject.namespace).to eq('ODataDemo') }
+
+  describe '.from_xml' do
+    let(:subject) { OData::Entity.from_xml(product_xml, options) }
+    let(:product_xml) {
+      document = ::Nokogiri::XML(File.open('spec/fixtures/sample_service/product_0.xml'))
+      document.remove_namespaces!
+      document.xpath('//entry').first
+    }
+
+    before(:example) do
+      OData::Service.open('http://services.odata.org/OData/OData.svc')
+    end
+
+    it { expect(OData::Entity).to respond_to(:from_xml) }
+    it { expect(subject).to be_a(OData::Entity) }
+
+    it { expect(subject.name).to eq('Product') }
+    it { expect(subject.type).to eq('ODataDemo.Product') }
+    it { expect(subject.namespace).to eq('ODataDemo') }
+
+    it { expect(subject['ID']).to eq(0) }
+    it { expect(subject['Name']).to eq('Bread') }
+    it { expect(subject['Description']).to eq('Whole grain bread') }
+    it { expect(subject['ReleaseDate']).to eq(DateTime.new(1992,1,1,0,0,0,0)) }
+    it { expect(subject['DiscontinuedDate']).to be_nil }
+    it { expect(subject['Rating']).to eq(4) }
+    it { expect(subject['Price']).to eq(2.5) }
+  end
+end

data/spec/odata/properties/decimal_spec.rb

@@ -6,8 +6,9 @@ describe OData::Properties::Decimal do
   it { expect(subject.type).to eq('Edm.Decimal') }
   it { expect(subject.value).to eq(BigDecimal('678.90325')) }
 
-  it { expect { subject.value = BigDecimal((7.9 * (10**28)) + 1) }.to raise_error(ArgumentError) }
-  it { expect { subject.value = BigDecimal((-7.9 * (10**28)) - 1) }.to raise_error(ArgumentError) }
+  it { expect { subject.value = BigDecimal((7.9 * (10**28)), 2) + 1 }.to raise_error(ArgumentError) }
+  it { expect { subject.value = BigDecimal((-7.9 * (10**28)), 2) - 1 }.to raise_error(ArgumentError) }
+  it { expect { subject.value = BigDecimal((3.4 * (10**-28)), 2) * 3.14151 + 5 }.to raise_error(ArgumentError) }
 
   it { expect(lambda {
     subject.value = '19.89043256'

data/spec/odata/properties/string_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 describe OData::Properties::String do
   let(:subject) { OData::Properties::String.new('Stringy', 'This is an example') }
 
+  it { expect(subject).to respond_to(:is_unicode?) }
+  it { expect(subject).to respond_to(:has_default_value?) }
+  it { expect(subject).to respond_to(:default_value) }
+
   it { expect(subject.type).to eq('Edm.String') }
   it { expect(subject.value).to eq('This is an example')}
 
@@ -10,4 +14,33 @@ describe OData::Properties::String do
     subject.value = 'Another example'
     subject.value
   }.call).to eq('Another example') }
+
+  it { expect(lambda {
+    subject.value = nil
+    subject.value
+  }.call).to eq(nil) }
+
+  describe '#is_unicode?' do
+    let(:not_unicode) { OData::Properties::String.new('Stringy', 'This is an example', unicode: false) }
+
+    it { expect(subject.is_unicode?).to eq(true) }
+    it { expect(not_unicode.is_unicode?).to eq(false) }
+
+    it { expect(subject.value.encoding).to eq(Encoding::UTF_8) }
+    it { expect(not_unicode.value.encoding).to eq(Encoding::ASCII) }
+  end
+
+  describe 'when #allows_nil? is false' do
+    let(:subject) { OData::Properties::String.new('Stringy', 'This is an example', allows_nil: false) }
+
+    it { expect {subject.value = nil}.to raise_error(ArgumentError) }
+    it { expect {subject.value = 'Test'}.not_to raise_error }
+  end
+
+  describe 'with default_value' do
+    let(:subject) { OData::Properties::String.new('Stringy', nil, default_value: 'Sample Text') }
+
+    it { expect(subject.has_default_value?).to eq(true) }
+    it { expect(subject.default_value).to eq('Sample Text') }
+  end
 end

data/spec/odata/property_spec.rb

@@ -17,38 +17,6 @@ describe OData::Property do
   it { expect(subject).to respond_to(:allows_nil?) }
   it { expect(subject.allows_nil?).to eq(true) }
 
-  it { expect(subject).to respond_to(:max_length) }
-  it { expect(lambda {subject.max_length}).to raise_error(NotImplementedError) }
-  #it { expect(subject.max_length).to eq(nil) }
-
-  it { expect(subject).to respond_to(:fixed_length) }
-  it { expect(lambda {subject.fixed_length}).to raise_error(NotImplementedError) }
-  #it { expect(subject.fixed_length).to eq(nil) }
-
-  it { expect(subject).to respond_to(:precision) }
-  it { expect(lambda {subject.precision}).to raise_error(NotImplementedError) }
-  #it { expect(subject.precision).to eq(nil) }
-
-  it { expect(subject).to respond_to(:scale) }
-  it { expect(lambda {subject.scale}).to raise_error(NotImplementedError) }
-  #it { expect(subject.scale).to eq(nil) }
-
-  it { expect(subject).to respond_to(:is_unicode?) }
-  it { expect(lambda {subject.is_unicode?}).to raise_error(NotImplementedError) }
-  #it { expect(subject.is_unicode?).to eq(true) }
-
-  it { expect(subject).to respond_to(:collation) }
-  it { expect(lambda {subject.collation}).to raise_error(NotImplementedError) }
-  #it { expect(subject.collation).to eq(nil) }
-
-  it { expect(subject).to respond_to(:srid) }
-  it { expect(lambda {subject.srid}).to raise_error(NotImplementedError) }
-  #it { expect(subject.srid).to eq(0) }
-
-  it { expect(subject).to respond_to(:default_value) }
-  it { expect(lambda {subject.default_value}).to raise_error(NotImplementedError) }
-  #it { expect(subject.default_value).to eq(nil) }
-
   it { expect(subject).to respond_to(:concurrency_mode) }
   it { expect(subject.concurrency_mode).to eq(:none) }
 

data/spec/odata/service_registry_spec.rb

@@ -4,12 +4,6 @@ describe OData::ServiceRegistry do
   let(:subject) { OData::ServiceRegistry }
   let(:sample_service) { OData::Service.open('http://services.odata.org/OData/OData.svc') }
 
-  # 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
-
   it { expect(subject).to respond_to(:add) }
   it { expect(subject).to respond_to(:[]) }
 

data/spec/odata/service_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe OData::Service 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
@@ -27,7 +29,8 @@ describe OData::Service do
 
   describe 'instance methods' do
     it { expect(subject).to respond_to(:service_url) }
-    it { expect(subject).to respond_to(:entities) }
+    it { expect(subject).to respond_to(:entity_types) }
+    it { expect(subject).to respond_to(:entity_sets) }
     it { expect(subject).to respond_to(:complex_types) }
     it { expect(subject).to respond_to(:namespace) }
   end
@@ -36,9 +39,15 @@ describe OData::Service do
     it { expect(subject.service_url).to eq('http://services.odata.org/OData/OData.svc') }
   end
 
-  describe '#entities' do
-    it { expect(subject.entities.size).to eq(10) }
-    it { expect(subject.entities).to eq(entity_types) }
+  describe '#entity_types' do
+    it { expect(subject.entity_types.size).to eq(10) }
+    it { expect(subject.entity_types).to eq(entity_types) }
+  end
+
+  describe '#entity_sets' do
+    it { expect(subject.entity_sets.size).to eq(7) }
+    it { expect(subject.entity_sets.keys).to eq(entity_set_types) }
+    it { expect(subject.entity_sets.values).to eq(entity_sets) }
   end
 
   describe '#complex_types' do
@@ -70,4 +79,8 @@ describe OData::Service do
       it { expect(subject.get(::Examples::Product, {key: 0}).first.price).to eq(2.5) }
     end
   end
+
+  describe '#[]' do
+    it { expect(subject['Product']).to be_a(OData::EntitySet) }
+  end
 end

data/spec/spec_helper.rb

@@ -11,7 +11,11 @@ end
 require 'odata'
 
 require 'webmock/rspec'
-WebMock.disable_net_connect!(allow_localhost: true, allow: 'codeclimate.com')
+if ENV['REAL_HTTP'] == 'true'
+  WebMock.allow_net_connect!
+else
+  WebMock.disable_net_connect!(allow_localhost: true, allow: 'codeclimate.com')
+end
 
 RSpec.configure do |config|
   if config.files_to_run.one?
@@ -32,13 +36,33 @@ RSpec.configure do |config|
   end
 
   config.before(:example) do
-    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'))
+    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').
-        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=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/$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'))
+    end
+  end
 
-    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'))
+  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)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odata
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - James Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.18.0
+- !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
@@ -152,6 +166,8 @@ files:
 - README.md
 - Rakefile
 - lib/odata.rb
+- lib/odata/entity.rb
+- lib/odata/entity_set.rb
 - lib/odata/model.rb
 - lib/odata/properties.rb
 - lib/odata/properties/binary.rb
@@ -162,6 +178,7 @@ files:
 - lib/odata/properties/float.rb
 - lib/odata/properties/guid.rb
 - lib/odata/properties/integer.rb
+- lib/odata/properties/number.rb
 - lib/odata/properties/string.rb
 - lib/odata/properties/time.rb
 - lib/odata/property.rb
@@ -174,6 +191,11 @@ files:
 - spec/fixtures/sample_service/metadata.xml
 - spec/fixtures/sample_service/product_0.xml
 - spec/fixtures/sample_service/products.xml
+- 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/odata/entity_set_spec.rb
+- spec/odata/entity_spec.rb
 - spec/odata/model_spec.rb
 - spec/odata/properties/binary_spec.rb
 - spec/odata/properties/boolean_spec.rb
@@ -218,6 +240,11 @@ test_files:
 - spec/fixtures/sample_service/metadata.xml
 - spec/fixtures/sample_service/product_0.xml
 - spec/fixtures/sample_service/products.xml
+- 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/odata/entity_set_spec.rb
+- spec/odata/entity_spec.rb
 - spec/odata/model_spec.rb
 - spec/odata/properties/binary_spec.rb
 - spec/odata/properties/boolean_spec.rb