active_merchant-epsilon 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 47c8ebb3aaa32f424787d2b5c842250ee06aeb65
-  data.tar.gz: 4feb0998d3dc9422908b18c17867e0fbab12f404
+SHA256:
+  metadata.gz: 915567d0ef3dfd3c77a829198bcf4fbc62e29a2a8bc5840b99c6ce1ae8337073
+  data.tar.gz: f95f8b2405b3e6b9139688157ceeb962789a72bfe83f251503879dd1ff128c84
 SHA512:
-  metadata.gz: c2d4ea004d1f5e2b511c3ac8722389b98f790bc17bd9970a8bdc01724e7ab7323bbfb44ca3f2ae49d2ac2f26f08a25bd5a094bfdad821b78a37cc7dc7532dfe8
-  data.tar.gz: 4ac64c7b58f282109c8edcbdb96394926d98947549aa3a333b36cffba8c304d3c32ac72a4b5eb2e9c7348b6056c2eab540c1d08e9eafd2e4a300efcdd7c75b17
+  metadata.gz: f958bcbe2ab8f3cbe876396b4460017c38e65aa1ec8f8140326a3f65185612ab9a8bc89d57be4f3d4aafe9b06aa2dbf4eafee7e419553739dfb6300cc6f65418
+  data.tar.gz: 79bd291e76a237d3a478bfd1c76bc4b28c9edc1e99d5f0ab990e282485af9630ce2822f2f0874cfacd7df6789b8bf885e2e4a13ac5ab995d5bb6789fd2222bba

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-- 2.1.7
-- 2.2.3
-- 2.3.0
+- 2.3.8
+- 2.4.5
+- 2.5.3
 
 script: bundle exec rake test:remote
 script: bundle exec rake test:unit

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+### 0.9.2
+
+* [Support GMO Payment After Delivery](https://github.com/pepabo/active_merchant-epsilon/pull/106)
+
 ### 0.9.1
 
 * [Add amount to response parameters when find order](https://github.com/pepabo/active_merchant-epsilon/pull/99)

data/README.md

@@ -302,6 +302,45 @@ else
 end
 ```
 
+### GMO Payment After Delivery
+
+```ruby
+ActiveMerchant::Billing::EpsilonGmoAfterGateway.contract_code = 'YOUR_CONTRACT_CODE'
+
+gateway = ActiveMerchant::Billing::EpsilonGmoAfterGateway.new
+
+amount = 10000
+
+purchase_detail = {
+  user_id:           'YOUR_APP_USER_IDENTIFIER',
+  user_name:         '山田 太郎',
+  user_email:        'yamada-taro@example.com',
+  user_tel:          '0312345678',
+  item_code:         'ITEM001',
+  item_name:         'Greate Product',
+  order_number:      'UNIQUE ORDER NUMBER',
+  consignee_postal:  '1500002',
+  consignee_name:    '山田 太郎',
+  consignee_address: '東京都渋谷区1-1-1',
+  consignee_tel:     '0312345678',
+  orderer_postal:    '1500002',
+  orderer_name:      '山田 太郎',
+  orderer_address:   '東京都渋谷区1-1-1',
+  orderer_tel:       '0312345678',
+  memo1:             'memo1',
+  memo2:             'memo2',
+}
+
+response = gateway.purchase(amount, purchase_detail)
+
+if response.success?
+  puts "Successfully send order data"
+  puts "Redirect url is #{response.params['redirect']}"
+else
+  raise StandardError, response.message
+end
+```
+
 ### Error handling
 
 If epsilon server returns status excepted 200, `#purchase` method raise `ActiveMerchant::ResponseError`.

data/active_merchant-epsilon.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activemerchant', '~> 1.66.0'
+  spec.add_dependency 'activemerchant', '~> 1.88'
   spec.add_dependency 'nokogiri'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'dotenv'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'tapp'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'vcr'

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

@@ -0,0 +1,38 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class EpsilonGmoAfterGateway < EpsilonBaseGateway
+      def purchase(amount, detail = {})
+        params = {
+          contract_code: self.contract_code,
+          user_id:       detail[:user_id],
+          user_name:     detail[:user_name],
+          user_mail_add: detail[:user_email],
+          item_code:     detail[:item_code],
+          item_name:     detail[:item_name],
+          order_number:  detail[:order_number],
+          st_code:       '00000-0000-00000-00010-00000-00000-00000',
+          mission_code:  EpsilonMissionCode::PURCHASE,
+          item_price:    amount,
+          process_code:  EpsilonProcessCode::FIRST,
+          xml: 1, # 応答形式。1: xml形式を固定
+          delivery_code: 99, # 配送区分。99で固定
+          consignee_postal: detail[:consignee_postal],
+          consignee_name: detail[:consignee_name],
+          consignee_address: detail[:consignee_address],
+          consignee_tel: detail[:consignee_tel],
+          orderer_postal: detail[:orderer_postal],
+          orderer_name: detail[:orderer_name],
+          orderer_address: detail[:orderer_address],
+          orderer_tel: detail[:orderer_tel],
+          version: 2, # 推奨文字コードがUTF8の方を指定
+        }
+
+        params[:memo1] = detail[:memo1] if detail.has_key?(:memo1)
+        params[:memo2] = detail[:memo2] if detail.has_key?(:memo2)
+        params[:user_tel] = detail[:user_tel] if detail.has_key?(:user_tel)
+
+        commit('receive_order3.cgi', params, [:redirect])
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+require 'cgi'
+
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class ResponseParser
@@ -117,8 +119,18 @@ module ActiveMerchant #:nodoc:
         @xml.xpath(ResponseXpath::AMOUNT).to_s
       end
 
+      def redirect
+        uri_decode(@xml.xpath(ResponseXpath::REDIRECT).to_s)
+      end
+
       def uri_decode(string)
-        URI.decode(string).encode(Encoding::UTF_8, Encoding::CP932)
+        decoded_string = CGI.unescape(string)
+
+        unless decoded_string.encoding == Encoding::UTF_8
+          decoded_string = decoded_string.encode(Encoding::UTF_8, Encoding::CP932)
+        end
+
+        decoded_string
       end
 
       module ResponseXpath
@@ -146,6 +158,7 @@ module ActiveMerchant #:nodoc:
         ITEM_PRICE                         = '//Epsilon_result/result[@item_price]/@item_price'
         PAYMENT_CODE                       = '//Epsilon_result/result[@payment_code]/@payment_code'
         AMOUNT                             = '//Epsilon_result/result[@amount]/@amount'
+        REDIRECT                           = '//Epsilon_result/result[@redirect]/@redirect'
       end
 
       module ResultCode

data/lib/active_merchant/epsilon.rb

@@ -10,4 +10,5 @@ require_relative 'billing/gateways/epsilon'
 require_relative 'billing/gateways/epsilon_convenience_store'
 require_relative 'billing/gateways/epsilon_gmo_id'
 require_relative 'billing/gateways/epsilon_virtual_account'
+require_relative 'billing/gateways/epsilon_gmo_after'
 require_relative 'billing/gateways/response_parser'

data/lib/active_merchant/epsilon/version.rb

@@ -1,5 +1,5 @@
 module ActiveMerchant
   module Epsilon
-    VERSION = "0.9.1"
+    VERSION = "0.9.2"
   end
 end

data/test/fixtures/vcr_cassettes/gmo_after_purchase_fail.yml

@@ -0,0 +1,44 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://beta.epsilon.jp/cgi-bin/order/receive_order3.cgi
+    body:
+      encoding: UTF-8
+      string: contract_code=[CONTRACT_CODE]&user_id=&user_name=YAMADA+Taro&user_mail_add=yamada-taro%40example.com&item_code=ITEM001&item_name=Greate+Product&order_number=O2665045&st_code=00000-0000-00000-00010-00000-00000-00000&mission_code=1&item_price=10000&process_code=1&xml=1&delivery_code=99&consignee_postal=1500002&consignee_name=%E3%82%A4%E3%83%97%E3%82%B7%E3%83%AD%E3%83%B3%E3%82%BF%E3%83%AD%E3%82%A6&consignee_address=%E6%9D%B1%E4%BA%AC%E9%83%BD%E6%B8%8B%E8%B0%B7%E5%8C%BA%EF%BC%91%E2%88%92%EF%BC%91%E2%88%92%EF%BC%91&consignee_tel=0312345678&orderer_postal=1500002&orderer_name=YAMADA+Taro&orderer_address=%E6%9D%B1%E4%BA%AC%E9%83%BD%E6%B8%8B%E8%B0%B7%E5%8C%BA1-1-1&orderer_tel=0312345678&version=2&memo1=memo1&memo2=memo2
+    headers:
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Connection:
+      - close
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 13 Mar 2020 02:42:03 GMT
+      Server:
+      - Apache
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Content-Type:
+      - text/xml
+    body:
+      encoding: UTF-8
+      string: "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n  <Epsilon_result>\r\n
+        \   <result result=\"0\" />\r\n    <result err_code=\"601\" />\r\n    <result
+        err_detail=\"%E3%83%A6%E3%83%BC%E3%82%B6%E3%83%BCID%E3%81%AE%E5%BD%A2%E5%BC%8F%E3%81%8C%E7%95%B0%E5%B8%B8%E3%81%A7%E3%81%99\"
+        />\r\n    <result memo1=\"memo1\" />\r\n    <result memo2=\"memo2\" />\r\n
+        \ </Epsilon_result>\r\n"
+    http_version: null
+  recorded_at: Fri, 13 Mar 2020 02:42:04 GMT
+recorded_with: VCR 5.1.0

data/test/fixtures/vcr_cassettes/gmo_after_purchase_successful.yml

@@ -0,0 +1,45 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://beta.epsilon.jp/cgi-bin/order/receive_order3.cgi
+    body:
+      encoding: UTF-8
+      string: contract_code=[CONTRACT_CODE]&user_id=U1584067324&user_name=YAMADA+Taro&user_mail_add=yamada-taro%40example.com&item_code=ITEM001&item_name=Greate+Product&order_number=O4628159&st_code=00000-0000-00000-00010-00000-00000-00000&mission_code=1&item_price=10000&process_code=1&xml=1&delivery_code=99&consignee_postal=1500002&consignee_name=%E3%82%A4%E3%83%97%E3%82%B7%E3%83%AD%E3%83%B3%E3%82%BF%E3%83%AD%E3%82%A6&consignee_address=%E6%9D%B1%E4%BA%AC%E9%83%BD%E6%B8%8B%E8%B0%B7%E5%8C%BA%EF%BC%91%E2%88%92%EF%BC%91%E2%88%92%EF%BC%91&consignee_tel=0312345678&orderer_postal=1500002&orderer_name=YAMADA+Taro&orderer_address=%E6%9D%B1%E4%BA%AC%E9%83%BD%E6%B8%8B%E8%B0%B7%E5%8C%BA1-1-1&orderer_tel=0312345678&version=2&memo1=memo1&memo2=memo2
+    headers:
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Connection:
+      - close
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 13 Mar 2020 02:42:05 GMT
+      Server:
+      - Apache
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Content-Type:
+      - text/xml
+    body:
+      encoding: UTF-8
+      string: |
+        <?xml version="1.0" encoding="UTF-8" ?>
+         <Epsilon_result>
+          <result result="1" />
+          <result redirect="https%3A%2F%2Fbeta.epsilon.jp%2Fcgi-bin%2Forder%2Fmethod_select3.cgi%3Ftrans_code%3DpShgPaOlX%252Fs55" />
+          </Epsilon_result>
+    http_version: null
+  recorded_at: Fri, 13 Mar 2020 02:42:05 GMT
+recorded_with: VCR 5.1.0

data/test/remote/gateways/remote_epsilon_gmo_after_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class RemoteEpsilonGmoAfterGatewayTest < MiniTest::Test
+  include SamplePaymentMethods
+
+  def gateway
+    @gateway ||= ActiveMerchant::Billing::EpsilonGmoAfterGateway.new
+  end
+
+  def test_gmo_after_purchase_successfull
+    VCR.use_cassette(:gmo_after_purchase_successful) do
+      response = gateway.purchase(10000, gmo_after_purchase_detail)
+
+      assert_equal true, response.success?
+      assert_equal true, !response.params['redirect'].empty?
+    end
+  end
+
+  def test_gmo_after_purchase_fail
+    invalid_purchase_detail = gmo_after_purchase_detail
+    invalid_purchase_detail[:user_id] = ''
+
+    VCR.use_cassette(:gmo_after_purchase_fail) do
+      response = gateway.purchase(10000, invalid_purchase_detail)
+
+      assert_equal false, response.success?
+    end
+  end
+end

data/test/test_helper.rb

@@ -9,7 +9,7 @@ require 'tapp'
 require 'vcr'
 
 require 'webmock/minitest'
-require 'mocha/mini_test'
+require 'mocha/minitest'
 
 Dotenv.load
 
@@ -206,6 +206,28 @@ module SamplePaymentMethods
     }
   end
 
+  def gmo_after_purchase_detail
+    now = Time.now
+    {
+      user_id:      "U#{Time.now.to_i}",
+      user_name:    'YAMADA Taro',
+      user_email:   'yamada-taro@example.com',
+      item_code:    'ITEM001',
+      item_name:    'Greate Product',
+      order_number: "O#{now.sec}#{now.usec}",
+      memo1:        'memo1',
+      memo2:        'memo2',
+      consignee_postal: '1500002',
+      consignee_name: 'イプシロンタロウ',
+      consignee_address: '東京都渋谷区１−１−１',
+      consignee_tel: '0312345678',
+      orderer_postal: '1500002',
+      orderer_name: 'YAMADA Taro',
+      orderer_address: '東京都渋谷区1-1-1',
+      orderer_tel: '0312345678',
+    }
+  end
+
   def fixture_xml(filename, parse: true)
     xml = File.read("test/fixtures/#{filename}")
     parse ? Nokogiri.parse(xml.sub('x-sjis-cp932', 'CP932')) : xml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_merchant-epsilon
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Kenichi TAKAHASHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.66.0
+        version: '1.88'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.66.0
+        version: '1.88'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tapp
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,7 @@ files:
 - lib/active_merchant/billing/gateways/epsilon/epsilon_mission_code.rb
 - lib/active_merchant/billing/gateways/epsilon/epsilon_process_code.rb
 - lib/active_merchant/billing/gateways/epsilon_convenience_store.rb
+- lib/active_merchant/billing/gateways/epsilon_gmo_after.rb
 - lib/active_merchant/billing/gateways/epsilon_gmo_id.rb
 - lib/active_merchant/billing/gateways/epsilon_virtual_account.rb
 - lib/active_merchant/billing/gateways/response_parser.rb
@@ -188,6 +189,8 @@ files:
 - test/fixtures/vcr_cassettes/find_order_success.yml
 - test/fixtures/vcr_cassettes/find_user_failure.yml
 - test/fixtures/vcr_cassettes/find_user_success.yml
+- test/fixtures/vcr_cassettes/gmo_after_purchase_fail.yml
+- test/fixtures/vcr_cassettes/gmo_after_purchase_successful.yml
 - test/fixtures/vcr_cassettes/gmo_id_purchase_failure.yml
 - test/fixtures/vcr_cassettes/gmo_id_purchase_successful.yml
 - test/fixtures/vcr_cassettes/gmo_id_void_faiure.yml
@@ -215,6 +218,7 @@ files:
 - test/fixtures/vcr_cassettes/void_fail.yml
 - test/fixtures/vcr_cassettes/void_successful.yml
 - test/remote/gateways/remote_epsilon_convenience_store_test.rb
+- test/remote/gateways/remote_epsilon_gmo_after_test.rb
 - test/remote/gateways/remote_epsilon_gmo_id_test.rb
 - test/remote/gateways/remote_epsilon_test.rb
 - test/remote/gateways/remote_epsilon_virtual_account_test.rb
@@ -240,8 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Epsilon integration for ActiveMerchant.
@@ -257,6 +260,8 @@ test_files:
 - test/fixtures/vcr_cassettes/find_order_success.yml
 - test/fixtures/vcr_cassettes/find_user_failure.yml
 - test/fixtures/vcr_cassettes/find_user_success.yml
+- test/fixtures/vcr_cassettes/gmo_after_purchase_fail.yml
+- test/fixtures/vcr_cassettes/gmo_after_purchase_successful.yml
 - test/fixtures/vcr_cassettes/gmo_id_purchase_failure.yml
 - test/fixtures/vcr_cassettes/gmo_id_purchase_successful.yml
 - test/fixtures/vcr_cassettes/gmo_id_void_faiure.yml
@@ -284,6 +289,7 @@ test_files:
 - test/fixtures/vcr_cassettes/void_fail.yml
 - test/fixtures/vcr_cassettes/void_successful.yml
 - test/remote/gateways/remote_epsilon_convenience_store_test.rb
+- test/remote/gateways/remote_epsilon_gmo_after_test.rb
 - test/remote/gateways/remote_epsilon_gmo_id_test.rb
 - test/remote/gateways/remote_epsilon_test.rb
 - test/remote/gateways/remote_epsilon_virtual_account_test.rb