soap-object 0.6.5 → 0.6.6

data/lib/soap-object/factory.rb

@@ -1,22 +1,22 @@
-
-module SoapObject
-  module Factory
-
-    def using(cls, &block)
-      @the_service = find_service(cls)
-      block.call @the_service if block
-      @the_service
-    end
-
-    private
-
-    def find_service(cls)
-      services[cls] = cls.new unless services[cls]
-      services[cls]
-    end
-
-    def services
-      @services ||= {}
-    end
-  end
-end
+
+module SoapObject
+  module Factory
+
+    def using(cls, &block)
+      @the_service = find_service(cls)
+      block.call @the_service if block
+      @the_service
+    end
+
+    private
+
+    def find_service(cls)
+      services[cls] = cls.new(Savon) unless services[cls]
+      services[cls]
+    end
+
+    def services
+      @services ||= {}
+    end
+  end
+end

data/lib/soap-object/ssl_options.rb

@@ -0,0 +1,22 @@
+module SoapObject
+  class SslOptions
+    attr_accessor :verify_mode, :version
+
+    def initialize
+      yield self if block_given?
+    end
+
+    def options
+      build_options
+    end
+
+    private
+
+    def build_options
+      options = {}
+      options[:ssl_verify_mode] = verify_mode if verify_mode
+      options[:ssl_version] = version if version
+      options
+    end
+  end
+end

data/lib/soap-object/version.rb

@@ -1,5 +1,5 @@
-module Soap
-  module Object
-    VERSION = "0.6.5"
-  end
-end
+module Soap
+  module Object
+    VERSION = "0.6.6"
+  end
+end

data/soap-object.gemspec

@@ -1,24 +1,24 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'soap-object/version'
-
-Gem::Specification.new do |gem|
-  gem.name          = "soap-object"
-  gem.version       = Soap::Object::VERSION
-  gem.authors       = ["Jeffrey S. Morgan", "Doug Morgan"]
-  gem.email         = ["jeff.morgan@leandog.com", "douglas.morgan3405@gmail.com"]
-  gem.description   = %q{Wrapper around SOAP service calls to make it easy to test}
-  gem.summary       = %q{Wrapper around SOAP service calls to make it easy to test}
-  gem.homepage      = "http://github.com/cheezy/soap-object"
-
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
-
-  gem.add_dependency 'savon', '>= 2.2.0'
-
-  gem.add_development_dependency 'rspec', '>= 2.12.0'
-  gem.add_development_dependency 'cucumber', '>= 1.2.0'
-end
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'soap-object/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "soap-object"
+  gem.version       = Soap::Object::VERSION
+  gem.authors       = ["Jeffrey S. Morgan", "Doug Morgan"]
+  gem.email         = ["jeff.morgan@leandog.com", "douglas.morgan3405@gmail.com"]
+  gem.description   = %q{Wrapper around SOAP service calls to make it easy to test}
+  gem.summary       = %q{Wrapper around SOAP service calls to make it easy to test}
+  gem.homepage      = "http://github.com/cheezy/soap-object"
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+
+  gem.add_dependency 'savon', '>= 2.2.0'
+
+  gem.add_development_dependency 'rspec', '>= 2.12.0'
+  gem.add_development_dependency 'cucumber', '>= 1.2.0'
+end

data/spec/lib/client_options_spec.rb

@@ -0,0 +1,132 @@
+require 'spec_helper'
+
+class TestSoapObjectWithProperties
+  include SoapObject
+
+  wsdl 'http://blah.com'
+  proxy 'http://proxy.com:8080'
+  open_timeout 10
+  read_timeout 20
+  soap_header 'Token' => 'secret'
+  encoding 'UTF-16'
+  basic_auth 'steve', 'secret'
+  digest_auth 'digest', 'auth'
+  log_level :error
+  soap_version 2
+end
+
+class WithoutClientProperties
+  include SoapObject
+end
+
+describe SoapObject do
+  let(:client) { double('client') }
+  let(:platform) {double('savon')}
+
+  before do
+    allow(platform).to receive(:client).and_return(client)
+  end
+
+  context 'when creating new instances' do
+
+    it 'should know when it is connected to service' do
+      subject = TestSoapObjectWithProperties.new(platform)
+
+      expect(subject).to be_connected
+    end
+
+    it 'should initialize the client using the wsdl' do
+      expect(platform).to receive(:client).with(hash_including(wsdl: 'http://blah.com'))
+
+      TestSoapObjectWithProperties.new(platform)
+    end
+
+    it 'should allow one to setup a proxy' do
+      expect(platform).to receive(:client).with(hash_including(proxy: 'http://proxy.com:8080'))
+
+      TestSoapObjectWithProperties.new(platform)
+    end
+
+    it 'should allow one to set an open timeout' do
+      expect(platform).to receive(:client).with(hash_including(open_timeout: 10))
+
+      TestSoapObjectWithProperties.new(platform)
+    end
+
+    it 'should allow one to set a read timeout' do
+      expect(platform).to receive(:client).with(hash_including(read_timeout: 20))
+
+      TestSoapObjectWithProperties.new(platform)
+    end
+
+    it 'should allow one to set a soap header' do
+      expect(platform).to receive(:client).with(hash_including(soap_header: {'Token' => 'secret'}))
+
+      TestSoapObjectWithProperties.new(platform)
+    end
+
+    it 'should allow one to set the encoding' do
+      expect(platform).to receive(:client).with(hash_including(encoding: 'UTF-16'))
+
+      TestSoapObjectWithProperties.new(platform)
+    end
+
+    it 'should allow one to use basic authentication' do
+      expect(platform).to receive(:client).with(hash_including(basic_auth: ['steve', 'secret']))
+
+      TestSoapObjectWithProperties.new(platform)
+    end
+
+    it 'should allow one to use digest authentication' do
+      expect(platform).to receive(:client).with(hash_including(digest_auth: ['digest', 'auth']))
+
+      TestSoapObjectWithProperties.new(platform)
+    end
+
+    it 'should enable logging when logging level set' do
+      expect(platform).to receive(:client).with(hash_including(log: true))
+
+      TestSoapObjectWithProperties.new(platform)
+    end
+
+    it 'should allow one to set the log level' do
+      expect(platform).to receive(:client).with(hash_including(log_level: :error))
+
+      TestSoapObjectWithProperties.new(platform)
+    end
+
+    it 'should use pretty format for xml when logging' do
+      expect(platform).to receive(:client).with(hash_including(pretty_print_xml: true))
+
+      TestSoapObjectWithProperties.new(platform)
+    end
+
+    it 'should allow one to set the soap version' do
+      expect(platform).to receive(:client).with(hash_including(soap_version: 2))
+
+      TestSoapObjectWithProperties.new(platform)
+    end
+
+  end
+
+  context 'when creating new instances with out client property overrides' do
+
+    it 'should set SSL version to 3 by default' do
+      expect(platform).to receive(:client).with(hash_including(ssl_version: :SSLv3))
+
+      WithoutClientProperties.new(platform)
+    end
+
+    it 'should disable SSL verification by default' do
+      expect(platform).to receive(:client).with(hash_including(ssl_verify_mode: :none))
+
+      WithoutClientProperties.new(platform)
+    end
+
+    it 'should disable logging by default' do
+      expect(platform).to receive(:client).with(hash_including(log: false))
+
+      WithoutClientProperties.new(platform)
+    end
+  end
+end

data/spec/lib/factory_spec.rb

@@ -1,35 +1,35 @@
-require 'spec_helper'
-
-class TestSoapObject
-  include SoapObject
-  
-  wsdl 'http://blah.com'
-end
-
-class TestWorld
-  include SoapObject::Factory
-end
-
-describe 'SoapObject factory' do
-  context "when using the factory to create to service" do
-    let(:world) { TestWorld.new }
-
-    it "should create a valid service object" do
-      service = world.using(TestSoapObject)
-      expect(service).to be_instance_of TestSoapObject
-    end
-
-    it "should create a valid service and invoke a block" do
-      world.using(TestSoapObject) do |service|
-        expect(service).to be_instance_of TestSoapObject
-      end
-    end
-
-    it "should create the service the first time we use it" do
-      obj = TestSoapObject.new
-      expect(TestSoapObject).to receive(:new).once.and_return(obj)
-      world.using(TestSoapObject)
-      world.using(TestSoapObject)
-    end
-  end
-end
+require 'spec_helper'
+
+class TestSoapObject
+  include SoapObject
+
+  wsdl 'http://blah.com'
+end
+
+class TestWorld
+  include SoapObject::Factory
+end
+
+describe SoapObject::Factory do
+  context "when using the factory to create to service" do
+    let(:world) { TestWorld.new }
+
+    it "should create a valid service object" do
+      service = world.using(TestSoapObject)
+      expect(service).to be_instance_of TestSoapObject
+    end
+
+    it "should create a valid service and invoke a block" do
+      world.using(TestSoapObject) do |service|
+        expect(service).to be_instance_of TestSoapObject
+      end
+    end
+
+    it "should create the service the first time we use it" do
+      obj = TestSoapObject
+      expect(TestSoapObject).to receive(:new).with(Savon).once.and_return(obj)
+      world.using(TestSoapObject)
+      world.using(TestSoapObject)
+    end
+  end
+end

data/spec/lib/soap_object_spec.rb

@@ -1,150 +1,31 @@
-require 'spec_helper'
-
-class TestSoapObjectWithProperties
-  include SoapObject
-
-  wsdl 'http://blah.com'
-  proxy 'http://proxy.com:8080'
-  open_timeout 10
-  read_timeout 20
-  soap_header 'Token' => 'secret'
-  encoding 'UTF-16'
-  basic_auth 'steve', 'secret'
-  digest_auth 'digest', 'auth'
-  log_level :error
-  soap_version 2
-end
-
-class WithoutClientProperties
-  include SoapObject
-end
-
-describe SoapObject do
-  let(:client) { double('client') }
-  let(:subject) { TestSoapObjectWithProperties.new }
-
-  context 'when creating new instances' do
-    before do
-      allow(Savon).to receive(:client).and_return(client)
-    end
-
-    it 'should initialize the client using the wsdl' do
-      expect(subject.send(:client_properties)[:wsdl]).to eq('http://blah.com')
-    end
-
-    it 'should know when it is connected to service' do
-      expect(subject).to be_connected
-    end
-
-    it 'should allow one to setup a proxy' do
-      expect(subject.send(:client_properties)[:proxy]).to eq('http://proxy.com:8080')
-    end
-
-    it 'should allow one to set an open timeout' do
-      expect(subject.send(:client_properties)[:open_timeout]).to eq(10)
-    end
-
-    it 'should allow one to set a read timeout' do
-      expect(subject.send(:client_properties)[:read_timeout]).to eq(20)
-    end
-
-    it 'should allow one to set a soap header' do
-      expect(subject.send(:client_properties)[:soap_header]).to eq({'Token' => 'secret'})
-    end
-
-    it 'should allow one to set the encoding' do
-      expect(subject.send(:client_properties)[:encoding]).to eq('UTF-16')
-    end
-
-    it 'should allow one to use basic authentication' do
-      expect(subject.send(:client_properties)[:basic_auth]).to eq(['steve', 'secret'])
-    end
-
-    it 'should allow one to use digest authentication' do
-      expect(subject.send(:client_properties)[:digest_auth]).to eq(['digest', 'auth'])
-    end
-
-    it 'should disable logging when no logging level set' do
-      expect(WithoutClientProperties.new.send(:client_properties)[:log]).to eq(false)
-    end
-
-    it 'should enable logging when logging level set' do
-      expect(subject.send(:client_properties)[:log]).to eq(true)
-    end
-
-    it 'should allow one to set the log level' do
-      expect(subject.send(:client_properties)[:log_level]).to eq(:error)
-    end
-
-    it 'should use pretty format for xml when logging' do
-      expect(subject.send(:client_properties)[:pretty_print_xml]).to eq(true)
-    end
-
-    it 'should allow one to set the soap version' do
-      expect(subject.send(:client_properties)[:soap_version]).to eq(2)
-    end
-
-    it 'should disable SSL verification by default' do
-      expect(WithoutClientProperties.new.send(:client_properties)[:ssl_verify_mode]).to eq(:none)
-    end
-
-    it 'should set SSL version to 3 by default' do
-      expect(WithoutClientProperties.new.send(:client_properties)[:ssl_version]).to eq(:SSLv3)
-    end
-
-    context 'with ssl_verification' do
-
-      class WithSslVerification
-        include SoapObject
-        ssl_verification true
-      end
-
-      class WithoutSslVerification
-        include SoapObject
-        ssl_verification false
-      end
-
-      it 'should allow one to explicitly disable SSL verification' do
-        expect(WithoutSslVerification.new.send(:client_properties)[:ssl_verify_mode]).to eq(:none)
-      end
-
-      it 'should allow one to enable SSL verification' do
-        expect(WithSslVerification.new.send(:client_properties)[:ssl_verify_mode]).to be_nil
-      end
-    end
-
-    context 'with ssl version' do
-      class WithSslVersion
-        include SoapObject
-        ssl_version :SSLv2
-
-      end
-
-      it 'should allow one to set SSL version' do
-        expect(WithSslVersion.new.send(:client_properties)[:ssl_version]).to eq(:SSLv2)
-      end
-    end
-
-  end
-
-
-  context 'when calling methods on the service' do
-    let(:response) { double('response') }
-
-    before do
-      expect(Savon).to receive(:client).and_return(client)
-      expect(response).to receive(:to_xml)
-    end
-
-    it 'should make a valid request' do
-      expect(client).to receive(:call).with(:fake_call, message: {data_key: 'some_value'}).and_return(response)
-      subject.fake_call data_key: 'some_value'
-    end
-
-    it 'should make a valid request with custom xml' do
-      expected_xml = '<xml><envelope/><data></data></envelope></xml>'
-      expect(client).to receive(:call).with(anything, xml: expected_xml).and_return(response)
-      subject.fake_call expected_xml
-    end
-  end
-end
+require 'spec_helper'
+
+class WithoutClientProperties
+  include SoapObject
+end
+
+describe SoapObject do
+
+  context 'when calling methods on the service' do
+    let(:response) { double('response') }
+    let(:client) { double('client') }
+    let(:platform) {double('savon')}
+    let(:subject) { WithoutClientProperties.new(platform) }
+
+    before do
+      expect(platform).to receive(:client).and_return(client)
+      expect(response).to receive(:to_xml)
+    end
+
+    it 'should make a valid request' do
+      expect(client).to receive(:call).with(:fake_call, message: {data_key: 'some_value'}).and_return(response)
+      subject.fake_call data_key: 'some_value'
+    end
+
+    it 'should make a valid request with custom xml' do
+      expected_xml = '<xml><envelope/><data></data></envelope></xml>'
+      expect(client).to receive(:call).with(anything, xml: expected_xml).and_return(response)
+      subject.fake_call expected_xml
+    end
+  end
+end