skles 1.0.2 → 1.0.3

data/Gemfile

@@ -1,5 +1,6 @@
 source :rubygems
 
+gem 'httpclient' # http adapter for savon
 gem 'savon'
 
 group :development do

data/Gemfile.lock

@@ -2,26 +2,34 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.3)
-    builder (3.0.0)
+    builder (2.1.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
     git (1.2.5)
-    jeweler (1.5.1)
+    gyoku (0.1.0)
+      builder (~> 2.1.2)
+    httpclient (2.1.6)
+    httpi (0.7.4)
+      rack
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    rack (1.2.1)
     rake (0.8.7)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
       rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.0)
+    rspec-core (2.3.1)
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    savon (0.7.9)
-      builder (>= 2.1.2)
-      crack (>= 0.1.4)
+    savon (0.8.0)
+      builder (~> 2.1.2)
+      crack (~> 0.1.8)
+      gyoku (>= 0.1.0)
+      httpi (>= 0.7.4)
     yard (0.6.3)
 
 PLATFORMS
@@ -29,6 +37,7 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
+  httpclient
   jeweler
   rspec
   savon

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/skles.rb

@@ -1,10 +1,10 @@
 require 'savon'
 require File.dirname(__FILE__) + '/skles_api'
 
-# can't have plaintext CC #s being logged
-Savon::Request.log = false
-# We have our own error raising
-Savon::Response.raise_errors = false
+Savon.configure do |config|
+  config.log = false # can't have plaintext CC #s being logged
+  config.raise_errors = false # We have our own error raising
+end
 
 # Client for the StrongKey Lite Encryption System (SKLES) SOAP-based API. An
 # instance of this API interfaces with your StrongKey Lite box to encrypt and
@@ -41,13 +41,18 @@ class StrongKeyLite
   # @option options [String] :login You can provide the login of a user who will
   #   be used for all actions.
   # @option options [String] :password The password for this user.
-  # @option options [Hash] :http Additional options to be given to the
-  #   @Net::HTTP@ object. The keys will be invoked as setter methods on the HTTP
-  #   object (_e.g._, passing @http: { timeout: 60 }@ will result in a call like
-  #   @http.timeout = 60@).
+  # @yield [http] HTTP configuration block.
+  # @yieldparam [HTTPI::Request] http The HTTP request object, for configuring.
+  #   See the HTTPI gem documentation for more information.
+  #
+  # @example Setting a custom timeout
+  #   StrongKeyLite.new(url, domain) { |http| http.read_timeout = 60 }
 
   def initialize(service_url, domain_id, options={})
-    @client = Savon::Client.new("#{service_url}/strongkeyliteWAR/EncryptionService?wsdl")
+    @client = Savon::Client.new do |wsdl, http, wsse|
+      wsdl.document = "#{service_url}/strongkeyliteWAR/EncryptionService?wsdl"
+      yield http if block_given?
+    end
     options[:http].each { |key, val| @client.request.http.send :"#{key}=", val } if options[:http].kind_of?(Hash)
 
     self.domain_id = domain_id
@@ -123,7 +128,7 @@ class StrongKeyLite
     raise "No user has been assigned to action #{meth.inspect}" unless login
     password = @users[login]
     
-    response = @client.send(meth) { |soap| soap.body = { did: domain_id, username: login, password: password }.merge(options) }
+    response = @client.request(:wsdl, meth) { |soap| soap.body = { did: domain_id, username: login, password: password }.merge(options) }
     raise SOAPError.new(response.soap_fault, response) if response.soap_fault?
     raise HTTPError.new(response.http_error, response) if response.http_error?
 
@@ -138,8 +143,8 @@ class StrongKeyLite
     attr_reader :response
 
     # @private
-    def initialize(msg, response)
-      super msg
+    def initialize(error, response)
+      super error.to_s
       @response = response
     end
   end
@@ -150,9 +155,9 @@ class StrongKeyLite
     attr_reader :code
     
     # @private
-    def initialize(msg, response)
+    def initialize(fault, response)
       super
-      if code_match = msg.match(/SKL-ERR-(\d+)/) then
+      if code_match = fault.to_s.match(/SKL-ERR-(\d+)/) then
         @code = code_match[1].try(:to_i)
       end
     end

data/skles.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{skles}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  s.date = %q{2010-12-14}
+  s.date = %q{2010-12-21}
   s.description = %q{A Ruby wrapper around the StrongKey Lite SOAP client API.}
   s.email = %q{git@timothymorgan.info}
   s.extra_rdoc_files = [
@@ -48,12 +48,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<httpclient>, [">= 0"])
       s.add_runtime_dependency(%q<savon>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<RedCloth>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
+      s.add_dependency(%q<httpclient>, [">= 0"])
       s.add_dependency(%q<savon>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -61,6 +63,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
+    s.add_dependency(%q<httpclient>, [">= 0"])
     s.add_dependency(%q<savon>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/spec/skles_api_spec.rb

@@ -12,7 +12,7 @@ describe StrongKeyLite::API do
     before :each do
       @time = mock('Time')
       Time.stub!(:parse).and_return(@time)
-      @client.should_receive(:ping).once.and_return(@response)
+      @client.should_receive(:request).once.with(:wsdl, :ping).and_return(@response)
     end
 
     it "should parse the ping response" do
@@ -76,8 +76,8 @@ SKLES Domain 21 is alive!
       @response.stub(:to_hash).and_return(encrypt_response: { return: '123456' })
       soap = mock('Savon::SOAP')
       soap.should_receive(:body=).once.with(hash_including(plaintext: 'plaintext'))
-
-      @client.should_receive(:encrypt).once.and_yield(soap).and_return(@response)
+      
+      @client.should_receive(:request).once.with(:wsdl, :encrypt).and_yield(soap).and_return(@response)
 
       @skles.encrypt('plaintext').should eql('123456')
     end
@@ -92,7 +92,7 @@ SKLES Domain 21 is alive!
       soap = mock('Savon::SOAP')
       soap.should_receive(:body=).once.with(hash_including(token: '123456'))
 
-      @client.should_receive(:decrypt).once.and_yield(soap).and_return(@response)
+      @client.should_receive(:request).once.with(:wsdl, :decrypt).and_yield(soap).and_return(@response)
 
       @skles.decrypt('123456').should eql('plaintext')
     end
@@ -107,7 +107,7 @@ SKLES Domain 21 is alive!
       soap = mock('Savon::SOAP')
       soap.should_receive(:body=).once.with(hash_including(token: '123456'))
 
-      @client.should_receive(:delete).once.and_yield(soap).and_return(@response)
+      @client.should_receive(:request).once.with(:wsdl, :delete).and_yield(soap).and_return(@response)
 
       @skles.delete('123456').should be_true
     end
@@ -122,7 +122,7 @@ SKLES Domain 21 is alive!
       soap = mock('Savon::SOAP')
       soap.should_receive(:body=).once.with(hash_including(plaintext: 'plaintext'))
 
-      @client.should_receive(:search).once.and_yield(soap).and_return(@response)
+      @client.should_receive(:request).once.with(:wsdl, :search).and_yield(soap).and_return(@response)
 
       @skles.search('plaintext').should eql('123456')
     end

data/spec/skles_spec.rb

@@ -1,15 +1,9 @@
 require 'spec_helper'
 
 describe StrongKeyLite do
-  before :each do
-    @client = mock('Savon::Client', request: nil)
-    Savon::Client.stub!(:new).and_return(@client)
-  end
-
   describe "#initialize" do
     it "should accept a host for the WSDL" do
-      Savon::Client.should_receive(:new).once.with("http://test.host/strongkeyliteWAR/EncryptionService?wsdl").and_return(@client)
-      StrongKeyLite.new('http://test.host', 1)
+      StrongKeyLite.new('http://test.host', 1).instance_variable_get(:@client).wsdl.instance_variable_get(:@document).should eql("http://test.host/strongkeyliteWAR/EncryptionService?wsdl")
     end
 
     it "should set the domain ID" do
@@ -17,12 +11,7 @@ describe StrongKeyLite do
     end
 
     it "should accept and apply HTTP options" do
-      http = mock('Net::HTTP')
-      request = mock('Savon::Request', http: http)
-      @client.stub!(:request).and_return(request)
-
-      http.should_receive(:timeout=).once.with(60)
-      StrongKeyLite.new('http://test.host', 1, http: { timeout: 60 })
+      StrongKeyLite.new('http://test.host', 1) { |http| http.read_timeout = 60 }.instance_variable_get(:@client).http.read_timeout.should eql(60)
     end
 
     it "should optionally accept a login and password" do
@@ -31,6 +20,11 @@ describe StrongKeyLite do
   end
 
   describe "#call" do
+    before :each do
+      @client = mock('Savon::Client', request: nil)
+      Savon::Client.stub!(:new).and_return(@client)
+    end
+    
     before :each do
       @client = mock('Savon::Client', request: nil, wsdl: mock('Savon::WSDL', soap_actions: [ :ping ]))
       Savon::Client.stub!(:new).and_return(@client)
@@ -49,7 +43,7 @@ describe StrongKeyLite do
       
       soap = mock('Savon::Request')
       soap.should_receive(:body=).once.with({ did: 1, username: 'login', password: 'password' })
-      @client.should_receive(:ping).once.and_yield(soap).and_return(@response)
+      @client.should_receive(:request).once.with(:wsdl, :ping).and_yield(soap).and_return(@response)
       @skles.ping
     end
 
@@ -58,7 +52,7 @@ describe StrongKeyLite do
 
       soap = mock('Savon::Request')
       soap.should_receive(:body=).once.with({ did: 1, username: 'all', password: 'password' })
-      @client.should_receive(:ping).once.and_yield(soap).and_return(@response)
+      @client.should_receive(:request).once.with(:wsdl, :ping).and_yield(soap).and_return(@response)
       @skles.ping
     end
 
@@ -68,7 +62,7 @@ describe StrongKeyLite do
 
       soap = mock('Savon::Request')
       soap.should_receive(:body=).once.with({ did: 1, username: 'ping', password: 'password' })
-      @client.should_receive(:ping).once.and_yield(soap).and_return(@response)
+      @client.should_receive(:request).once.with(:wsdl, :ping).and_yield(soap).and_return(@response)
       @skles.ping
     end
     
@@ -76,7 +70,7 @@ describe StrongKeyLite do
       @skles.add_user('all', 'password', :all)
       soap = mock('Savon::Request')
       soap.stub!(:body=)
-      @client.stub!(:ping).and_yield(soap).and_return(@response)
+      @client.stub!(:request).and_yield(soap).and_return(@response)
       @response.stub!(:http_error?).and_return(true)
       @response.stub!(:http_error).and_return("404 Not Found")
       
@@ -87,7 +81,7 @@ describe StrongKeyLite do
       @skles.add_user('all', 'password', :all)
       soap = mock('Savon::Request')
       soap.stub!(:body=)
-      @client.stub!(:ping).and_yield(soap).and_return(@response)
+      @client.stub!(:request).and_yield(soap).and_return(@response)
       @response.stub!(:soap_fault?).and_return(true)
       @response.stub!(:soap_fault).and_return("Not enough XML")
       

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Tim Morgan
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 -08:00
+date: 2010-12-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: savon
+  name: httpclient
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,7 +31,7 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: savon
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -40,11 +40,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: jeweler
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,7 +57,7 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  name: yard
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -70,7 +70,7 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: RedCloth
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -82,6 +82,19 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
 description: A Ruby wrapper around the StrongKey Lite SOAP client API.
 email: git@timothymorgan.info
 executables: []