epay_tools 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eece8069cc5fd1cf60d3fb09b4a3ffa96d2ffcfa
-  data.tar.gz: 6e53bdf67e10e95c0581a4eb5c66f177a4908474
+  metadata.gz: 9dfa9cd9c51b7fbe096c1942a5a39ceb4666f768
+  data.tar.gz: 01d88f9861e2330d0ab71ab20fb6333185fe377f
 SHA512:
-  metadata.gz: 2b8bf9a4a40ad00a8ad69673d35c169b2405b4a09b726e1de79438e382e48bcac3f6ec1ebd57aea24dd34603934cb576492811d9701f0c1f1a45ba366ee4c57d
-  data.tar.gz: 37fba46a9992a3e0ea3fa02b32e0172a5ebbb38ebf4572f097f5ef23c9c3086d9b6c36456c0d4f44bf2d46a23f28827e8811399bef6e678f4f608b7142a1c882
+  metadata.gz: 5910bd58e73557819e5ec1e26454b97ba9be5175d88f7fda0a5c9b0f0363d40d19e65f860f5452f93cd90e6df0d61fee37fb5d679cf3df77a213cfcd0d504bac
+  data.tar.gz: 18802c985717d5defb607cee3b6d3667390080c2ccc858c1be3a6735841fbf8b6577be5084d4bb57e63f0dbaf4fd3c89d8a4b26cec53dd729d8a9448b3881a1d

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/epay_tools/hash_generator.rb

@@ -15,19 +15,7 @@ class EpayTools::HashGenerator < ServicePattern::Service
 private
 
   def calculate_hash
-    @_calculate_hash ||= Digest::MD5.hexdigest("#{params_values.join}#{epay_md5_key}")
-  end
-
-  def params_values
-    unless @_params_values
-      @_params_values = {}
-      KEYS_ORDER.each do |key|
-        @_params_values[key] = params.delete(key) if params.key?(key)
-      end
-
-      @_params_values.merge!(params)
-    end
-
-    @_params_values.values
+    require "digest/md5"
+    @_calculate_hash ||= Digest::MD5.hexdigest("#{params.values.join}#{epay_md5_key}")
   end
 end

data/lib/epay_tools/response_hash_generator.rb

@@ -0,0 +1,25 @@
+class EpayTools::ResponseHashGenerator < ServicePattern::Service
+  attr_reader :epay_md5_key, :params
+
+  KEYS_ORDER = %w[txnid orderid amount currency date time txnfee paymenttype cardno hash].freeze
+
+  def initialize(epay_md5_key:, params:)
+    @epay_md5_key = epay_md5_key
+    @params = params.reject { |key, _value| key.to_s == "hash" }
+  end
+
+  def execute!
+    ServicePattern::Response.new(result: EpayTools::HashGenerator.execute!(epay_md5_key: epay_md5_key, params: ordered_params).result)
+  end
+
+private
+
+  def ordered_params
+    result = {}
+    KEYS_ORDER.each do |key|
+      result[key] = params.delete(key) if params.key?(key)
+    end
+
+    result.merge(params)
+  end
+end

data/spec/epay_tools/calculator_spec.rb

@@ -15,7 +15,7 @@ describe EpayTools::Calculator do
       "paymentcollection" => "1",
       "lockpaymentcollection" => "1",
       "subscription" => "0",
-      "hash" => "394b72dae2714e89222d30cf9a1d649b"
+      "hash" => "edc52b2b2f619551146682061d3a9d0d"
     }
   end
   let(:service) do
@@ -27,7 +27,7 @@ describe EpayTools::Calculator do
 
   describe "#calculated_hash" do
     it "calculates the right hash" do
-      expect(service.execute!.result.fetch(:epay_hash)).to eq "394b72dae2714e89222d30cf9a1d649b"
+      expect(service.execute!.result.fetch(:epay_hash)).to eq "edc52b2b2f619551146682061d3a9d0d"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epay_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-02 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: auto_autoloader
@@ -130,6 +130,7 @@ files:
 - lib/epay_tools/calculator.rb
 - lib/epay_tools/hash_generator.rb
 - lib/epay_tools/ordered_parameters.rb
+- lib/epay_tools/response_hash_generator.rb
 - shippable.yml
 - spec/epay_tools/calculator_spec.rb
 - spec/spec_helper.rb
@@ -153,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Tools to implement the ePay payment gateway