gmo 0.5.3 → 0.5.5

data/fixtures/vcr_cassettes/GMO_Payment_SiteAPI/_search_brandtoken_gets_data_about_a_brandtoken.yml

@@ -4,7 +4,7 @@ http_interactions:
     method: post
     uri: https://<HOST>/payment/TradedBrandtoken.idPass
     body:
-      encoding: UTF-8
+      encoding: Windows-31J
       string: OrderID=<SHOP_PASS>502<SHOP_PASS>90974&MemberID=<SHOP_PASS>502<SHOP_PASS>90974&ShopID=<SHOP_ID>&ShopPass=<SHOP_PASS>&SiteID=<SITE_ID>&SitePass=<SHOP_PASS>
     headers:
       Accept-Encoding:
@@ -32,7 +32,7 @@ http_interactions:
       Content-Language:
       - ja-JP
     body:
-      encoding: UTF-8
+      encoding: Windows-31J
       string: TokenSeq=0&CardNoToken=*************<SHOP_PASS><SHOP_PASS><SHOP_PASS>&Forward=2a99663
     http_version:
   recorded_at: Tue, 08 Aug 2017 11:16:15 GMT
@@ -40,7 +40,7 @@ http_interactions:
     method: post
     uri: https://<HOST>/payment/SearchBrandtoken.idPass
     body:
-      encoding: UTF-8
+      encoding: Windows-31J
       string: MemberID=<SHOP_PASS>502<SHOP_PASS>9<SHOP_PASS><SHOP_PASS><SHOP_PASS>7&SeqMode=0&SiteID=<SITE_ID>&SitePass=<SHOP_PASS>
     headers:
       Accept-Encoding:
@@ -67,7 +67,7 @@ http_interactions:
       Content-Language:
       - ja-JP
     body:
-      encoding: UTF-8
+      encoding: Windows-31J
       string: TokenSeq=0&DefaultFlag=0&CardName=&CardNoToken=*************111&Expire=2212&HolderName=&DeleteFlag=0
     http_version:
   recorded_at: Tue, 08 Aug 2017 11:18:38 GMT

data/fixtures/vcr_cassettes/GMO_Payment_SiteAPI/_search_card_detail_by_member_id_gets_data_about_card_detail.yml

@@ -4,7 +4,7 @@ http_interactions:
     method: post
     uri: https://pt0<SHOP_PASS>.mul-pay.jp/payment/SearchCardDetail.idPass
     body:
-      encoding: UTF-8
+      encoding: Windows-31J
       string: MemberID=50292464&SeqMode=0&ShopID=<SHOP_ID>&ShopPass=<SHOP_PASS>
     headers:
       Accept-Encoding:

data/fixtures/vcr_cassettes/GMO_Payment_SiteAPI/_search_card_gets_data_about_a_card.yml

@@ -4,7 +4,7 @@ http_interactions:
     method: post
     uri: https://<HOST>/payment/SaveCard.idPass
     body:
-      encoding: UTF-8
+      encoding: Windows-31J
       string: MemberID=1362106780&CardNo=4111111111111111&Expire=1405&SiteID=<SITE_ID>&SitePass=<SITE_PASS>
     headers:
       Accept:
@@ -33,7 +33,7 @@ http_interactions:
     method: post
     uri: https://<HOST>/payment/SearchCard.idPass
     body:
-      encoding: UTF-8
+      encoding: Windows-31J
       string: MemberID=1362106780&CardSeq=0&SeqMode=0&SiteID=<SITE_ID>&SitePass=<SITE_PASS>
     headers:
       Accept:

data/fixtures/vcr_cassettes/GMO_Payment_SiteAPI/_search_member_gets_data_about_a_member.yml

@@ -4,7 +4,7 @@ http_interactions:
     method: post
     uri: https://<HOST>/payment/SaveMember.idPass
     body:
-      encoding: UTF-8
+      encoding: Windows-31J
       string: MemberID=1362106992&MemberName=John+Smith&SiteID=<SITE_ID>&SitePass=<SITE_PASS>
     headers:
       Accept:
@@ -33,7 +33,7 @@ http_interactions:
     method: post
     uri: https://<HOST>/payment/SearchMember.idPass
     body:
-      encoding: UTF-8
+      encoding: Windows-31J
       string: MemberID=1362106992&SiteID=<SITE_ID>&SitePass=<SITE_PASS>
     headers:
       Accept:

data/fixtures/vcr_cassettes/GMO_Payment_SiteAPI/_update_member_gets_data_about_a_transaction.yml

@@ -4,7 +4,7 @@ http_interactions:
     method: post
     uri: https://<HOST>/payment/UpdateMember.idPass
     body:
-      encoding: UTF-8
+      encoding: Windows-31J
       string: MemberID=1362106780&MemberName=John+Smith2&SiteID=<SITE_ID>&SitePass=<SITE_PASS>
     headers:
       Accept:

data/lib/gmo/const.rb

@@ -14,6 +14,12 @@ module GMO
       apple_pay: 'APay'
     }.freeze
 
+    RECURRING_REGIST_TYPE = {
+      member_id:   '1',
+      card_number: '2',
+      order_id:    '3'
+    }
+
     INPUT_PARAMS = {
       :access_id             => "AccessID",
       :access_pass           => "AccessPass",
@@ -38,6 +44,10 @@ module GMO
       :card_no               => "CardNo",
       :card_pass             => "CardPass",
       :card_seq              => "CardSeq",
+      :charge_day            => "ChargeDay",
+      :charge_month          => "ChargeMonth",
+      :charge_start_date     => "ChargeStartDate",
+      :charge_stop_date      => "ChargeStopDate",
       :client_field_1        => "ClientField1",
       :client_field_2        => "ClientField2",
       :client_field_3        => "ClientField3",
@@ -102,7 +112,9 @@ module GMO
       :receipts_disp_11      => "ReceiptsDisp11",
       :receipts_disp_12      => "ReceiptsDisp12",
       :receipts_disp_13      => "ReceiptsDisp13",
+      :recurring_id          => "RecurringID",
       :redirect_url          => "RedirectURL",
+      :regist_type           => "RegistType",
       :register_disp_1       => "RegisterDisp1",
       :register_disp_2       => "RegisterDisp2",
       :register_disp_3       => "RegisterDisp3",
@@ -122,6 +134,7 @@ module GMO
       :shop_pass             => "ShopPass",
       :site_id               => "SiteID",
       :site_pass             => "SitePass",
+      :src_order_id          => "SrcOrderID",
       :suica_add_info_1      => "SuicaAddInfo1",
       :suica_add_info_2      => "SuicaAddInfo2",
       :suica_add_info_3      => "SuicaAddInfo3",
@@ -141,7 +154,11 @@ module GMO
       :lang_cd               => "LangCd",
       :user_info             => "UserInfo",
       :package_name          => "PackageName",
-      :search_type           => "SearchType"
+      :search_type           => "SearchType",
+      :trade_days            => "TradeDays",
+      :trade_reason          => "TradeReason",
+      :trade_client_name     => "TradeClientName",
+      :trade_client_mail_address => "TradeClientMailAddress"
     }.freeze
 
     API_ERROR_MESSAGES_EN = {

data/lib/gmo/shop_and_site_api.rb

@@ -103,6 +103,96 @@ module GMO
         post_request name, options
       end
 
+      ### @params ###
+      # ShopID
+      # ShopPass
+      # RecurringID
+      # Amount
+      # Tax
+      # ChargeDay
+      # ChargeMonth
+      # ChargeStartDate
+      # ChargeStopDate
+      # RegistType
+      # SiteID
+      # SitePass
+      # MemberID
+      # CardNo
+      # Expire
+      # SrcOrderID
+      # ClientField1
+      # ClientField2
+      # ClientField3
+      ### @return ###
+      # ShopID
+      # RecurringID
+      # Amount
+      # Tax
+      # ChargeDay
+      # ChargeMonth
+      # ChargeStartDate
+      # ChargeStopDate
+      # NextChargeDate
+      # Method
+      ### example ###
+      # gmo.register_recurring_credit({
+      #   recurring_id: "1535964921",
+      #   amount: 100,
+      #   regist_type: GMO::Const::RECURRING_REGIST_TYPE[:member_id],
+      #   member_id: "mem10001"
+      # })
+      # => {"ShopID"=>"tshop0001", "RecurringID"=>"1535964921", "Amount"=>"100", "Tax"=>"0", "ChargeDay"=>"31", "ChargeMonth"=>"01|02|03|04|05|06|07|08|09|10|11|12", "ChargeStartDate"=>"20180904", "ChargeStopDate"=>"", "NextChargeDate"=>"20180930", "Method"=>"RECURRING_CREDIT", "CardNo"=>"", "Expire"=>"", "SiteID"=>"", "MemberID"=>"mem1001"}
+      def register_recurring_credit(options = {})
+        name = "RegisterRecurringCredit.idPass"
+        required = [:recurring_id, :charge_day, :amount, :regist_type]
+        required += case options[:regist_type].to_i
+                    when 1
+                      options.update(site_id: @site_id, site_pass: @site_pass)
+                      [:member_id]
+                    when 2
+                      [:card_no, :expire]
+                    when 3
+                      [:src_order_id]
+                    end
+        assert_required_options(required, options)
+        post_request name, options
+      end
+
+      ### @params ###
+      # ShopID
+      # ShopPass
+      # RecurringID
+      ### @return ###
+      # ShopID
+      # RecurringID
+      # Amount
+      # Tax
+      # ChargeDay
+      # ChargeMonth
+      # ChargeStartDate
+      # ChargeStopDate
+      # NextChargeDate
+      # Method
+      # SiteID
+      # MemberID
+      # CardNo
+      # Expire
+      # PrintStr
+      # ErrCode
+      # ErrInfo
+      ### example ###
+      # gmo.unregister_recurring({
+      #   recurring_id: "1535964921"
+      # })
+      # => {"ShopID"=>"tshop0001", "RecurringID"=>"1536039145", "Amount"=>"100", "Tax"=>"0", "ChargeDay"=>"31", "ChargeMonth"=>"01|02|03|04|05|06|07|08|09|10|11|12", "ChargeStartDate"=>"20180905", "ChargeStopDate"=>"", "NextChargeDate"=>"", "Method"=>"RECURRING_CREDIT", "CardNo"=>"", "Expire"=>"", "SiteID"=>"tsite0001", "MemberID"=>"mem1001", "PrintStr"=>""}
+      def unregister_recurring(options = {})
+        name = "UnregisterRecurring.idPass"
+        options.merge!(site_id: @site_id, site_pass: @site_pass)
+        required = [:recurring_id]
+        assert_required_options(required, options)
+        post_request name, options
+      end
+
       private
 
         def api_call(name, args = {}, verb = "post", options = {})

data/lib/gmo/shop_api.rb

@@ -158,6 +158,69 @@ module GMO
         post_request name, options
       end
 
+      ### @params ###
+      # OrderID
+      # Amount
+      # Tax
+      ### @return ###
+      # AccessID
+      # AccessPass
+      ### example ###
+      # gmo.entry_tran_virtualaccount({
+      #   order_id: "ord12345",
+      #   tax: "0001001",
+      #   amount: 100
+      # })
+      # => {"AccessID"=>"139f8ec33a07c55f406937c52ce4473d", "AccessPass"=>"2689b204d2c17192fa35f9269fa7e744"}
+      def entry_tran_virtualaccount(options = {})
+        name = "EntryTranVirtualaccount.idPass"
+        required = [:order_id, :amount]
+        assert_required_options(required, options)
+        post_request name, options
+      end
+
+      ### @params ###
+      # OrderID
+      # Amount
+      # Tax
+      ### @return ###
+      # AccessID
+      # AccessPass
+      ### example ###
+      # gmo.entry_tran_suica({
+      #   order_id: "ord12345",
+      #   tax: "0001001",
+      #   amount: 100
+      # })
+      # => {"AccessID"=>"139f8ec33a07c55f406937c52ce4473d", "AccessPass"=>"2689b204d2c17192fa35f9269fa7e744"}
+      def entry_tran_suica(options = {})
+        name = "EntryTranSuica.idPass"
+        required = [:order_id, :amount]
+        assert_required_options(required, options)
+        post_request name, options
+      end
+
+      ### @params ###
+      # OrderID
+      # Amount
+      # Tax
+      ### @return ###
+      # AccessID
+      # AccessPass
+      ### example ###
+      # gmo.entry_tran_edy({
+      #   order_id: "ord12345",
+      #   tax: "0001001",
+      #   amount: 100
+      # })
+      # => {"AccessID"=>"139f8ec33a07c55f406937c52ce4473d", "AccessPass"=>"2689b204d2c17192fa35f9269fa7e744"}
+      def entry_tran_edy(options = {})
+        name = "EntryTranEdy.idPass"
+        required = [:order_id, :amount]
+        assert_required_options(required, options)
+        post_request name, options
+      end
+
       ## 2.2.2.2.決済実行
       # 指定されたサイトに会員を登録します。
       # return
@@ -286,6 +349,33 @@ module GMO
         post_request name, options
       end
 
+      # 【銀行振込(バーチャル口座)決済】
+      # 18.1.2.2. 決済実行
+      def exec_tran_virtualaccount(options = {})
+        name = "ExecTranVirtualaccount.idPass"
+        required = [:access_id, :access_pass, :order_id, :trade_days]
+        assert_required_options(required, options)
+        post_request name, options
+      end
+
+      # 【モバイルSuica決済】
+      # 18.1.2.2. 決済実行
+      def exec_tran_suica(options = {})
+        name = "ExecTranSuica.idPass"
+        required = [:access_id, :access_pass, :order_id, :item_name, :mail_address]
+        assert_required_options(required, options)
+        post_request name, options
+      end
+
+      # 【楽天Edy決済】
+      # 18.1.2.2. 決済実行
+      def exec_tran_edy(options = {})
+        name = "ExecTranEdy.idPass"
+        required = [:access_id, :access_pass, :order_id, :mail_address]
+        assert_required_options(required, options)
+        post_request name, options
+      end
+
       ### @params ###
       # AccessID
       # AccessPass

data/lib/gmo/version.rb

@@ -1,3 +1,3 @@
 module GMO
-  VERSION = "0.5.3"
+  VERSION = "0.5.5"
 end

data/lib/gmo.rb

@@ -42,7 +42,7 @@ module GMO
         key_values = result.body.to_s.split('&').map { |str| str.split('=', 2) }.flatten
         response = Hash[*key_values]
         # converting to UTF-8
-        body = response = Hash[response.map { |k,v| [k, NKF.nkf('-w',v)] }]
+        body = response = Hash[response.map { |k,v| [k, NKF.nkf('-S -w',v)] }]
         # Check for errors if provided a error_checking_block
         yield(body) if error_checking_block
         # Return result

data/spec/gmo/shop_and_site_api_spec.rb

@@ -171,4 +171,28 @@ describe "GMO::Payment::ShopAndSiteAPI" do
     end
   end
 
+  describe "#register_recurring_credit" do
+    it "got data", :vcr do
+      recurring_id = generate_id
+      member_id = 'mem1001'
+      result = @service.register_recurring_credit({
+        :recurring_id  => recurring_id,
+        :amount        => 100,
+        :charge_day    => 31,
+        :regist_type   => GMO::Const::RECURRING_REGIST_TYPE[:member_id],
+        :member_id     => member_id,
+      })
+      result["NextChargeDate"].nil?.should_not be true
+    end
+  end
+
+  describe "#unregister_recurring" do
+    it "success unregister", :vcr do
+      recurring_id = generate_id
+      result = @service.unregister_recurring({
+        recurring_id: recurring_id
+      })
+      result["Method"].should == "RECURRING_CREDIT"
+    end
+  end
 end

data/spec/gmo/shop_api_spec.rb

@@ -174,6 +174,60 @@ describe "GMO::Payment::ShopAPI" do
     end
   end
 
+  describe "#entry_tran_virtualaccount" do
+    it "gets data about a transaction", :vcr do
+      order_id = @order_id
+      result = @service.entry_tran_virtualaccount({
+        :order_id => order_id,
+        :amount => 100
+      })
+      result["AccessID"].nil?.should_not be true
+      result["AccessPass"].nil?.should_not be true
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.entry_tran_virtualaccount()
+      }.should raise_error('Required order_id, amount were not provided.')
+    end
+  end
+
+  describe "#entry_tran_suica" do
+    it "gets data about a transaction", :vcr do
+      order_id = @order_id
+      result = @service.entry_tran_suica({
+        :order_id => order_id,
+        :amount => 100
+      })
+      result["AccessID"].nil?.should_not be true
+      result["AccessPass"].nil?.should_not be true
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.entry_tran_suica()
+      }.should raise_error('Required order_id, amount were not provided.')
+    end
+  end
+
+  describe "#entry_tran_edy" do
+    it "gets data about a transaction", :vcr do
+      order_id = @order_id
+      result = @service.entry_tran_edy({
+        :order_id => order_id,
+        :amount => 100
+      })
+      result["AccessID"].nil?.should_not be true
+      result["AccessPass"].nil?.should_not be true
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.entry_tran_edy()
+      }.should raise_error('Required order_id, amount were not provided.')
+    end
+  end
+
   describe "#exec_tran" do
     it "gets data about a transaction", :vcr do
       order_id = generate_id
@@ -470,6 +524,110 @@ describe "GMO::Payment::ShopAPI" do
     end
   end
 
+  describe "#exec_tran_virtualaccount" do
+    it "gets data about a transaction", :vcr do
+      order_id = generate_id
+      result = @service.entry_tran_virtualaccount({
+        :order_id => order_id,
+        :amount => 100
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      result = @service.exec_tran_virtualaccount({
+        :order_id      => order_id,
+        :access_id     => access_id,
+        :access_pass   => access_pass,
+        :trade_days    => 14
+      })
+      result["AccessID"].nil?.should_not be_truthy
+      result["BankCode"].nil?.should_not be_truthy
+      result["BankName"].nil?.should_not be_truthy
+      result["BranchCode"].nil?.should_not be_truthy
+      result["BranchName"].nil?.should_not be_truthy
+      result["AccountType"].nil?.should_not be_truthy
+      result["AccountNumber"].nil?.should_not be_truthy
+      result["AvailableDate"].nil?.should_not be_truthy
+      result["TradeCode"].nil?.should_not be_truthy
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.exec_tran_virtualaccount()
+      }.should raise_error("Required access_id, access_pass, order_id, trade_days were not provided.")
+    end
+  end
+
+  describe "#exec_tran_suica" do
+    it "gets data about a transaction", :vcr do
+      order_id = generate_id
+      client_field_1 = "client_field1"
+      result = @service.entry_tran_suica({
+        :order_id => order_id,
+        :amount => 100
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      result = @service.exec_tran_suica({
+        :order_id         => order_id,
+        :access_id        => access_id,
+        :access_pass      => access_pass,
+        :item_name        => '購入する商品名',
+        :mail_address     => 'test@example.com',
+        :client_field_1   => client_field_1,
+        :client_field_flg => 1
+      })
+      result["OrderID"].nil?.should_not be_truthy
+      result["SuicaOrderNo"].nil?.should_not be_truthy
+      result["ReceiptNo"].nil?.should_not be_truthy
+      result["PaymentTerm"].nil?.should_not be_truthy
+      result["TranDate"].nil?.should_not be_truthy
+      result["CheckString"].nil?.should_not be_truthy
+      (result["ClientField1"] == client_field_1).should be_truthy
+      result["ClientField3"].nil?.should_not be_truthy
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.exec_tran_suica()
+      }.should raise_error("Required access_id, access_pass, order_id, item_name, mail_address were not provided.")
+    end
+  end
+
+  describe "#exec_tran_edy" do
+    it "gets data about a transaction", :vcr do
+      order_id = generate_id
+      client_field_1 = "client_field1"
+      result = @service.entry_tran_edy({
+        :order_id => order_id,
+        :amount => 100
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      result = @service.exec_tran_edy({
+        :order_id         => order_id,
+        :access_id        => access_id,
+        :access_pass      => access_pass,
+        :mail_address     => 'test@example.com',
+        :client_field_1   => client_field_1,
+        :client_field_flg => 1
+      })
+      result["OrderID"].nil?.should_not be_truthy
+      result["ReceiptNo"].nil?.should_not be_truthy
+      result["EdyOrderNo"].nil?.should_not be_truthy
+      result["PaymentTerm"].nil?.should_not be_truthy
+      result["TranDate"].nil?.should_not be_truthy
+      result["CheckString"].nil?.should_not be_truthy
+      (result["ClientField1"] == client_field_1).should be_truthy
+      result["ClientField3"].nil?.should_not be_truthy
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.exec_tran_edy()
+      }.should raise_error("Required access_id, access_pass, order_id, mail_address were not provided.")
+    end
+  end
+
   describe "#exec_tran_brandtoken" do
     it "gets data about a transaction", :vcr do
       order_id = generate_id
@@ -495,7 +653,7 @@ describe "GMO::Payment::ShopAPI" do
       result["Approve"].nil?.should_not be true
       result["TranID"].nil?.should_not be true
       result["TranDate"].nil?.should_not be true
-      (result["ClientField1"] == client_field_1).should be true
+      result["ClientField1"].should eq client_field_1
       result["ClientField2"].nil?.should_not be true
       result["ClientField3"].nil?.should_not be true
     end
@@ -511,7 +669,6 @@ describe "GMO::Payment::ShopAPI" do
 
       it "should correctly handle Japanese", :vcr do
         order_id = generate_id
-        client_field_1 = "〜−¢£¬−‖①ほげほげhogehoge"
         result = @service.entry_tran_brandtoken({
           :order_id => order_id,
           :job_cd => "AUTH",
@@ -525,7 +682,7 @@ describe "GMO::Payment::ShopAPI" do
           :access_pass => access_pass,
           :token_type  => :apple_pay,
           :token       => 'base64encodedtoken',
-          :client_field_1 => client_field_1
+          :client_field_1 => 'ｶｿｳｼﾃﾝ'
         })
         result["Status"].nil?.should_not be true
         result["OrderID"].nil?.should_not be true
@@ -533,8 +690,8 @@ describe "GMO::Payment::ShopAPI" do
         result["Approve"].nil?.should_not be true
         result["TranID"].nil?.should_not be true
         result["TranDate"].nil?.should_not be true
-        (result["ClientField1"] == client_field_1).should be true
-        (result["ClientField1"].encoding.to_s == "UTF-8").should be true
+        result["ClientField1"].should eq "カソウシテン"
+        result["ClientField1"].encoding.name.should eq "UTF-8"
         result["ClientField2"].nil?.should_not be true
         result["ClientField3"].nil?.should_not be true
       end

data/spec/spec_helper.rb

@@ -11,17 +11,14 @@ end
 require 'gmo'
 require 'rspec'
 require 'vcr'
+require 'pry'
 require 'support/config_loader'
 require 'support/factory'
 require 'support/vcr'
 
-if RUBY_VERSION < '1.9.0'
-  require 'support/encoding'
-end
-
 RSpec.configure do |config|
   config.mock_with :rspec
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
-end
+end