epay_tools 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deb853647418c084bd3c0ce9508e1652ca44b34e
-  data.tar.gz: 1973a1ddaf14c07f957f150be0c6a0d3d8588a75
+  metadata.gz: eece8069cc5fd1cf60d3fb09b4a3ffa96d2ffcfa
+  data.tar.gz: 6e53bdf67e10e95c0581a4eb5c66f177a4908474
 SHA512:
-  metadata.gz: e5b29cc63c9eacf996c301cb69703d0d0bb545e91c28ca0b7ae7e0992fde03ad76a30adec20c7cf1a5ad4a154a2cfd5548f2b6c24568ebbb90281bbd171c1fd3
-  data.tar.gz: e616ee15165fcd619d8ffc8a055943c1bd9bd2c2b542b44589b30f4a8f2ce38a9f04d3b0209f9b16181b8054df82d2e0a60bdff7502aba239c2f3723560ca2a6
+  metadata.gz: 2b8bf9a4a40ad00a8ad69673d35c169b2405b4a09b726e1de79438e382e48bcac3f6ec1ebd57aea24dd34603934cb576492811d9701f0c1f1a45ba366ee4c57d
+  data.tar.gz: 37fba46a9992a3e0ea3fa02b32e0172a5ebbb38ebf4572f097f5ef23c9c3086d9b6c36456c0d4f44bf2d46a23f28827e8811399bef6e678f4f608b7142a1c882

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/epay_tools.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: epay_tools 0.0.2 ruby lib
+# stub: epay_tools 0.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "epay_tools".freeze
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/lib/epay_tools/hash_generator.rb

@@ -1,18 +1,33 @@
 class EpayTools::HashGenerator < 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: hash)
+    ServicePattern::Response.new(result: calculate_hash)
   end
 
 private
 
-  def hash
-    Digest::MD5.hexdigest("#{params.values.join}#{epay_md5_key}")
+  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
   end
 end

data/spec/epay_tools/calculator_spec.rb

@@ -15,7 +15,7 @@ describe EpayTools::Calculator do
       "paymentcollection" => "1",
       "lockpaymentcollection" => "1",
       "subscription" => "0",
-      "hash" => "edc52b2b2f619551146682061d3a9d0d"
+      "hash" => "394b72dae2714e89222d30cf9a1d649b"
     }
   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 "edc52b2b2f619551146682061d3a9d0d"
+      expect(service.execute!.result.fetch(:epay_hash)).to eq "394b72dae2714e89222d30cf9a1d649b"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epay_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - kaspernj