allpay 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b3a0957cdad73d9724b4d7106ba3f8124e14dd3
-  data.tar.gz: 43b9aeec0c8649e309f7b54ecd36a4a35c90b853
+  metadata.gz: 4ad2949ec1d520b6c53ec6ef0216bd5c27a9f6f6
+  data.tar.gz: 53a05c5ff488e4e977d426099d311b9fc6795845
 SHA512:
-  metadata.gz: cccf241c5d0c56716d7d57a4cebb83e449906f66a5fcb2068e9a35e67d77e8a78846018f15a06ab7c5c56dad4896d17b33c9af8844f3b61e28e46a7143a3345c
-  data.tar.gz: f2153042784c7a9d194b7152f39b83599a66a93ff4b966e1e015642372823a51065da23112e27b04c3e22907141fef8f9b82e8fcdfb6bb765738197bb4236f96
+  metadata.gz: 0bc82207a82d45b7e703ab6aea65ef8ab012b3acc95b6e263d88e342415d91d14bda7c0b83e7b6a300a353445ecdd4c06f2faceb3307e02ae7b772e6a9a0a1ec
+  data.tar.gz: 6af50f7de0741062167ce0f09c3db56ae9a3cecb388632f95bbeb3f7ab2dcf7ef5d31e8e28792ec2affca480fd0b6bcd1051e20a154126e09391a1c68235c757

data/allpay.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_runtime_dependency 'nori', '~> 2.4.0'
+  spec.add_development_dependency "rake", '~> 0'
+  spec.add_runtime_dependency 'nori', '~> 2.4.0', '>= 2.4.0'
   spec.add_runtime_dependency 'gyoku', '~> 1.0'
-  spec.add_runtime_dependency 'addressable', '~> 2.3.6'
+  spec.add_runtime_dependency 'addressable', '~> 2.3.6', '>= 2.3.6'
 end

data/lib/allpay.rb

@@ -31,7 +31,7 @@ module Allpay
 
     def get_vaccount(options = {})
       has_key?
-      enc_data = encrypt_data(@key, @iv, {
+      enc_data = Client.encrypt_data(@key, @iv, {
         'MerchantID' => merchant_id,
         'MerchantTradeNo' => options[:merchant_trade_no] ||  SecureRandom.hex(10),
         'MerchantTradeDate' => options[:merchant_trade_date] || Time.now.strftime('%Y/%m/%d %H:%M:%S'),
@@ -43,7 +43,7 @@ module Allpay
       })
 
       begin
-        result = parse_xml(get('/payment/Srv/gateway', {"MerchantID" => merchant_id, "PaymentType" => "vAccount", "XMLData" => enc_data}))
+        result = Client.parse_xml(get('/payment/Srv/gateway', {"MerchantID" => merchant_id, "PaymentType" => "vAccount", "XMLData" => enc_data}))
       rescue => e
         response = e
       end
@@ -53,11 +53,29 @@ module Allpay
 
     def get_vaccount_callback(xmldata)
       has_key?
-      result = parse_xml(decrypt_data(@key, @iv, xmldata))
+      result = Client.decrypt_data(@key, @iv, xmldata)
       [result["RtnCode"].to_i, result]
     end
 
+    def self.decrypt_data(key, iv, data)
+      cipher = OpenSSL::Cipher::AES128.new(:CBC).decrypt
+      cipher.key = key
+      cipher.iv = iv
+      Client.parse_xml(cipher.update(Base64.decode64(data.gsub(" ","+"))) + cipher.final)
+    end
 
+    def self.encrypt_data(key, iv, data)
+      data = Gyoku.xml({"Root" => { "Data" => data}})
+      cipher = OpenSSL::Cipher::AES128.new(:CBC).encrypt
+      cipher.key = key
+      cipher.iv = iv
+
+      Base64.encode64(cipher.update(data) + cipher.final).gsub("\n","")
+    end
+
+    def self.parse_xml(data)
+      Nori.new.parse(data)["Root"]["Data"]
+    end
     private
 
     def has_key?
@@ -72,24 +90,5 @@ module Allpay
       open("http://#{api}/#{path}?#{uri.query}").read
     end
 
-    def encrypt_data(key, iv, data)
-      data = Gyoku.xml({"Root" => { "Data" => data}})
-      cipher = OpenSSL::Cipher::AES128.new(:CBC).encrypt
-      cipher.key = key
-      cipher.iv = iv
-
-      Base64.encode64(cipher.update(data) + cipher.final).gsub("\n","")
-    end
-
-    def decrypt_data(key, iv, data)
-      cipher = OpenSSL::Cipher::AES128.new(:CBC).decrypt
-      cipher.key = key
-      cipher.iv = iv
-      cipher.update(Base64.decode64(data.gsub(" ","+"))) + cipher.final
-    end
-
-    def parse_xml(data)
-      Nori.new.parse(data)["Root"]["Data"]
-    end
   end
 end

data/lib/allpay/version.rb

@@ -1,3 +1,3 @@
 module Allpay
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: allpay
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - odin1in
@@ -28,14 +28,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: gyoku
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +79,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.6
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +89,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.6
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.6
 description: Allpay vAccount API
 email:
 - odin@pwn.so