epay_tools 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86a7d1fe9a1ab192dac56eda9de0603d138ef6fb
-  data.tar.gz: '009453ed0b480464cbb884fa4059c52195b1413c'
+  metadata.gz: deb853647418c084bd3c0ce9508e1652ca44b34e
+  data.tar.gz: 1973a1ddaf14c07f957f150be0c6a0d3d8588a75
 SHA512:
-  metadata.gz: 58121ca27e808864e2e140082c306d855b3575dd88381fc4d4d0d515907cb914f3515d65e2ea75e5742fb7370fb1306a0e3291a0ac9f34e57c1dd8b33a7443d4
-  data.tar.gz: 75b38dca8fde59b2de0628d108a7416e8b2fb14af96a5c8c3f58a8aee5c0b4a4f0c01030c60323f449e4dbc0c4a22cf32448071c9614135684cb24a181f9dbe6
+  metadata.gz: e5b29cc63c9eacf996c301cb69703d0d0bb545e91c28ca0b7ae7e0992fde03ad76a30adec20c7cf1a5ad4a154a2cfd5548f2b6c24568ebbb90281bbd171c1fd3
+  data.tar.gz: e616ee15165fcd619d8ffc8a055943c1bd9bd2c2b542b44589b30f4a8f2ce38a9f04d3b0209f9b16181b8054df82d2e0a60bdff7502aba239c2f3723560ca2a6

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

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.1 ruby lib
+# stub: epay_tools 0.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "epay_tools".freeze
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -30,11 +30,11 @@ Gem::Specification.new do |s|
     "VERSION",
     "epay_tools.gemspec",
     "lib/epay_tools.rb",
-    "lib/epay_tools/hash_calculator_service.rb",
+    "lib/epay_tools/calculator.rb",
+    "lib/epay_tools/hash_generator.rb",
     "lib/epay_tools/ordered_parameters.rb",
-    "lib/epay_tools/params_generator_service.rb",
     "shippable.yml",
-    "spec/epay_tools/hash_calculator_service_spec.rb",
+    "spec/epay_tools/calculator_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/kaspernj/epay_tools".freeze

data/lib/epay_tools/{params_generator_service.rb → calculator.rb}

@@ -1,4 +1,4 @@
-class EpayTools::ParamsGeneratorService < ServicePattern::Service
+class EpayTools::Calculator < ServicePattern::Service
   attr_reader :epay_merchant_number, :epay_md5_key, :params
 
   def initialize(epay_md5_key:, params:)
@@ -12,7 +12,7 @@ class EpayTools::ParamsGeneratorService < ServicePattern::Service
       epay_params[ordered_parameter] = params.fetch(ordered_parameter)
     end
 
-    epay_hash = Digest::MD5.hexdigest("#{epay_params.values.join}#{epay_md5_key}")
+    epay_hash = EpayTools::HashGenerator.execute!(epay_md5_key: epay_md5_key, params: epay_params).result
     epay_params_with_hash = epay_params.merge("hash" => epay_hash)
 
     ServicePattern::Response.new(

data/lib/epay_tools/hash_generator.rb

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

data/spec/epay_tools/{hash_calculator_service_spec.rb → calculator_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe EpayTools::HashCalculatorService do
+describe EpayTools::Calculator do
   let(:epay_parameters) do
     {
       "merchantnumber" => "123123",
@@ -19,21 +19,15 @@ describe EpayTools::HashCalculatorService do
     }
   end
   let(:service) do
-    EpayTools::HashCalculatorService.new(
+    EpayTools::Calculator.new(
       epay_md5_key: "secret-md5-key",
-      query_parameters: epay_parameters
+      params: epay_parameters
     )
   end
 
   describe "#calculated_hash" do
     it "calculates the right hash" do
-      expect(service.__send__(:calculated_hash)).to eq "edc52b2b2f619551146682061d3a9d0d"
-    end
-  end
-
-  describe "#validated?" do
-    it "returns true when the hash is right" do
-      expect(service.__send__(:validated?)).to eq true
+      expect(service.execute!.result.fetch(:epay_hash)).to eq "edc52b2b2f619551146682061d3a9d0d"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epay_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - kaspernj
@@ -127,11 +127,11 @@ files:
 - VERSION
 - epay_tools.gemspec
 - lib/epay_tools.rb
-- lib/epay_tools/hash_calculator_service.rb
+- lib/epay_tools/calculator.rb
+- lib/epay_tools/hash_generator.rb
 - lib/epay_tools/ordered_parameters.rb
-- lib/epay_tools/params_generator_service.rb
 - shippable.yml
-- spec/epay_tools/hash_calculator_service_spec.rb
+- spec/epay_tools/calculator_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/kaspernj/epay_tools
 licenses:

data/lib/epay_tools/hash_calculator_service.rb

@@ -1,39 +0,0 @@
-class EpayTools::HashCalculatorService < ServicePattern::Service
-  attr_reader :query_parameters, :epay_md5_key
-
-  def initialize(query_parameters:, epay_md5_key:)
-    @query_parameters = query_parameters
-    @epay_md5_key = epay_md5_key
-  end
-
-  def execute!
-    ServicePattern::Response.new(
-      result: {
-        calculated_hash: calculated_hash,
-        validated: validated?
-      }
-    )
-  end
-
-private
-
-  def calculated_hash
-    @_calculated_hash ||= Digest::MD5.hexdigest("#{parameters_to_use.values.join}#{epay_md5_key}")
-  end
-
-  def parameters_to_use
-    parameters = {}
-
-    EpayTools::OrderedParameters::ORDERED_PARAMETERS.each do |ordered_parameter|
-      parameters[ordered_parameter] = query_parameters.fetch(ordered_parameter)
-    end
-
-    parameters
-  end
-
-  def validated?
-    return false unless query_parameters.key?("hash")
-    return true if calculated_hash == query_parameters.fetch("hash")
-    false
-  end
-end