active_merchant-epsilon 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21731c597893be5cdf7c104d2b8401b23a50c94c
-  data.tar.gz: 59c99f9120cdb5d08805d36847f4c4e71f1d7c49
+  metadata.gz: 60b0318fc5b7ae333a3fb3a50e7566c9b30bdd50
+  data.tar.gz: a3a6fa696e3c912e1b2f5791ef45f04ad466fd4d
 SHA512:
-  metadata.gz: ead8517eff83884440b66bf11d21dd3d6e79ad1149223207f2fbbb4888235597a62e8310aca937c5cb9dadacaf5fffbe96eb319e56ad1203e29f076f39ff86f0
-  data.tar.gz: cd7c1c310052e5fed03e431cdba28565e6f1e689b91f6d49306c8367d77a380fd5adc6ee5e8e1bc554b7b4fda662f521cea42f663b8b4cfc52e78e49d8809aa9
+  metadata.gz: 486586c8622f27eacab5d2f052203510dc17dd1c6c561e6c4c7223f23d292db860f6fe3736e84d34867a5fa051afd5ba38f819d23b7cce7c0991589d9987aafd
+  data.tar.gz: 678d4a7a4625d46eb84ccd6aaac32275da62ef2a140d12e2427c2ff870974acfdd0ac9004aebd83a0c7f61db78b6ab1db5b067afd5e73b9a8b938b7a7a3ec397

data/.travis.yml

@@ -1,6 +1,13 @@
 language: ruby
-
 rvm:
-  - 2.1.6
-  - 2.2.2
+- 2.1.7
+- 2.2.3
+- 2.3.0
+
 script: bundle exec rake test:remote
+script: bundle exec rake test:unit
+
+notifications:
+  slack:
+    rooms:
+      secure: rYtA4FBXqKHYv+v7xA6FfkcsDXRexWyMj9WMG2YK7bgZoNG2N7q461Dr/lCU0JTuRGsxDIs5jHK+QFFZNW/h+SbhQfiew++W8FgoIbP/z7HuEW50SXLcigGb02YmQm+ybbh5Dw1QGmcTOVItXJfuFmrDm1fq0qO0HC0543Yn4BzrSdWnEWQSaK7JMBRc9aYVPc0VlWG8pGRLtW0PDb6D32MvEI4jPrnh2NPDomPT9YutmMC+jNBPKr72m68g3v2GogbX4irZ6Kp5UUUZtaDbt9yLRfNL/3bsVGVrS1S2qCO4If5xTtE7lvV807a8QuQIj4Y9YqRO7K+/wUrz4Yb2ycF7agAkjN+w2WNEjgsKeFk50R4BWKpSy6y2N2RIl7rdHVEnU1T9I6LH0do5hMGqhgDYgppb2F7YFL9buUqag6gKAX3BHIV16ADJOFBT2Hh2m6x9f5TRb5ZR4LDJBQaflMhj0pwmIcC5Bhr3yi45r/4xiJ1IQaspXCzvfUMXARgWqqSxxveVQ07obiFeFCZ2YJEyv9fYLxT39+9koP48iKHTzbtFi4ay37PfMaztiXM0dqTwdjbJ95krc8AoNuTDphgwLLW2Zxxz2+tFQiLcj1tebUZa1hBsil1EVI7P/8PjAjGowckCnEAnFBZS5oFrgE2qzuwIGbLRYeeoRev0tks=

data/lib/active_merchant/billing/gateways/epsilon/epsilon_base.rb

@@ -29,27 +29,6 @@ module ActiveMerchant #:nodoc:
 
       self.abstract_class = true
 
-      module ResponseXpath
-        RESULT                       = '//Epsilon_result/result[@result]/@result'
-        TRANSACTION_CODE             = '//Epsilon_result/result[@trans_code]/@trans_code'
-        ERROR_CODE                   = '//Epsilon_result/result[@err_code]/@err_code'
-        ERROR_DETAIL                 = '//Epsilon_result/result[@err_detail]/@err_detail'
-        CARD_NUMBER_MASK             = '//Epsilon_result/result[@card_number_mask]/@card_number_mask'
-        CARD_BRAND                   = '//Epsilon_result/result[@card_brand]/@card_brand'
-        ACS_URL                      = '//Epsilon_result/result[@acsurl]/@acsurl' # ACS (Access Control Server)
-        PA_REQ                       = '//Epsilon_result/result[@pareq]/@pareq' # PAReq (payer authentication request)
-        RECEIPT_NUMBER               = '//Epsilon_result/result[@receipt_no][1]/@receipt_no'
-        RECEIPT_DATE                 = '//Epsilon_result/result[@receipt_date][1]/@receipt_date'
-        CONVENIENCE_STORE_LIMIT_DATE = '//Epsilon_result/result[@conveni_limit][1]/@conveni_limit'
-      end
-
-      module ResultCode
-        FAILURE        = '0'
-        SUCCESS        = '1'
-        THREE_D_SECURE = '5'
-        SYSTEM_ERROR   = '9'
-      end
-
       cattr_accessor :contract_code, :proxy_address, :proxy_port
 
       self.test_url            = 'https://beta.epsilon.jp/cgi-bin/order/'
@@ -59,16 +38,26 @@ module ActiveMerchant #:nodoc:
       self.homepage_url        = 'http://www.example.net/'
       self.display_name        = 'New Gateway'
 
+      DEFAULT_RESPONSE_KEYS = [
+        :transaction_code,
+        :error_code,
+        :error_detail,
+        :card_number_mask,
+        :card_brand,
+        :three_d_secure,
+        :acs_url,
+        :pa_req,
+        :receipt_number,
+        :receipt_date
+      ].freeze
+
       private
 
-      def authorization_from(response)
-        {}
-      end
+      def commit(path, request_params, response_keys = DEFAULT_RESPONSE_KEYS)
+        parser = ResponseParser.new
 
-      def commit(path, params)
-        url          = (test? ? test_url : live_url)
-        raw_response = ssl_post(File.join(url, path), post_data(params))
-        response     = parse(raw_response)
+        url = (test? ? test_url : live_url)
+        response = parser.parse(ssl_post(File.join(url, path), post_data(request_params)), response_keys)
 
         options = {
           authorization: authorization_from(response),
@@ -78,54 +67,20 @@ module ActiveMerchant #:nodoc:
         Response.new(success_from(response), message_from(response), response, options)
       end
 
-      def message_from(response)
-        response[:message]
-      end
-
-      def parse(body)
-        # because of following error
-        #   Nokogiri::XML::SyntaxError: Unsupported encoding x-sjis-cp932
-        xml = Nokogiri::XML(body.sub('x-sjis-cp932', 'UTF-8'))
-
-        result                       = xml.xpath(ResponseXpath::RESULT).to_s
-        transaction_code             = xml.xpath(ResponseXpath::TRANSACTION_CODE).to_s
-        error_code                   = xml.xpath(ResponseXpath::ERROR_CODE).to_s
-        error_detail                 = uri_decode(xml.xpath(ResponseXpath::ERROR_DETAIL).to_s)
-        card_number_mask             = uri_decode(xml.xpath(ResponseXpath::CARD_NUMBER_MASK).to_s)
-        card_brand                   = uri_decode(xml.xpath(ResponseXpath::CARD_BRAND).to_s)
-        acs_url                      = uri_decode(xml.xpath(ResponseXpath::ACS_URL).to_s)
-        pa_req                       = uri_decode(xml.xpath(ResponseXpath::PA_REQ).to_s)
-        receipt_number               = xml.xpath(ResponseXpath::RECEIPT_NUMBER).to_s
-        receipt_date                 = uri_decode(xml.xpath(ResponseXpath::RECEIPT_DATE).to_s)
-        convenience_store_limit_date = uri_decode(xml.xpath(ResponseXpath::CONVENIENCE_STORE_LIMIT_DATE).to_s)
-
-        {
-          success:                      [ResultCode::SUCCESS, ResultCode::THREE_D_SECURE].include?(result),
-          message:                      "#{error_code}: #{error_detail}",
-          transaction_code:             transaction_code,
-          error_code:                   error_code,
-          error_detail:                 error_detail,
-          card_number_mask:             card_number_mask,
-          card_brand:                   card_brand,
-          three_d_secure:               result == ResultCode::THREE_D_SECURE,
-          acs_url:                      acs_url,
-          pa_req:                       pa_req,
-          receipt_number:               receipt_number,
-          receipt_date:                 receipt_date,
-          convenience_store_limit_date: convenience_store_limit_date,
-        }
-      end
-
       def post_data(parameters = {})
         parameters.map { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
 
+      def message_from(response)
+        response[:message]
+      end
+
       def success_from(response)
         response[:success]
       end
 
-      def uri_decode(string)
-        URI.decode(string).encode(Encoding::UTF_8, Encoding::CP932)
+      def authorization_from(response)
+        {}
       end
     end
   end

data/lib/active_merchant/billing/gateways/epslion_convenience_store.rb

@@ -1,6 +1,12 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class EpsilonConvenienceStoreGateway < EpsilonBaseGateway
+
+      RESPONSE_KEYS = DEFAULT_RESPONSE_KEYS + [
+        :convenience_store_limit_date,
+        :convenience_store_payment_slip_url
+      ]
+
       def purchase(amount, payment_method, detail = {})
         params = {
           contract_code:  self.contract_code,
@@ -20,7 +26,7 @@ module ActiveMerchant #:nodoc:
           user_name_kana: payment_method.name,
         }
 
-        commit('receive_order3.cgi', params)
+        commit('receive_order3.cgi', params, RESPONSE_KEYS)
       end
     end
   end

data/lib/active_merchant/billing/gateways/response_parser.rb

@@ -0,0 +1,99 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class ResponseParser
+      def parse(body, required_items)
+        # because of following error
+        #   Nokogiri::XML::SyntaxError: Unsupported encoding x-sjis-cp932
+        @xml = Nokogiri::XML(body.sub('x-sjis-cp932', 'UTF-8'))
+        @result = @xml.xpath(ResponseXpath::RESULT).to_s
+
+        response = {
+          success: [ResultCode::SUCCESS, ResultCode::THREE_D_SECURE].include?(@result),
+          message: "#{error_code}: #{error_detail}"
+        }
+
+        required_items.each do |item_name|
+          response[item_name] = self.send(item_name)
+        end
+
+        response
+      end
+
+      private
+
+      def transaction_code
+        @xml.xpath(ResponseXpath::TRANSACTION_CODE).to_s
+      end
+
+      def error_code
+        @xml.xpath(ResponseXpath::ERROR_CODE).to_s
+      end
+
+      def error_detail
+        uri_decode(@xml.xpath(ResponseXpath::ERROR_DETAIL).to_s)
+      end
+
+      def card_number_mask
+        uri_decode(@xml.xpath(ResponseXpath::CARD_NUMBER_MASK).to_s)
+      end
+
+      def card_brand
+        uri_decode(@xml.xpath(ResponseXpath::CARD_BRAND).to_s)
+      end
+
+      def three_d_secure
+        @result == ResultCode::THREE_D_SECURE
+      end
+
+      def acs_url
+        uri_decode(@xml.xpath(ResponseXpath::ACS_URL).to_s)
+      end
+
+      def pa_req
+        uri_decode(@xml.xpath(ResponseXpath::PA_REQ).to_s)
+      end
+
+      def receipt_number
+        @xml.xpath(ResponseXpath::RECEIPT_NUMBER).to_s
+      end
+
+      def receipt_date
+        uri_decode(@xml.xpath(ResponseXpath::RECEIPT_DATE).to_s)
+      end
+
+      def convenience_store_limit_date
+        uri_decode(@xml.xpath(ResponseXpath::CONVENIENCE_STORE_LIMIT_DATE).to_s)
+      end
+
+      def convenience_store_payment_slip_url
+        uri_decode(@xml.xpath(ResponseXpath::CONVENIENCE_STORE_PAYMENT_SLIP_URL).to_s)
+      end
+
+      def uri_decode(string)
+        URI.decode(string).encode(Encoding::UTF_8, Encoding::CP932)
+      end
+
+      module ResponseXpath
+        RESULT                             = '//Epsilon_result/result[@result]/@result'
+        TRANSACTION_CODE                   = '//Epsilon_result/result[@trans_code]/@trans_code'
+        ERROR_CODE                         = '//Epsilon_result/result[@err_code]/@err_code'
+        ERROR_DETAIL                       = '//Epsilon_result/result[@err_detail]/@err_detail'
+        CARD_NUMBER_MASK                   = '//Epsilon_result/result[@card_number_mask]/@card_number_mask'
+        CARD_BRAND                         = '//Epsilon_result/result[@card_brand]/@card_brand'
+        ACS_URL                            = '//Epsilon_result/result[@acsurl]/@acsurl' # ACS (Access Control Server)
+        PA_REQ                             = '//Epsilon_result/result[@pareq]/@pareq' # PAReq (payer authentication request)
+        RECEIPT_NUMBER                     = '//Epsilon_result/result[@receipt_no][1]/@receipt_no'
+        RECEIPT_DATE                       = '//Epsilon_result/result[@receipt_date][1]/@receipt_date'
+        CONVENIENCE_STORE_LIMIT_DATE       = '//Epsilon_result/result[@conveni_limit][1]/@conveni_limit'
+        CONVENIENCE_STORE_PAYMENT_SLIP_URL = '//Epsilon_result/result[@haraikomi_url][1]/@haraikomi_url'
+      end
+
+      module ResultCode
+        FAILURE        = '0'
+        SUCCESS        = '1'
+        THREE_D_SECURE = '5'
+        SYSTEM_ERROR   = '9'
+      end
+    end
+  end
+end

data/lib/active_merchant/epsilon.rb

@@ -7,3 +7,4 @@ require_relative 'billing/gateways/epsilon/epsilon_mission_code'
 require_relative 'billing/gateways/epsilon/epsilon_base'
 require_relative 'billing/gateways/epsilon'
 require_relative 'billing/gateways/epslion_convenience_store'
+require_relative 'billing/gateways/response_parser'

data/lib/active_merchant/epsilon/version.rb

@@ -1,5 +1,5 @@
 module ActiveMerchant
   module Epsilon
-    VERSION = "0.5.4"
+    VERSION = "0.5.5"
   end
 end

data/test/remote/gateways/remote_epsilon_convenience_store_test.rb

@@ -15,6 +15,7 @@ class RemoteEpsilonConvenienceStoreGatewayTest < MiniTest::Test
       assert_match /\d{7}/, response.params['receipt_number']
       assert_match /\d{4}\-\d{2}\-\d{2} \d{2}:\d{2}:\d{2}/, response.params['receipt_date']
       assert_match /\d{4}\-\d{2}\-\d{2}/, response.params['convenience_store_limit_date']
+      assert_match %r!\Ahttp://.+!, response.params['convenience_store_payment_slip_url']
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_merchant-epsilon
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Kenichi TAKAHASHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-04 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -157,6 +157,7 @@ files:
 - lib/active_merchant/billing/gateways/epsilon/epsilon_base.rb
 - lib/active_merchant/billing/gateways/epsilon/epsilon_mission_code.rb
 - lib/active_merchant/billing/gateways/epslion_convenience_store.rb
+- lib/active_merchant/billing/gateways/response_parser.rb
 - lib/active_merchant/epsilon.rb
 - lib/active_merchant/epsilon/version.rb
 - test/fixtures/vcr_cassettes/autheticate_three_d_secure_card_successful.yml
@@ -191,7 +192,6 @@ files:
 - test/test_helper.rb
 - test/unit/billing/convenience_store_test.rb
 - test/unit/gateways/epsilon_test.rb
-- wercker.yml
 homepage: http://github.com/pepabo/active_merchant-epsilon
 licenses:
 - MIT
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Epsilon integration for ActiveMerchant.

data/wercker.yml

@@ -1,11 +0,0 @@
-box: wercker/rvm
-build:
-  steps:
-    - rvm-use:
-        version: 2.1.6
-
-    - bundle-install
-
-    - script:
-        name: rake test:unit
-        code: bundle exec rake test:remote