RubyGems - rubyqrpay - Versions diffs - 0.2.4 → 0.4.0 - Mend

rubyqrpay 0.2.4 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c8de27ac41804545d5917fb2ca8a2bcc234f7502
-  data.tar.gz: b72391652d3b833584d8bdb4dd982168a9e4293d
+SHA256:
+  metadata.gz: 6568b667fea703ecbd844f2ec00efb3669f90d51ff8ef84d8bc0d1c4099ccb62
+  data.tar.gz: fe647c46f76488729a7136fbb4fd424e1ff56764bae2a84210c514a82130df6a
 SHA512:
-  metadata.gz: 20413b9eb56998f7109f6dbf6284ec711de3fbff7ca9858275bfefb3aceb1a3e56e2028017f76419520ef8305ed93c8be9c441b8e4176348dd0240223a8c4c42
-  data.tar.gz: 549a007302255ec9241f33c4a16b68c8faf8191b4c6ea1af8068da1ed00b0242e23d5aac8995c467b781bf7d71512c21c6f30f76f4b3768ddf7ad12285063284
+  metadata.gz: e075989dba20913f357190935e9575ea13bd631a430c17e174a2140f8e75d0552e83a676067b7036be3ee600bd2799d61aec7562cda0d6ea116b7d62e0c0ce3e
+  data.tar.gz: 45a43146bdeb637b15fa354d44800fed9c60e1a45ba310c06274a43a37156f1065dd9b2466f9bd869d7fe37745469a17abc02f990d6391a684673eed7b8d398b

data/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubyqrpay (0.2.4)
+    rubyqrpay (0.3.0)
       countries (~> 2.1)
       digest-crc (~> 0.4)
       dry-validation (~> 0.11)
@@ -95,4 +95,4 @@ DEPENDENCIES
   rubyqrpay!
 BUNDLED WITH
-   1.16.2
+   1.17.3

data/lib/rubyqrpay.rb CHANGED Viewed

	@@ -1 +1,2 @@
1 1	require_relative 'rubyqrpay/generator'
2	+ require_relative 'rubyqrpay/parser'

data/lib/rubyqrpay/constants.rb CHANGED Viewed

@@ -1,61 +1,59 @@
 module Rubyqrpay
-  class Generator
-    ID_PAYLOAD_FORMAT = '00'
-    ID_POI_METHOD = '01'
-    ID_MERCHANT_INFORMATION_32 = '32'
-    ID_MERCHANT_INFORMATION_33 = '33'
-    ID_MERCHANT_CATEGORY_CODE = '52'
-    ID_TRANSACTION_CURRENCY = '53'
-    ID_TRANSACTION_AMOUNT = '54'
-    ID_TIP_OF_CONVENIENCE_INDICATOR = '55'
-    ID_VALUE_OF_CONVENIENCE_FEE_FIXED = '56'
-    ID_VALUE_OF_CONVENIENCE_FEE_PERCENTAGE = '57'
-    ID_COUNTRY = '58'
-    ID_MERCHANT_NAME = '59'
-    ID_MERCHANT_CITY = '60'
-    ID_POSTAL_CODE = '61'
-    ID_ADDITIONAL_DATA_FIELD = '62'
-    ID_MERCHANT_INFORMATION_LANGUAGE = '64'
-    ID_CRC = '63'
+  ID_PAYLOAD_FORMAT = '00'
+  ID_POI_METHOD = '01'
+  ID_MERCHANT_INFORMATION_32 = '32'
+  ID_MERCHANT_INFORMATION_33 = '33'
+  ID_MERCHANT_CATEGORY_CODE = '52'
+  ID_TRANSACTION_CURRENCY = '53'
+  ID_TRANSACTION_AMOUNT = '54'
+  ID_TIP_OF_CONVENIENCE_INDICATOR = '55'
+  ID_VALUE_OF_CONVENIENCE_FEE_FIXED = '56'
+  ID_VALUE_OF_CONVENIENCE_FEE_PERCENTAGE = '57'
+  ID_COUNTRY = '58'
+  ID_MERCHANT_NAME = '59'
+  ID_MERCHANT_CITY = '60'
+  ID_POSTAL_CODE = '61'
+  ID_ADDITIONAL_DATA_FIELD = '62'
+  ID_MERCHANT_INFORMATION_LANGUAGE = '64'
+  ID_CRC = '63'
-    PAYLOAD_FORMAT_EMV_QRCPS_MERCHANT_PRESENTED_MODE = '01'
-    POI_METHOD_STATIC = '11'
-    POI_METHOD_DYNAMIC = '12'
-    CONVENIENCE_INDICATOR_FIXED = '02'
-    CONVENIENCE_INDICATOR_PERCENTAGE = '03'
-    MERCHANT_INFORMATION_TEMPLATE_ID_GUID = '00'
-    # ID_MERCHANT_INFORMATION_32
-    ID_SERVICE_CODE_ERIP = '01'
-    ID_PAYER_UNIQUE = '10'
-    ID_PAYER_NUMBER = '11'
-    ID_AMOUNT_EDIT_POSSIBILITY = '12'
-    # ID_MERCHANT_INFORMATION_33
-    ID_SERVICE_PRODUCER_CODE = '03'
-    ID_SERVICE_CODE = '04'
-    ID_OUTLET = '05'
-    ID_ORDER_CODE = '06'
-    # ID_ADDITIONAL_DATA_FIELD
-    ID_BILL_NUMBER = '01'
-    ID_MOBILE_NUMBER = '02'
-    ID_STORE_LABEL = '03'
-    ID_LOYALTY_NUMBER = '04'
-    ID_REFERENCE_LABEL = '05'
-    ID_CUSTOMER_LABEL = '06'
-    ID_TERMINAL_LABEL = '07'
-    ID_PURPOSE_OF_TRANSACTION = '08'
-    ID_CONSUMER_DATA_REQUEST = '09'
-    # ID_MERCHANT_INFORMATION_LANGUAGE
-    ID_LANGUAGE_REFERENCE = '00'
-    ID_MERCHANT_NAME_ALTERNATE = '01'
-    ID_MERCHANT_CITY_ALTERNATE = '02'
+  PAYLOAD_FORMAT_EMV_QRCPS_MERCHANT_PRESENTED_MODE = '01'
+  POI_METHOD_STATIC = '11'
+  POI_METHOD_DYNAMIC = '12'
+  CONVENIENCE_INDICATOR_FIXED = '02'
+  CONVENIENCE_INDICATOR_PERCENTAGE = '03'
+  MERCHANT_INFORMATION_TEMPLATE_ID_GUID = '00'
+  # ID_MERCHANT_INFORMATION_32
+  ID_SERVICE_CODE_ERIP = '01'
+  ID_PAYER_UNIQUE = '10'
+  ID_PAYER_NUMBER = '11'
+  ID_AMOUNT_EDIT_POSSIBILITY = '12'
+  # ID_MERCHANT_INFORMATION_33
+  ID_SERVICE_PRODUCER_CODE = '03'
+  ID_SERVICE_CODE = '04'
+  ID_OUTLET = '05'
+  ID_ORDER_CODE = '06'
+  # ID_ADDITIONAL_DATA_FIELD
+  ID_BILL_NUMBER = '01'
+  ID_MOBILE_NUMBER = '02'
+  ID_STORE_LABEL = '03'
+  ID_LOYALTY_NUMBER = '04'
+  ID_REFERENCE_LABEL = '05'
+  ID_CUSTOMER_LABEL = '06'
+  ID_TERMINAL_LABEL = '07'
+  ID_PURPOSE_OF_TRANSACTION = '08'
+  ID_CONSUMER_DATA_REQUEST = '09'
+  # ID_MERCHANT_INFORMATION_LANGUAGE
+  ID_LANGUAGE_REFERENCE = '00'
+  ID_MERCHANT_NAME_ALTERNATE = '01'
+  ID_MERCHANT_CITY_ALTERNATE = '02'
-    GUID_PROMPTPAY_32 = 'by.raschet'
-    GUID_PROMPTPAY_33 = 'by.epos.'
-    CRC_SYMBOL_SIZE = '04'
-    AEP_DEFAULT = '11'
-    AEP_FALSE = '12'
+  GUID_PROMPTPAY_32 = 'by.raschet'
+  GUID_PROMPTPAY_33 = 'by.epos.'
+  CRC_SYMBOL_SIZE = '04'
+  AEP_DEFAULT = '11'
+  AEP_FALSE = '12'
-    K_SIZE_FUNC = 0.15
-    B_SIZE_FUNC = 140
-    end
+  K_SIZE_FUNC = 0.15
+  B_SIZE_FUNC = 140
 end

data/lib/rubyqrpay/generator.rb CHANGED Viewed

@@ -50,7 +50,7 @@ module Rubyqrpay
         ID_MERCHANT_CATEGORY_CODE        => mcc_format(opts[:merchant_category_code]),
         ID_TRANSACTION_CURRENCY          => opts[:currency],
         ID_TRANSACTION_AMOUNT            => format_amount(opts[:amount]),
-        ID_TIP_OF_CONVENIENCE_INDICATOR  => opts[:convenience_indicator],
+        ID_TIP_OF_CONVENIENCE_INDICATOR  => format_indicator(opts[:convenience_indicator]),
         ID_COUNTRY                       => opts[:country],
         ID_MERCHANT_NAME                 => opts[:merchant_name],
         ID_MERCHANT_CITY                 => opts[:merchant_city],
@@ -156,10 +156,14 @@ module Rubyqrpay
     end
     def self.crc(data)
-      data += ID_CRC + CRC_SYMBOL_SIZE
-      x = Digest::CRC16CCITT.new
-      x.update(data)
-      ID_CRC + CRC_SYMBOL_SIZE + x.hexdigest.upcase
+      # === old algorithm
+      # data += ID_CRC + CRC_SYMBOL_SIZE
+      # x = Digest::CRC16CCITT.new
+      # x.update(data)
+      # ID_CRC + CRC_SYMBOL_SIZE + x.hexdigest.upcase
+      # === updated algorithm
+      ID_CRC + CRC_SYMBOL_SIZE + Digest::SHA256.hexdigest(data).slice(-4..-1).upcase
     end
     def self.mcc_format(mcc)

data/lib/rubyqrpay/parser.rb ADDED Viewed

@@ -0,0 +1,36 @@
+module Rubyqrpay
+  class Parser
+    NESTED_DATA_IDS = [ID_MERCHANT_INFORMATION_32,
+                       ID_MERCHANT_INFORMATION_33,
+                       ID_ADDITIONAL_DATA_FIELD,
+                       ID_MERCHANT_INFORMATION_LANGUAGE]
+    class << self
+      def parse_payload(payload)
+        parse_to_params(URI.unescape payload)
+      end
+      private
+      def parse_to_params(payload)
+        {}.tap do |params|
+          index = 0
+          until payload[index + 4].nil?
+            key = payload[index, 2]
+            size = payload[index + 2, 2].to_i
+            value = payload[index + 4, size]
+            params[key] = if NESTED_DATA_IDS.include? key
+                            parse_to_params value
+                          else
+                            value
+                          end
+            index += 4 + size
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubyqrpay/validator.rb CHANGED Viewed

@@ -6,7 +6,7 @@ require 'iso639'
 module Rubyqrpay
   class Validator
     CONSUMER_DATA_REQUEST_PATTERN = /^(A?E?M|E?M?A|M?A?E|A?M?E|E?M?A|M?E?A)$/
-    ANS_PATTERN = /^[a-zA-Z0-9!@#$&()\-`.+,\/\" *]*$/ # '*' is a specific symbol for additional_data field
+    ANS_PATTERN = /^[[:ascii:]]*$/
     MIN_MCC = 0
     MAX_MCC = 10_000
     MIN_FIXED = 0.01
@@ -87,8 +87,8 @@ module Rubyqrpay
         optional(:percentage_fee).maybe(:float?, gteq?: MIN_PERCENT, lteq?: MAX_PERCENT)
         optional(:merchant_category_code).maybe(:int?, gteq?: MIN_MCC, lt?: MAX_MCC)
         optional(:amount).maybe(:float?, gteq?: MIN_FIXED, lteq?: MAX_FIXED)
-        optional(:country).maybe(:str?)
-        optional(:merchant_name).maybe(:str?, max_size?: 25, format?: ANS_PATTERN)
+        required(:country).filled(:str?)
+        required(:merchant_name).filled(:str?, max_size?: 25, format?: ANS_PATTERN)
         optional(:merchant_city).maybe(:str?, max_size?: 15, format?: ANS_PATTERN)
         optional(:postal_code).maybe(:str?, max_size?: 10, format?: ANS_PATTERN)

data/lib/rubyqrpay/version.rb CHANGED Viewed

@@ -1,3 +1,4 @@
 module Rubyqrpay
-  VERSION = "0.2.4"
+  VERSION = "0.4.0"
+  # compatible with ERIP API documentation from 20.05.2020
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyqrpay
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Egor Shpalov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,6 +157,7 @@ files:
 - lib/rubyqrpay.rb
 - lib/rubyqrpay/constants.rb
 - lib/rubyqrpay/generator.rb
+- lib/rubyqrpay/parser.rb
 - lib/rubyqrpay/validator.rb
 - lib/rubyqrpay/version.rb
 - rubyqrpay.gemspec
@@ -179,10 +180,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.14
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Ruby prompt pay QR-code generator
 test_files: []
-has_rdoc: