payex 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87add971c273b10a05fd489a701184e47a414eca
-  data.tar.gz: 20605334607f26c3c2c4b57cda30b81d2f936cfb
+  metadata.gz: 9e825093f950b6bf7d448dff56603b82b89c3fef
+  data.tar.gz: 2da6c252406b9592226b8d8dfceb700bd7fe3ed8
 SHA512:
-  metadata.gz: d36d402b2631b2fa06d160c3a5e14d64aef3fa0cbc1da2c34342e06936a862476ecd726db5d31462e276288f84938e2bc6614e7d3ca76b9e12c5f9a1cb2a81cf
-  data.tar.gz: 85e3655ff8a0d84df2560169831460a5a55f34c5899706f044f389d6ff4cf684b11910073104df74890432f7aef18a5a1439b0cb1beb5df03e046eb69ef5da1b
+  metadata.gz: 1608997f902e1930b383d83a28f332dee1d5b0a91e754ee73d798d2cf24200ada828e83d328b9b4d79e70588aea2250c227b99d84e9255deb041f1d5a988942a
+  data.tar.gz: 4102cfbca7a44344da45cc48b1685e75397fbddba330144fffcc5656ee22b219b81095826a6573eebb0aacfb6b94b0989deff8a3d0c53f848f1e38aedde58abd

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
+# Travis bug, see https://github.com/bundler/bundler/pull/3559
+before_install:
+  - gem install bundler
+  - gem update bundler
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
-  - jruby-head
   - ruby-head
+env:
+  - "rack=1.6.4"

data/Gemfile.lock

@@ -3,16 +3,16 @@ PATH
   specs:
     payex (0.3)
       httpclient (~> 2.2)
-      nori (~> 1.1)
-      savon (~> 1.1)
+      nori (~> 2.6)
+      savon (~> 2.11)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    akami (1.2.0)
+    akami (1.3.1)
       gyoku (>= 0.4.0)
-      nokogiri (>= 1.4.0)
-    builder (3.1.3)
+      nokogiri
+    builder (3.2.2)
     diff-lcs (1.1.3)
     guard (1.3.3)
       listen (>= 0.4.2)
@@ -22,15 +22,17 @@ GEM
       guard (~> 1.1)
     guard-rspec (1.2.1)
       guard (>= 1.1)
-    gyoku (0.4.6)
+    gyoku (1.3.1)
       builder (>= 2.1.2)
-    httpclient (2.3.4.1)
-    httpi (1.1.1)
+    httpclient (2.8.0)
+    httpi (2.4.1)
       rack
     listen (0.5.2)
-    nokogiri (1.5.5)
-    nori (1.1.3)
-    rack (1.4.1)
+    mini_portile2 (2.0.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    nori (2.6.0)
+    rack (1.6.4)
     rake (0.9.2.2)
     rb-fsevent (0.9.2)
     rspec (2.11.0)
@@ -41,22 +43,19 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
-    savon (1.2.0)
-      akami (~> 1.2.0)
+    savon (2.11.1)
+      akami (~> 1.2)
       builder (>= 2.1.2)
-      gyoku (~> 0.4.5)
-      httpi (~> 1.1.0)
+      gyoku (~> 1.2)
+      httpi (~> 2.3)
       nokogiri (>= 1.4.0)
-      nori (~> 1.1.0)
-      wasabi (~> 2.5.0)
-    savon_spec (1.3.0)
-      rspec (>= 2.0.0)
-      savon (~> 1.0)
+      nori (~> 2.4)
+      wasabi (~> 3.4)
     terminal-notifier-guard (1.5.3)
     thor (0.16.0)
-    wasabi (2.5.1)
-      httpi (~> 1.0)
-      nokogiri (>= 1.4.0)
+    wasabi (3.5.0)
+      httpi (~> 2.0)
+      nokogiri (>= 1.4.2)
 
 PLATFORMS
   ruby
@@ -70,5 +69,7 @@ DEPENDENCIES
   rake (~> 0.9)
   rb-fsevent (~> 0.9)
   rspec (~> 2.11)
-  savon_spec (~> 1.3)
   terminal-notifier-guard (~> 1.5)
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -1,5 +1,3 @@
-[![Build Status](https://travis-ci.org/gointeractive/payex-ruby.png)](https://travis-ci.org/gointeractive/payex-ruby)
-
 ## Installation
 
 This is a rudimentary Ruby binding for the [PayEx API].  You can

data/lib/payex/api.rb

@@ -15,7 +15,8 @@ module PayEx::API
     # Unwrap e.g. <Initialize8Result>
     response = response[response.keys.first]
     # Parse embedded XML document
-    response = Nori.parse(response)
+    parser = Nori.new(convert_tags_to: lambda { |tag| tag.snakecase.to_sym })
+    response = parser.parse(response)
     # Unwrap <payex>
     response = response[response.keys.first]
 
@@ -29,9 +30,7 @@ module PayEx::API
   end
 
   def invoke_raw! wsdl, name, body
-    Savon.client(wsdl).request(name, body: body) {
-      http.headers.delete('SOAPAction')
-    }.body
+    Savon.client(wsdl: wsdl).call(name, soap_action: false, message: body).body
   end
 
   def signed_hash(string)

data/lib/payex/api/pxorder.rb

@@ -5,8 +5,8 @@ module PayEx::PxOrder
     '%s/pxorder/pxorder.asmx?WSDL' % PayEx.base_url
   end
 
-  def Initialize7(params)
-    PayEx::API.invoke! wsdl, 'Initialize7', params, {
+  def Initialize8(params)
+    PayEx::API.invoke! wsdl, :initialize8, params, {
       'accountNumber' => {
         signed: true,
         default: proc { PayEx.account_number! }
@@ -81,7 +81,7 @@ module PayEx::PxOrder
   end
 
   def Complete(params)
-    PayEx::API.invoke! wsdl, 'Complete', params, {
+    PayEx::API.invoke! wsdl, :complete, params, {
       'accountNumber' => {
         signed: true,
         default: proc { PayEx.account_number! }

data/lib/payex/credit_card_redirect.rb

@@ -2,7 +2,7 @@ module PayEx::CreditCardRedirect
   extend self
 
   def initialize_transaction! params
-    response = PayEx::PxOrder.Initialize7 \
+    response = PayEx::PxOrder.Initialize8 \
       orderID: params[:order_id],
       purchaseOperation: 'AUTHORIZATION',
       productNumber: params[:product_number],

data/payex.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |gem|
   gem.name = 'payex'
-  gem.version = '0.3'
+  gem.version = '0.4'
   gem.summary = 'PayEx SOAP API glue'
   gem.author = 'Daniel Brockman'
   gem.files = `git ls-files 2>/dev/null`.split($\)
 
   gem.add_dependency 'httpclient', '~> 2.2'
-  gem.add_dependency 'nori', '~> 1.1'
-  gem.add_dependency 'savon', '~> 1.1'
+  gem.add_dependency 'nori', '~> 2.6'
+  gem.add_dependency 'savon', '~> 2.11'
 
   if RUBY_PLATFORM == 'java'
     gem.add_dependency 'jruby-openssl', '~> 0.7'
@@ -21,6 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake', '~> 0.9'
   gem.add_development_dependency 'rb-fsevent', '~> 0.9'
   gem.add_development_dependency 'rspec', '~> 2.11'
-  gem.add_development_dependency 'savon_spec', '~> 1.3'
   gem.add_development_dependency 'terminal-notifier-guard', '~> 1.5'
 end

data/spec/credit_card_redirect_spec.rb

@@ -1,8 +1,13 @@
 # -*- coding: utf-8 -*-
 require 'payex'
 require 'spec_helper'
+require "savon/mock/spec_helper"
 
 describe PayEx::CreditCardRedirect do
+  include Savon::SpecHelper
+  before(:all) { savon.mock!   }
+  after(:all)  { savon.unmock! }
+  
   SAMPLE_ACCOUNT_NUMBER = 'SAMPLEACCOUNTNUMBER0001'
   SAMPLE_ENCRYPTION_KEY = 'SAMPLEENCRYPTIONKEY0001'
   SAMPLE_DEFAULT_CURRENCY = 'SEK'
@@ -45,7 +50,8 @@ describe PayEx::CreditCardRedirect do
       }
 
       expected['hash'] = PayEx::API.signed_hash(expected.values.join)
-      savon.expects('Initialize7').with(expected).returns(:initialize_ok)
+      initialize_ok_fixture = File.read('spec/fixtures/initialize8/initialize_ok.xml')
+      savon.expects(:initialize8).with(message: expected).returns(initialize_ok_fixture)
 
       href = PayEx::CreditCardRedirect.initialize_transaction! \
         order_id: SAMPLE_ORDER_ID,
@@ -63,14 +69,15 @@ describe PayEx::CreditCardRedirect do
   SAMPLE_ORDER_REF = 'SAMPLEORDERREF0001'
 
   describe :complete_transaction! do
-    def invoke_complete! response_fixture
+    def invoke_complete! response_fixture_file
       expected = {
         'accountNumber' => SAMPLE_ACCOUNT_NUMBER,
         'orderRef' => SAMPLE_ORDER_REF
       }
 
       expected['hash'] = PayEx::API.signed_hash(expected.values.join)
-      savon.expects('Complete').with(expected).returns(response_fixture)
+      response_fixture = File.read("spec/fixtures/complete/#{response_fixture_file}.xml")
+      savon.expects(:complete).with(message: expected).returns(response_fixture)
       PayEx::CreditCardRedirect.complete_transaction! SAMPLE_ORDER_REF
     end
 

data/spec/fixtures/{initialize7 → initialize8}/initialize_ok.xml

@@ -3,8 +3,8 @@
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <soap:Body>
-    <Initialize7Response xmlns="http://external.payex.com/PxOrder/">
-      <Initialize7Result>
+    <Initialize8Response xmlns="http://external.payex.com/PxOrder/">
+      <Initialize8Result>
         <![CDATA[
           <?xml version="1.0" encoding="utf-8" ?>
           <payex>
@@ -24,7 +24,7 @@
             <redirectUrl>https://test-confined.payex.com/PxOrderCC.aspx?orderRef=67d7e7d3b4134741a3297480dca6d899</redirectUrl>
           </payex>
         ]]>
-      </Initialize7Result>
-    </Initialize7Response>
+      </Initialize8Result>
+    </Initialize8Response>
   </soap:Body>
 </soap:Envelope>

data/spec/spec_helper.rb

@@ -1,11 +1,2 @@
-require 'savon_spec'
-
-Savon::Spec::Fixture.path =
-  File.expand_path('../fixtures', __FILE__)
-
-RSpec.configure do |config|
-  config.include Savon::Spec::Macros
-end
-
 # Suppress "HTTPI executes HTTP GET using the httpclient adapter"
 HTTPI.log = false

metadata

@@ -1,167 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: payex
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Daniel Brockman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2016-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: nori
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
-- !ruby/object:Gem::Dependency
-  name: savon_spec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 description: 
@@ -170,8 +156,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -187,7 +173,7 @@ files:
 - spec/fixtures/complete/complete_declined.xml
 - spec/fixtures/complete/complete_failed.xml
 - spec/fixtures/complete/complete_ok.xml
-- spec/fixtures/initialize7/initialize_ok.xml
+- spec/fixtures/initialize8/initialize_ok.xml
 - spec/spec_helper.rb
 homepage: 
 licenses: []
@@ -198,17 +184,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: PayEx SOAP API glue