odata4 0.8.2 → 0.9.0

data/spec/odata4/entity_container_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe OData4::EntityContainer do
   let(:subject) { OData4::EntityContainer.new(service) }
   let(:service) do
-    OData4::Service.open('http://services.odata.org/V4/OData/OData.svc', metadata_file: metadata_file)
+    OData4::Service.new('http://services.odata.org/V4/OData/OData.svc', metadata_file: metadata_file)
   end
   let(:metadata_file) { 'spec/fixtures/files/metadata.xml' }
 

data/spec/odata4/entity_set_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OData4::EntitySet, vcr: {cassette_name: 'entity_set_specs'} do
   before(:example) do
-    OData4::Service.open('http://services.odata.org/V4/OData/OData.svc', name: 'ODataDemo')
+    OData4::Service.new('http://services.odata.org/V4/OData/OData.svc', name: 'ODataDemo')
   end
 
   let(:subject) { OData4::EntitySet.new(options) }

data/spec/odata4/entity_spec.rb

@@ -3,7 +3,7 @@ require_relative 'entity/shared_examples'
 
 describe OData4::Entity, vcr: {cassette_name: 'entity_specs'} do
   before(:example) do
-    OData4::Service.open('http://services.odata.org/V4/OData/OData.svc', name: 'ODataDemo')
+    OData4::Service.new('http://services.odata.org/V4/OData/OData.svc', name: 'ODataDemo')
   end
 
   let(:subject) { OData4::Entity.new(options) }

data/spec/odata4/navigation_property/proxy_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OData4::NavigationProperty::Proxy, vcr: {cassette_name: 'navigation_property_proxy_specs'} do
   before :each do
-    OData4::Service.open('http://services.odata.org/V4/OData/OData.svc', name: 'ODataDemo')
+    OData4::Service.new('http://services.odata.org/V4/OData/OData.svc', name: 'ODataDemo')
   end
 
   let(:entity) { OData4::ServiceRegistry['ODataDemo']['Products'][1] }

data/spec/odata4/property_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OData4::Property do
   let(:service) do
-    OData4::Service.open('http://services.odata.org/V4/OData/OData.svc', metadata_file: metadata_file)
+    OData4::Service.new('http://services.odata.org/V4/OData/OData.svc', metadata_file: metadata_file)
   end
   let(:metadata_file) { 'spec/fixtures/files/metadata.xml' }
   let(:subject) { OData4::Property.new('PropertyName', '1') }

data/spec/odata4/query_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OData4::Query, vcr: {cassette_name: 'query_specs'} do
   before(:example) do
-    OData4::Service.open('http://services.odata.org/V4/OData/OData.svc', name: 'ODataDemo')
+    OData4::Service.new('http://services.odata.org/V4/OData/OData.svc', name: 'ODataDemo')
   end
 
   let(:subject) { OData4::Query.new(entity_set) }

data/spec/odata4/schema/complex_type_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OData4::Schema::ComplexType, vcr: {cassette_name: 'schema/complex_type_specs'} do
   before(:example) do
-    OData4::Service.open('http://services.odata.org/V4/OData/OData.svc', name: 'ODataDemo')
+    OData4::Service.new('http://services.odata.org/V4/OData/OData.svc', name: 'ODataDemo')
   end
 
   let(:service) { OData4::ServiceRegistry['ODataDemo'] }

data/spec/odata4/schema/enum_type_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OData4::Schema::EnumType, vcr: {cassette_name: 'schema/enum_type_specs'} do
   before(:example) do
-    OData4::Service.open('http://services.odata.org/V4/OData/OData.svc', name: 'ODataDemo', metadata_file: metadata_file)
+    OData4::Service.new('http://services.odata.org/V4/OData/OData.svc', name: 'ODataDemo', metadata_file: metadata_file)
   end
 
   let(:metadata_file) { 'spec/fixtures/files/metadata.xml' }

data/spec/odata4/schema_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe OData4::Schema do
   let(:subject) { OData4::Schema.new(schema_xml, service) }
   let(:service) do
-    OData4::Service.open('http://services.odata.org/V4/OData/OData.svc', metadata_file: metadata_file)
+    OData4::Service.new('http://services.odata.org/V4/OData/OData.svc', metadata_file: metadata_file)
   end
   let(:metadata_file) { 'spec/fixtures/files/metadata.xml' }
   let(:schema_xml) { service.metadata.xpath('//Schema').first }

data/spec/odata4/service/request_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OData4::Service::Request, vcr: {cassette_name: 'service/request_specs'} do
   let(:subject) { OData4::Service::Request.new(service, 'Products') }
-  let(:service) { OData4::Service.open(service_url, name: 'ODataDemo', metadata_file: metadata_file) }
+  let(:service) { OData4::Service.new(service_url, name: 'ODataDemo', metadata_file: metadata_file) }
   let(:service_url) { 'http://services.odata.org/V4/OData/OData.svc' }
   let(:metadata_file) { 'spec/fixtures/files/metadata.xml' }
 

data/spec/odata4/service/response_spec.rb

@@ -21,8 +21,8 @@ shared_examples 'a valid response' do
 end
 
 describe OData4::Service::Response, vcr: {cassette_name: 'service/response_specs'} do
-  let(:subject) { OData4::Service::Response.new(service, response, entity_set.query) }
-  let(:service) { OData4::Service.open(service_url, name: 'ODataDemo', metadata_file: metadata_file) }
+  let(:subject) { OData4::Service::Response.new(service, entity_set.query) { response } }
+  let(:service) { OData4::Service.new(service_url, name: 'ODataDemo', metadata_file: metadata_file) }
   let(:service_url) { 'http://services.odata.org/V4/OData/OData.svc' }
   let(:metadata_file) { 'spec/fixtures/files/metadata.xml' }
   let(:entity_set) { service['Products'] }
@@ -30,7 +30,7 @@ describe OData4::Service::Response, vcr: {cassette_name: 'service/response_specs
     response = double('response')
     allow(response).to receive_messages(
       headers: { 'Content-Type' => content_type },
-      code: response_status,
+      status: response_status,
       body: response_body
     )
     response

data/spec/odata4/service_registry_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OData4::ServiceRegistry, vcr: {cassette_name: 'service_registry_specs'} do
   let(:subject) { OData4::ServiceRegistry }
-  let(:sample_service) { OData4::Service.open('http://services.odata.org/V4/OData/OData.svc', name: 'demoService') }
+  let(:sample_service) { OData4::Service.new('http://services.odata.org/V4/OData/OData.svc', name: 'demoService') }
 
   it { expect(subject).to respond_to(:add) }
   it { expect(subject).to respond_to(:[]) }

data/spec/odata4/service_spec.rb

@@ -3,25 +3,86 @@ require 'spec_helper'
 describe OData4::Service, vcr: {cassette_name: 'service_specs'} do
   let(:service_url) { 'http://services.odata.org/V4/OData/OData.svc' }
   let(:metadata_file) { 'spec/fixtures/files/metadata.xml' }
-  let(:subject) { OData4::Service.open(service_url, name: 'ODataDemo', metadata_file: metadata_file) }
+  let(:subject) { OData4::Service.new(service_url, name: 'ODataDemo', metadata_file: metadata_file) }
 
-  describe '.open' do
-    it { expect(OData4::Service).to respond_to(:open) }
+  describe '.new' do
     it 'adds itself to OData4::ServiceRegistry on creation' do
       expect(OData4::ServiceRegistry['ODataDemo']).to be_nil
       expect(OData4::ServiceRegistry[service_url]).to be_nil
 
-      service = OData4::Service.open(service_url, name: 'ODataDemo')
+      service = OData4::Service.new(service_url, name: 'ODataDemo')
 
       expect(OData4::ServiceRegistry['ODataDemo']).to eq(service)
       expect(OData4::ServiceRegistry[service_url]).to eq(service)
     end
+
     it 'registers custom types on creation' do
-      service = OData4::Service.open(service_url, name: 'ODataDemo')
+      service = OData4::Service.new(service_url, name: 'ODataDemo')
 
       expect(OData4::PropertyRegistry['ODataDemo.Address']).to be_a(Class)
       expect(OData4::PropertyRegistry['ODataDemo.ProductStatus']).to be_a(Class)
     end
+
+    it 'allows connection to be set by passing it instead of service_url' do
+      connection = Faraday.new(service_url)
+      service = OData4::Service.new(connection)
+      expect(service.connection).to eq(connection)
+    end
+
+    it 'allows connection to be customized via options hash' do
+      service = OData4::Service.new(service_url, connection: {
+        headers: { 'X-Custom-Header' => 'foo' }
+      })
+      expect(service.connection.headers).to include('X-Custom-Header' => 'foo')
+    end
+
+    it 'allows connection to be customized via block argument' do
+      service = OData4::Service.new(service_url) do |conn|
+        conn.headers['X-Custom-Header'] = 'foo'
+        conn.adapter Faraday.default_adapter
+      end
+      expect(service.connection.headers).to include('X-Custom-Header' => 'foo')
+    end
+
+    it 'allows logger to be set via option' do
+      logger = Logger.new(STDERR).tap { |l| l.level = Logger::ERROR }
+      service = OData4::Service.new(service_url, logger: logger)
+      expect(service.logger).to eq(logger)
+    end
+  end
+
+  describe '#connection' do
+    it 'returns the connection object used by the service' do
+      expect(subject.connection).to be_a(Faraday::Connection)
+    end
+
+    it 'uses the service URL as URL prefix' do
+      expect(subject.connection.url_prefix.to_s).to eq(subject.service_url)
+    end
+  end
+
+  describe '#logger' do
+    let(:logger) { Logger.new(STDERR).tap { |l| l.level = Logger::ERROR } }
+
+    it 'returns the logger used by the service' do
+      expect(subject.logger).to be_a(Logger)
+    end
+
+    it 'returns the default logger if none was set' do
+      expect(subject.logger.level).to eq(Logger::WARN)
+    end
+
+    it 'uses Rails logger if available' do
+      stub_const 'Rails', Class.new { def self.logger; end }
+      allow(Rails).to receive(:logger).and_return(logger)
+      expect(subject.logger).to eq(logger)
+    end
+
+    it 'allows logger to be set via attribute writer' do
+      expect(subject.logger).not_to eq(logger)
+      subject.logger = logger
+      expect(subject.logger).to eq(logger)
+    end
   end
 
   describe '#service_url' do

data/spec/odata4/usage_example_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'Usage examples', vcr: { cassette_name: 'usage_example_specs' } do
   let(:service_url) { 'http://services.odata.org/V4/OData/OData.svc' }
-  let(:service) { OData4::Service.open(service_url, name: 'ODataDemo') }
+  let(:service) { OData4::Service.new(service_url, name: 'ODataDemo') }
 
   describe 'getting information' do
     it 'returns the service URL' do
@@ -173,4 +173,16 @@ describe 'Usage examples', vcr: { cassette_name: 'usage_example_specs' } do
       expect(product["Price"]).to eq(3.5)
     end
   end
+
+  describe 'headers and authorization' do
+    it 'using HTTP Basic auth' do
+      service.connection.basic_auth('username', 'password')
+      expect(service['Products'][2]).to be_a(OData4::Entity)
+    end
+
+    it 'using token auth' do
+      service.connection.authorization(:Bearer, 'token')
+      expect(service['Products'][3]).to be_a(OData4::Entity)
+    end
+  end
 end

data/spec/support/vcr.rb

@@ -2,7 +2,7 @@ require 'vcr'
 
 VCR.configure do |c|
   c.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
-  c.hook_into :typhoeus
+  c.hook_into :faraday
   c.default_cassette_options = { record: :new_episodes }
   c.debug_logger = File.open(ENV['VCR_LOG'], 'w') if ENV['VCR_LOG']
   c.configure_rspec_metadata!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odata4
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Christoph Wagner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,19 +152,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: andand
   requirement: !ruby/object:Gem::Requirement