gmo 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0b7edafdd7655d6094971db8e84dcdadf7bd5125
+  data.tar.gz: 813cf2bad542ee8bc0f86b6ea87bcd0c14648841
+SHA512:
+  metadata.gz: 82c2b085b33c3154c1454359af93d5d83ab2de536ffdcb1f1374ca120dec63df0ea9286d055d25acecffb5f539e016ceb9ac22ec7c9ac48e845b04c70517de18
+  data.tar.gz: 57e53b65d3dfad549c72d0a9e9f448b4fc626a0546bff8f9c9ec51f7a9392af9e2402a46af74089f14d0910f29f1345dba29e01b80bb8c988240a8a46d8e9aa8

data/{travis.yml → .travis.yml}

@@ -5,8 +5,14 @@ rvm:
   - rbx-18mode
   - rbx-19mode
   - ruby-head
-  - jruby-19mode
-  - jruby-18mode
-  - jruby-head
   - 1.8.7
   - 2.0.0
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
+    - rvm: jruby-head

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.2.3
+ * Added module GMO::JSON to blur the differences between the different MultiJson
+ * Added test for ShopAndSiteAPI#trade_card
+ * Fix typo and comment #4, #3 (Thanks @toshiwo, @fukayatsu)
+
 ## 0.2.2
  * Changed POST data encoding to Shift-JIS #2 (Thanks @keichan34)
 

data/fixtures/vcr_cassettes/GMO_Payment_ShopAndSiteAPI/_trade_card_got_data.yml

@@ -0,0 +1,127 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://<HOST>/payment/EntryTran.idPass
+    body:
+      encoding: UTF-8
+      string: OrderID=1371958258&JobCd=AUTH&Amount=100&ShopID=<SHOP_ID>&ShopPass=<SHOP_PASS>
+    headers:
+      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:
+      - Sun, 23 Jun 2013 03:30:58 GMT
+      Connection:
+      - close
+      Content-Type:
+      - text/plain;charset=Windows-31J
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: AccessID=1da06187345d613ce206f4cd05bc5322&AccessPass=45a21e63323c3795d26e22338eaa6b7f
+    http_version:
+  recorded_at: Sun, 23 Jun 2013 03:30:59 GMT
+- request:
+    method: post
+    uri: https://<HOST>/payment/ExecTran.idPass
+    body:
+      encoding: UTF-8
+      string: OrderID=1371958258&AccessID=1da06187345d613ce206f4cd05bc5322&AccessPass=45a21e63323c3795d26e22338eaa6b7f&Method=1&PayTimes=1&CardNo=4111111111111111&Expire=1405&ClientFieldFlag=0&DeviceCategory=0&ShopID=<SHOP_ID>&ShopPass=<SHOP_PASS>
+    headers:
+      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:
+      - Sun, 23 Jun 2013 03:30:59 GMT
+      Connection:
+      - close
+      Content-Type:
+      - text/plain;charset=Windows-31J
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: ACS=0&OrderID=1371958258&Forward=2a99662&Method=1&PayTimes=&Approve=7214787&TranID=1306231226111111111111199359&TranDate=20130623123059&CheckString=74f54b788565f291e65f67c606f90ca2
+    http_version:
+  recorded_at: Sun, 23 Jun 2013 03:30:59 GMT
+- request:
+    method: post
+    uri: https://<HOST>/payment/SaveMember.idPass
+    body:
+      encoding: UTF-8
+      string: MemberID=1371958259&MemberName=John+Smith&SiteID=<SITE_ID>&SitePass=<SITE_PASS>
+    headers:
+      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:
+      - Sun, 23 Jun 2013 03:30:59 GMT
+      Connection:
+      - close
+      Content-Type:
+      - text/plain;charset=Windows-31J
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: MemberID=1371958259
+    http_version:
+  recorded_at: Sun, 23 Jun 2013 03:30:59 GMT
+- request:
+    method: post
+    uri: https://<HOST>/payment/TradedCard.idPass
+    body:
+      encoding: UTF-8
+      string: OrderID=1371958258&MemberID=1371958259&ShopID=<SHOP_ID>&ShopPass=<SHOP_PASS>&SiteID=<SITE_ID>&SitePass=<SITE_PASS>
+    headers:
+      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:
+      - Sun, 23 Jun 2013 03:30:59 GMT
+      Connection:
+      - close
+      Content-Type:
+      - text/plain;charset=Windows-31J
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: CardSeq=0&CardNo=************1111&Forward=2a99662
+    http_version:
+  recorded_at: Sun, 23 Jun 2013 03:31:00 GMT
+recorded_with: VCR 2.4.0

data/lib/gmo.rb

@@ -1,6 +1,5 @@
 require 'cgi'
 require 'rack/utils'
-require 'multi_json'
 require 'nkf'
 
 require "gmo/const"
@@ -64,7 +63,7 @@ module GMO
       # gmo.post_request("EntryTran.idPass", {:foo => "bar"})
       # POST /EntryTran.idPass with params foo=bar
       def post_request(name, args = {}, options = {})
-        args = assciate_options_to_gmo_params args
+        args = associate_options_to_gmo_params args
         api_call(name, args, "post", options)
       end
       alias :post! :post_request
@@ -76,7 +75,7 @@ module GMO
           raise ArgumentError, "Required #{missing.join(', ')} were not provided." unless missing.empty?
         end
 
-        def assciate_options_to_gmo_params(options)
+        def associate_options_to_gmo_params(options)
           Hash[options.map { |k, v| [GMO::Const::INPUT_PARAMS[k], v] }]
         end
 

data/lib/gmo/http_services.rb

@@ -1,3 +1,5 @@
+require "gmo/json"
+
 module GMO
   class Response
 
@@ -49,7 +51,7 @@ module GMO
 
           def self.encode_params(param_hash)
             ((param_hash || {}).collect do |key_and_value|
-              key_and_value[1] = MultiJson.dump(key_and_value[1]) if key_and_value[1].class != String
+              key_and_value[1] = GMO::JSON.dump(key_and_value[1]) if key_and_value[1].class != String
               # converting to Shift-JIS
               sjis_value = NKF.nkf('-s', key_and_value[1])
               "#{key_and_value[0].to_s}=#{CGI.escape sjis_value}"

data/lib/gmo/json.rb

@@ -0,0 +1,14 @@
+require "multi_json"
+module GMO
+  module JSON
+
+    def self.dump(message)
+      if MultiJson.respond_to?(:dump)
+        MultiJson.dump(message)
+      else
+        MultiJson.encode(message)
+      end
+    end
+
+  end
+end

data/lib/gmo/site_api.rb

@@ -79,9 +79,8 @@ module GMO
       end
 
       ## 2.9.2.1.カード参照
-      # お客様が選択したカード登録連番のカード情報を取得します。
-      # カード情報が本人認証サービスに対応していない場合は、カード会社との通信を行い決済を実行します。その際の出力パラメータは「2.10.2.3決済実行」の出力パラメータと同じになります。
-      # /payment/ExecTran.idPass
+      # 指定した会員のカード情報を参照します。
+      # /payment/SearchCard.idPass
       def search_card(options = {})
         name = "SearchCard.idPass"
         required = [:member_id, :card_seq, :seq_mode]

data/lib/gmo/version.rb

@@ -1,3 +1,3 @@
 module GMO
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/gmo/json_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+describe "GMO::JSON" do
+
+  describe ".dump" do
+    it "should work" do
+      [
+        [
+          {:foo => {:bar => 'baz'}},
+          {'foo' => {'bar' => 'baz'}},
+        ],
+        [
+          [{:foo => {:bar => 'baz'}}],
+          [{'foo' => {'bar' => 'baz'}}],
+        ],
+        [
+          {:foo => [{:bar => 'baz'}]},
+          {'foo' => [{'bar' => 'baz'}]},
+        ],
+        [
+          {1 => {2 => {3 => 'bar'}}},
+          {'1' => {'2' => {'3' => 'bar'}}}
+        ]
+      ].each do |example, expected|
+        dumped_json = GMO::JSON.dump(example)
+        expect(MultiJson.load(dumped_json)).to eq expected
+      end
+    end
+  end
+
+end

data/spec/gmo/shop_and_site_api_spec.rb

@@ -10,6 +10,16 @@ describe "GMO::Payment::ShopAndSiteAPI" do
       :site_pass => SPEC_CONF["site_pass"],
       :host      => SPEC_CONF["host"]
     })
+    @shop_api ||= GMO::Payment::ShopAPI.new({
+      :shop_id   => SPEC_CONF["shop_id"],
+      :shop_pass => SPEC_CONF["shop_pass"],
+      :host      => SPEC_CONF["host"]
+    })
+    @site_api ||= GMO::Payment::SiteAPI.new({
+      :site_id   => SPEC_CONF["site_id"],
+      :site_pass => SPEC_CONF["site_pass"],
+      :host      => SPEC_CONF["host"]
+    })
   end
 
   it "should raise an ArgumentError if no options passed" do
@@ -40,6 +50,40 @@ describe "GMO::Payment::ShopAndSiteAPI" do
 
   describe "#trade_card" do
 
+    it "got data", :vcr do
+      order_id = generate_id
+      result = @shop_api.entry_tran({
+        :order_id => order_id,
+        :job_cd => "AUTH",
+        :amount => 100
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      card_no = "4111111111111111"
+      result = @shop_api.exec_tran({
+        :order_id      => order_id,
+        :access_id     => access_id,
+        :access_pass   => access_pass,
+        :method        => 1,
+        :pay_times     => 1,
+        :card_no       => card_no,
+        :expire        => "1405"
+      })
+      member_id = generate_id
+      member_name = "John Smith"
+      result = @site_api.save_member({
+        :member_id   => member_id,
+        :member_name => member_name
+      })
+      result = @service.trade_card({
+        :order_id      => order_id,
+        :member_id     => member_id
+      })
+      result["CardSeq"].nil?.should_not be_true
+      result["CardNo"].nil?.should_not be_true
+      result["Forward"].nil?.should_not be_true
+    end
+
     it "got error if missing options", :vcr do
       lambda {
         result = @service.trade_card()

data/spec/spec_helper.rb

@@ -5,7 +5,9 @@ rescue LoadError
 end
 # load the library
 require "simplecov"
-SimpleCov.start
+SimpleCov.start :test_frameworks do
+  add_filter "/vendor/bundle/"
+end
 require 'gmo'
 require 'rspec'
 require 'vcr'
@@ -13,6 +15,10 @@ 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

data/spec/support/encoding.rb

@@ -0,0 +1,33 @@
+require 'kconv'
+
+class String
+  @encoding = nil
+
+  def encoding
+    if @encoding != nil then
+      return @encoding
+    else
+      case Kconv.guess(self)
+      when Kconv::JIS
+        return "ISO-2022-JP"
+      when Kconv::SJIS
+        return "Shift_JIS"
+      when Kconv::EUC
+        return "EUC-JP"
+      when Kconv::ASCII
+        return "ASCII"
+      when Kconv::UTF8
+        return "UTF-8"
+      when Kconv::UTF16
+        return "UTF-16BE"
+      when Kconv::UNKNOWN
+        return nil
+      when Kconv::BINARY
+        return nil
+      else
+        return nil
+      end
+    end
+  end
+
+end

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: gmo
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - Tatsuo Kaniwa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   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: multi_json
   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
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby client library for the GMO Payment Platform.
@@ -116,6 +103,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -140,6 +128,7 @@ files:
 - fixtures/vcr_cassettes/GMO_Payment_ShopAPI/_search_trade_got_error_if_missing_options.yml
 - fixtures/vcr_cassettes/GMO_Payment_ShopAPI/_search_trade_multi_gets_data_about_order.yml
 - fixtures/vcr_cassettes/GMO_Payment_ShopAPI/_search_trade_multi_got_error_if_missing_options.yml
+- fixtures/vcr_cassettes/GMO_Payment_ShopAndSiteAPI/_trade_card_got_data.yml
 - fixtures/vcr_cassettes/GMO_Payment_ShopAndSiteAPI/_trade_card_got_error_if_missing_options.yml
 - fixtures/vcr_cassettes/GMO_Payment_SiteAPI/_delete_card_gets_data_about_a_card.yml
 - fixtures/vcr_cassettes/GMO_Payment_SiteAPI/_delete_member_gets_data_about_a_member.yml
@@ -153,6 +142,7 @@ files:
 - lib/gmo/const.rb
 - lib/gmo/errors.rb
 - lib/gmo/http_services.rb
+- lib/gmo/json.rb
 - lib/gmo/shop_and_site_api.rb
 - lib/gmo/shop_api.rb
 - lib/gmo/site_api.rb
@@ -160,6 +150,7 @@ files:
 - spec/gmo/api_spec.rb
 - spec/gmo/error_spec.rb
 - spec/gmo/http_service_spec.rb
+- spec/gmo/json_spec.rb
 - spec/gmo/shop_and_site_api_spec.rb
 - spec/gmo/shop_api_spec.rb
 - spec/gmo/site_api_spec.rb
@@ -167,12 +158,13 @@ files:
 - spec/support/config.example.yml
 - spec/support/config.yml
 - spec/support/config_loader.rb
+- spec/support/encoding.rb
 - spec/support/factory.rb
 - spec/support/vcr.rb
-- travis.yml
 homepage: https://github.com/t-k/gmo-payment-ruby
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -182,28 +174,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4347558908987678094
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4347558908987678094
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: ! 'GMO Payment API client: Ruby client library for the GMO Payment Platform.'
+specification_version: 4
+summary: 'GMO Payment API client: Ruby client library for the GMO Payment Platform.'
 test_files: []
 has_rdoc: