aurfy 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd370b13b668a5a3ad75b2259835fcbf713162e6
-  data.tar.gz: 9b4fcedecb44992d5da07cb225bbe8f12fe08a3d
+  metadata.gz: 3fb2abdf9afc29c30e819f9903f01784c7121a94
+  data.tar.gz: 5b1dff193a71c2cf801bd372e17d8a20611cc374
 SHA512:
-  metadata.gz: 6f656da1218c81ea95a91cf6141305f178a26f2193f48b50a98680638669734752d7861ca9e095e1e38ab1572b8e3885a70c9482570aa5ff1b809a4a51584c1b
-  data.tar.gz: bd91ec61d956df7a990cb6c974d92c0b5dc327c74c447e10a5e61519a97121b232052495d01598ea701bb4b525b3262aae13d2b93045a12d184c54266c435e73
+  metadata.gz: a31e2a6f3cc3f2e227233c5ebadc1501cf7b654a07fca2973e9e9688b38f9e01084196c23f9a0b759e7f4fc5e6edab04c0e8022042165684bcd3196877b74243
+  data.tar.gz: 953856f3b875b80a412d61026d4440780dbe67492852c668dc3a128429f5d9f3acc5ad31b55d5a1ec56fb2dbb41b5173c0524fa2de1395f0e7915de6b48193d9

data/Gemfile

@@ -1,6 +1,11 @@
 source 'https://rubygems.org'
 
+group :development do
+  gem 'pry'
+end
+
 group :test do
+  gem 'rspec', '~> 3.0'
   gem 'simplecov', require: false
   gem "codeclimate-test-reporter", require: nil
 end

data/README.md

@@ -27,12 +27,15 @@ Usage
 ```rb
 require "aurfy"
 
-merchant_id       = "M000000000"
-trade_certificate = "D0123456789012345678901234567890"
+options = {
+  merchantid: "M000000000",
+  trade_certificate: "D0123456789012345678901234567890",
+  test: false
+}
 
-client = Aurfy::Client.new(merchant_id, trade_certificate)
+client = Aurfy::Client.new(options)
 
-client.request(
+client.purchase(
   cardnumber:  "0123456789012345",
   expirydate:  "1701",
   cv2:         "123",

data/aurfy.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($/)
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'credit_card_reader', '~> 0.0.0'
-  s.add_runtime_dependency 'faraday', '~> 0.9.0'
-  s.add_development_dependency "pry", "~> 0.10.0"
-  s.add_development_dependency 'rspec', '~> 3.0', '>= 3.0.0'
+  s.add_dependency "activesupport", "~> 4.2"
+  s.add_dependency 'credit_card_reader', '~> 0.0.4'
+  s.add_dependency 'faraday', '~> 0.9.0'
+  s.add_dependency "rack", "~> 1.6"
 end

data/lib/aurfy.rb

@@ -1,5 +1,8 @@
-require 'faraday'
+require 'active_support/core_ext/object'
+require 'active_support/core_ext/hash'
 require 'credit_card_reader'
+require 'faraday'
+require 'rack'
 
 require 'aurfy/client'
 require 'aurfy/configure'

data/lib/aurfy/client.rb

@@ -5,21 +5,17 @@ module Aurfy
   class Client
     attr_reader :api_url, :merchantid, :trade_certificate
 
-    def initialize(merchantid, trade_certificate, test = false)
-      @api_url = test ? TEST_API_URL : API_URL
-      @merchantid = merchantid
-      @trade_certificate = trade_certificate
+    def initialize(options = {})
+      @api_url = options[:test] ? TEST_API_URL : API_URL
+      @merchantid = options[:merchantid]
+      @trade_certificate = options[:trade_certificate]
     end
 
-    def request(options = {})
-      configure.options = options.merge(merchantid: merchantid, trade_certificate: trade_certificate)
+    def purchase(options = {})
+      configure = Configure.new(options.merge(merchantid: merchantid, trade_certificate: trade_certificate))
 
-      result = Faraday.post @api_url, configure.params
-      Response.new(result)
-    end
-
-    def configure
-      @configure ||= Configure.new
+      response = Faraday.post api_url, configure.params
+      Response.new(response)
     end
   end
 end

data/lib/aurfy/configure.rb

@@ -1,69 +1,64 @@
 module Aurfy
   class Configure
+    CREDIT_CARD_ORIGINAL_NAMES = { union_pay: "UP", visa: "VISA", jcb: "JCB", master: "MC" }
+
     def self.keys
-      [:merchantid, :orderid, :ordertime, :ordercurrency, :orderamount, :orderdescription, :txnremark1, :txnremark2,
-       :charset, :clientip, :version, :transtype, :website, :cardtype, :cardnumber, :cv2, :expirydate, :signmethod,
-       :trade_certificate]
+      [:cardnumber, :cardtype, :charset, :cv2, :expirydate, :orderamount, :ordercurrency, :orderdescription, :orderid,
+       :ordertime, :merchantid, :signmethod, :trade_certificate, :transtype, :txnremark1, :txnremark2, :version,
+       :website]
     end
 
-    def initialize
-      @charset          = "UTF-8"
-      @ordercurrency    = "USD"
-      @orderdescription = ""
-      @orderid          = DateTime.now.strftime("%Y%m%d%H%M%S%N")
-      @ordertime        = DateTime.now.strftime("%Y%m%d%H%M%S")
-      @signmethod       = "MD5"
-      @transtype        = "PURCHASE"
-      @txnremark1       = ""
-      @txnremark2       = ""
-      @version          = "1.0"
-      @website          = ""
+    def initialize(values = {})
+      Configure.keys.each do |key|
+        next unless value = (values[key] || default_values[key])
+        instance_variable_set(:"@#{key}", value)
+      end
+
+      @cardtype = values[:card_type] || cardtype
     end
 
     def params
-      sorted_variables.merge({ signature: signature })
+      sorted_variables.merge(signature: signature)
     end
 
-    def options=(options = {})
-      options.each_pair do |key, value|
-        next unless Configure.keys.include? key
-        instance_variable_set(:"@#{key}", value)
-      end
-      @cardtype ||= cardtype
-      options
+    def signature_key
+      sorted_variables.except(:signmethod).to_query + "&#{@trade_certificate}"
     end
 
     def sorted_variables
-      variables = instance_variables.map { |v| [v.to_s.sub("@", "").to_sym, instance_variable_get(v)] }
-      Hash[variables.delete_if { |k, _| k == :trade_certificate }.sort]
-    end
-
-    def signature_key
-      sorted_variables.delete_if { |k, _| k == :signmethod }.map {|p| "#{p.first}=#{p.last}" }.join("&") + "&#{@trade_certificate}"
+      variables = (instance_variables - [:@trade_certificate]).sort
+      Hash[variables.map { |v| [v.to_s.sub("@", "").to_sym, instance_variable_get(v)] }]
     end
 
     private
 
-    def signature
-      Digest::MD5.hexdigest(signature_key)
-    end
-
     def cardtype
-      credit_card = credit_card_detector.detect(@cardnumber)
-      case credit_card.brand
-      when :union_pay
-        "UP"
-      when :vise
-        "VISA"
-      when :jcb
-        "JCB"
-      when :master
-        "MC"
-      end
+      card_information = credit_card_detector.detect(@cardnumber)
+      CREDIT_CARD_ORIGINAL_NAMES[card_information.brand]
     end
 
     def credit_card_detector
       CreditCardReader::Detector.new
     end
+
+    def default_values
+      {
+        charset:          "UTF-8",
+        ordercurrency:    "USD",
+        orderdescription: "",
+        orderid:          DateTime.now.strftime("%Y%m%d%H%M%S%N"),
+        ordertime:        DateTime.now.strftime("%Y%m%d%H%M%S"),
+        signmethod:       "MD5",
+        transtype:        "PURCHASE",
+        txnremark1:       "",
+        txnremark2:       "",
+        version:          "1.0",
+        website:          ""
+      }
+    end
+
+    def signature
+      Digest::MD5.hexdigest(signature_key)
+    end
   end
 end

data/lib/aurfy/parser.rb

@@ -7,9 +7,7 @@ module Aurfy
     end
 
     def parse
-      params = body.split("&").map { |p| p.split("=") }
-      params = params.map { |p| p.length >= 2 ? p : p.push("") }
-      Hash[params].each_with_object({}) { |(k, v), a| a[k.to_s.to_sym] = v }
+      Rack::Utils.parse_nested_query(body).symbolize_keys
     end
   end
 end

data/lib/aurfy/response.rb

@@ -1,6 +1,6 @@
 module Aurfy
   class Response
-    attr_reader :result, :merchantid, :orderamount, :ordercurrency, :orderid, :ordertime, :respcode, :respmsg,
+    attr_reader :response, :merchantid, :orderamount, :ordercurrency, :orderid, :ordertime, :respcode, :respmsg,
                 :signature, :signmethod, :txnid, :txnremark1, :txnremark2, :txnstatus, :txntime
 
     def self.keys
@@ -8,15 +8,15 @@ module Aurfy
        :txnid, :txnremark1, :txnremark2, :txnstatus, :txntime]
     end
 
-    def initialize(result)
-      @result = result
+    def initialize(response)
+      @response = response
 
-      parsed_params = Parser.new(result.body).parse
+      parsed_params = Parser.new(response.body).parse
       assign_variables(parsed_params)
     end
 
     def success?
-      respcode == "00"
+      respcode === "00"
     end
 
     private

data/lib/aurfy/version.rb

@@ -1,6 +1,6 @@
 module Aurfy
-  MAJOR = 0
-  MINOR = 2
+  MAJOR = 1
+  MINOR = 0
   PATCH = 0
   VERSION = [MAJOR, MINOR, PATCH].join('.').freeze
 end

data/spec/aurfy/client_spec.rb

@@ -1,33 +1,33 @@
 require 'spec_helper'
 
 describe Aurfy::Client do
-  subject { described_class.new("merchant_id", "trade_certificate") }
+  let(:client) { described_class.new(merchantid: "merchant_id", trade_certificate: "trade_certificate") }
 
   describe "#initialize" do
     it "assigns parameters for payment" do
-      expect(subject.merchantid).to eq "merchant_id"
-      expect(subject.trade_certificate).to eq "trade_certificate"
-      expect(subject.api_url).to eq Aurfy::API_URL
+      expect(client.merchantid).to eq "merchant_id"
+      expect(client.trade_certificate).to eq "trade_certificate"
+      expect(client.api_url).to eq Aurfy::API_URL
     end
 
     context "with test argumaent" do
-      subject { described_class.new("merchant_id", "trade_certificate", true) }
+      let(:client) { described_class.new(merchantid: "merchant_id", trade_certificate: "trade_certificate", test: true) }
 
       it "assigns parameters for payment" do
-        expect(subject.merchantid).to eq "merchant_id"
-        expect(subject.trade_certificate).to eq "trade_certificate"
-        expect(subject.api_url).to eq Aurfy::TEST_API_URL
+        expect(client.merchantid).to eq "merchant_id"
+        expect(client.trade_certificate).to eq "trade_certificate"
+        expect(client.api_url).to eq Aurfy::TEST_API_URL
       end
     end
   end
 
-  describe "#request" do
+  describe "#purchase" do
     context "with valid credit card" do
       it "returns successful Aurfy::Response instance" do
         response = double(Faraday::Response, body: "merchantid=M000000000&orderamount=600.00&ordercurrency=USD&orderid=20150429115552415102000&ordertime=20150429115552&respcode=00&respmsg=The payment is successful.&signature=d2c4c43a7b2447d512ee3ef3c33754f4&signmethod=MD5&txnid=21150428000000006409&txnremark1=&txnremark2=&txnstatus=0&txntime=")
         allow_any_instance_of(Faraday).to receive(:post) { response }
 
-        expect(subject.request).to be_a Aurfy::Response
+        expect(client.purchase).to be_a Aurfy::Response
       end
     end
   end

data/spec/aurfy/configure_spec.rb

@@ -1,13 +1,18 @@
 require 'spec_helper'
 
 describe Aurfy::Configure do
-  subject { described_class.new }
+  let(:configure) { described_class.new }
+
+  it "returns CREDIT_CARD_ORIGINAL_NAMES hash" do
+    hash = { union_pay: "UP", visa: "VISA", jcb: "JCB", master: "MC" }
+    expect(described_class::CREDIT_CARD_ORIGINAL_NAMES).to eq hash
+  end
 
   describe ".keys" do
     it "returns configure keys" do
-      keys =  [:merchantid, :orderid, :ordertime, :ordercurrency, :orderamount, :orderdescription, :txnremark1,
-               :txnremark2, :charset, :clientip, :version, :transtype, :website, :cardtype, :cardnumber, :cv2,
-               :expirydate, :signmethod, :trade_certificate]
+     keys = [:cardnumber, :cardtype, :charset, :cv2, :expirydate, :orderamount, :ordercurrency, :orderdescription, :orderid,
+             :ordertime, :merchantid, :signmethod, :trade_certificate, :transtype, :txnremark1, :txnremark2, :version,
+             :website]
 
       expect(described_class.keys).to eq keys
     end
@@ -15,40 +20,33 @@ describe Aurfy::Configure do
 
   describe "#params" do
     it "returns configure params" do
-      allow(subject).to receive(:sorted_variables) { {} }
-      allow(subject).to receive(:signature) { "signature" }
-
-      expect(subject.params).to eq({ signature: "signature" })
-    end
-  end
+      allow(configure).to receive(:sorted_variables) { {} }
+      allow(configure).to receive(:signature) { "signature" }
 
-  describe "#options=" do
-    it "assigns variable for option" do
-      expect do
-        subject.options = { merchantid: "merchantid" }
-      end.to change { subject.instance_variable_get(:"@merchantid") } .from(nil).to("merchantid")
+      expect(configure.params).to eq({ signature: "signature" })
     end
   end
 
   describe "#sorted_variables" do
     it "returns sorted instance variables" do
-      subject.options = { trade_certificate: "test", cardnumber: "6200123456789012", orderid: "orderid",
-                          ordertime: "20150429124533" }
+      configure = described_class.new(trade_certificate: "test", cardnumber: "6200123456789012", orderid: "orderid",
+                                       ordertime: "20150429124533")
       sorted_variables = { cardnumber: "6200123456789012", cardtype: "UP", charset: "UTF-8", ordercurrency: "USD",
                            orderdescription: "", orderid: "orderid", ordertime: "20150429124533", signmethod: "MD5",
                            transtype: "PURCHASE", txnremark1: "", txnremark2: "", version: "1.0", website: "" }
 
-      expect(subject.sorted_variables).to eq(sorted_variables)
+      expect(configure.sorted_variables).to eq(sorted_variables)
     end
   end
 
   describe "#signature_key" do
     it "returns sorted instance variables" do
-      subject.options = { cardnumber: "6200123456789012", signmethod: "MD5", trade_certificate: "trade_certificate", orderid: "orderid",
-                          ordertime: "20150429124533" }
+      configure = described_class.new(cardnumber: "6200123456789012", signmethod: "MD5",
+                                      trade_certificate: "trade_certificate", orderid: "orderid",
+                                      ordertime: "20150429124533")
       signature_key = "cardnumber=6200123456789012&cardtype=UP&charset=UTF-8&ordercurrency=USD&orderdescription=&orderid=orderid&ordertime=20150429124533&transtype=PURCHASE&txnremark1=&txnremark2=&version=1.0&website=&trade_certificate"
 
-      expect(subject.signature_key).to eq(signature_key)
+      expect(configure.signature_key).to eq(signature_key)
     end
   end
 end

data/spec/aurfy/parser_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Aurfy::Parser do
-  subject { described_class.new(body) }
+  let(:parser) { described_class.new(body) }
   let(:body) { "merchantid=M000000000&orderamount=600.00&ordercurrency=USD&orderid=20150429115552415102000&ordertime=20150429115552&respcode=00&respmsg=The payment is successful.&signature=d2c4c43a7b2447d512ee3ef3c33754f4&signmethod=MD5&txnid=21150428000000006409&txnremark1=&txnremark2=&txnstatus=0&txntime=" }
 
   describe "#parse" do
@@ -12,7 +12,7 @@ describe Aurfy::Parser do
                         signmethod: "MD5", txnid: "21150428000000006409", txnremark1: "", txnremark2: "",
                         txnstatus: "0", txntime: "" }
 
-      expect(subject.parse).to eq parsed_params
+      expect(parser.parse).to eq parsed_params
     end
   end
 end

data/spec/aurfy/response_spec.rb

@@ -1,25 +1,25 @@
 require 'spec_helper'
 
 describe Aurfy::Response do
-  subject { described_class.new(result) }
+  let(:response) { described_class.new(result) }
 
   let(:result) { double(Faraday::Response, body: "merchantid=M000000000&orderamount=600.00&ordercurrency=USD&orderid=20150429115552415102000&ordertime=20150429115552&respcode=00&respmsg=The payment is successful.&signature=d2c4c43a7b2447d512ee3ef3c33754f4&signmethod=MD5&txnid=21150428000000006409&txnremark1=&txnremark2=&txnstatus=0&txntime=") }
 
   it "assigns params" do
-    expect(subject.merchantid).to    eq "M000000000"
-    expect(subject.orderamount).to   eq "600.00"
-    expect(subject.ordercurrency).to eq "USD"
-    expect(subject.orderid).to       eq "20150429115552415102000"
-    expect(subject.ordertime).to     eq "20150429115552"
-    expect(subject.respcode).to      eq "00"
-    expect(subject.respmsg).to       eq "The payment is successful."
-    expect(subject.signature).to     eq "d2c4c43a7b2447d512ee3ef3c33754f4"
-    expect(subject.signmethod).to    eq "MD5"
-    expect(subject.txnid).to         eq "21150428000000006409"
-    expect(subject.txnremark1).to    eq ""
-    expect(subject.txnremark2).to    eq ""
-    expect(subject.txnstatus).to     eq "0"
-    expect(subject.txntime).to       eq ""
+    expect(response.merchantid).to    eq "M000000000"
+    expect(response.orderamount).to   eq "600.00"
+    expect(response.ordercurrency).to eq "USD"
+    expect(response.orderid).to       eq "20150429115552415102000"
+    expect(response.ordertime).to     eq "20150429115552"
+    expect(response.respcode).to      eq "00"
+    expect(response.respmsg).to       eq "The payment is successful."
+    expect(response.signature).to     eq "d2c4c43a7b2447d512ee3ef3c33754f4"
+    expect(response.signmethod).to    eq "MD5"
+    expect(response.txnid).to         eq "21150428000000006409"
+    expect(response.txnremark1).to    eq ""
+    expect(response.txnremark2).to    eq ""
+    expect(response.txnstatus).to     eq "0"
+    expect(response.txntime).to       eq ""
   end
 
   describe ".keys" do
@@ -34,7 +34,7 @@ describe Aurfy::Response do
   describe "#success?" do
     context "with successful result" do
       it "returns true" do
-        expect(subject.success?).to be_truthy
+        expect(response.success?).to be_truthy
       end
     end
 
@@ -42,7 +42,7 @@ describe Aurfy::Response do
       let(:result) { double(Faraday::Response, body: "merchantid=M000000000&orderamount=600.00&ordercurrency=USD&orderid=20150429115552415102000&ordertime=20150429115552&respcode=97&respmsg=Internal error.&signature=d2c4c43a7b2447d512ee3ef3c33754f4&signmethod=MD5&txnid=21150428000000006409&txnremark1=&txnremark2=&txnstatus=0&txntime=") }
 
       it "returns false" do
-        expect(subject.success?).to be_falsey
+        expect(response.success?).to be_falsey
       end
     end
   end

metadata

@@ -1,77 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: aurfy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Masahiro Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: credit_card_reader
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: credit_card_reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :development
+        version: 0.9.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
+        version: '1.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.6'
 description: Ruby client for Aurfy
 email:
 - camelmasa@gmail.com