sisow 1.0.1 → 1.1.0

data/Gemfile.lock

@@ -1,21 +1,22 @@
 PATH
   remote: .
   specs:
-    sisow (1.0.0)
+    sisow (1.0.1)
+      crack
       hashie
-      httparty
+      httpi
 
 GEM
   remote: http://rubygems.org/
   specs:
+    crack (0.3.1)
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
     hashie (1.2.0)
-    httparty (0.8.3)
-      multi_json (~> 1.0)
-      multi_xml
+    httpi (1.1.1)
+      rack
     multi_json (1.3.5)
-    multi_xml (0.5.1)
+    rack (1.4.1)
     rake (0.9.2.2)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)

data/lib/sisow.rb

@@ -1,7 +1,8 @@
 require 'rubygems'
-require 'httparty'
+require 'httpi'
 require 'hashie'
 require 'cgi'
+require 'crack/xml'
 
 require 'sisow/configuration'
 require 'sisow/error_response'

data/lib/sisow/api/request.rb

@@ -2,8 +2,7 @@ module Sisow
   module Api
     class Request
 
-      include HTTParty
-      base_uri "http://www.sisow.nl/Sisow/iDeal/RestHandler.ashx/"
+      BASE_URI = "http://www.sisow.nl/Sisow/iDeal/RestHandler.ashx"
 
       def self.perform
         new.perform
@@ -14,8 +13,9 @@ module Sisow
 
         validate!
 
-        response = self.class.get(uri)
-        response = Hashie::Mash.new(response)
+        http_response = HTTPI.get(base_uri + uri)
+        parsed_response = Crack::XML.parse(http_response.body)
+        response = Hashie::Mash.new(parsed_response)
 
         error!(response) if response.errorresponse?
 
@@ -61,6 +61,10 @@ module Sisow
           raise Sisow::Exception, error_response.message and return
         end
 
+        def base_uri
+          Sisow.configuration.base_uri || BASE_URI
+        end
+
     end
   end
 end

data/lib/sisow/api/request/transaction_request.rb

@@ -97,6 +97,7 @@ module Sisow
             Sisow.configuration.merchant_id,
             Sisow.configuration.merchant_key
           ].join
+
           calculated_sha1 = Digest::SHA1.hexdigest(string)
 
           if calculated_sha1 != response.transactionrequest.signature.sha1

data/lib/sisow/configuration.rb

@@ -1,7 +1,7 @@
 module Sisow
   class Configuration
 
-    attr_accessor :merchant_id, :merchant_key, :test_mode, :debug_mode, :shop_id
+    attr_accessor :merchant_id, :merchant_key, :test_mode, :debug_mode, :shop_id, :base_uri
 
     def initialize
       @debug_mode   = false
@@ -19,9 +19,10 @@ module Sisow
       @debug_mode = boolean
 
       if boolean == true
-        Sisow::Api::Request.debug_output $stderr
+        HTTPI.log = true
+        HTTPI.log_level = :debug
       else
-        Sisow::Api::Request.debug_output nil
+        HTTPI.log = false
       end
     end
 

data/lib/sisow/version.rb

@@ -1,3 +1,3 @@
 module Sisow
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/sisow.gemspec

@@ -19,12 +19,14 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'httparty'
+  s.add_dependency 'httpi'
   s.add_dependency 'hashie'
+  s.add_dependency 'crack'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'vcr'
   s.add_development_dependency 'fakeweb'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'simplecov-rcov'
+
 end

data/spec/models/configuration_spec.rb

@@ -31,5 +31,4 @@ describe Sisow::Configuration do
     @configuration.merchant_id.should == '123'
   end
 
-
 end

data/spec/models/request_spec.rb

@@ -12,7 +12,8 @@ describe Sisow::Api::Request do
   end
 
   it "should point to the base URI of the Sisow API" do
-    Sisow::Api::Request.base_uri.should == "http://www.sisow.nl/Sisow/iDeal/RestHandler.ashx"
+    request = Sisow::Api::Request.new
+    request.send(:base_uri).should == "http://www.sisow.nl/Sisow/iDeal/RestHandler.ashx"
   end
 
   it "should perform properly" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sisow
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: httpi
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: crack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement