rubyqrpay 0.2.5 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 59502deb4d7f08b922a541ffa45dccdd7b88b14b
-  data.tar.gz: 4c97542691d2b12acaa0b9a05c70d8ba1147ff15
+SHA256:
+  metadata.gz: d3e431b3cb8540694aec95035725418b3627d3ace9f0b8edbd2372ca63ce10b2
+  data.tar.gz: 180f8e10cb3d6bb79b19afce69c91cc4b3831d049166caabdc93a2721c8de050
 SHA512:
-  metadata.gz: 6d782c66cfc7e0f449750ca369bb1ed200451f654dfb9eaed005647eae7aecd9d6a6c1001d36a7179bec0395b0081c9bfac4b855eed03e2fc49da84e29af57f4
-  data.tar.gz: e4107eff02ba2dae9c07bb9779294cb5f17cdd4c5bfcd3028c7b32ac3ea8af716a39064f5081ed09b692d58b73eb777450ae701787ea1cec4561ce7ae2296ef8
+  metadata.gz: f4656882f4c829fba413a39557ddbe456ca9cd6bd902584f543acdb8fbe53f6e87287566b05d1af2eb8fbfabaa5c9b8650c651d072a408e79bc0441c68b8609b
+  data.tar.gz: 841331771b9e2c2ba27ac82413d6831c49fa843f479bf7b71107d356f80abf60bd1b21cae02ca056e442d9ce7bd73a7da1e4e2c8a1f0b83d8b6231f8490701ef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubyqrpay (0.2.5)
+    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

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

data/lib/rubyqrpay/constants.rb

@@ -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

@@ -12,7 +12,7 @@ module Rubyqrpay
       opts = Rubyqrpay::Validator.validate_payload(opts)
       unless opts.nil?
         payload = generation(opts)
-        percent_encode payload
+        # percent_encode payload # Temporary solution to fix invalid BNB URI decode
       end
     end
 
@@ -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],
@@ -135,7 +135,7 @@ module Rubyqrpay
 
     def self.join_hash(hash)
       hash.map do |id, value|
-        value = value.to_s
+        value = percent_encode(value.to_s).gsub(/\%.{2}/, '')
         unless value.empty?
           len = "00#{value.size}".slice(-2..-1)
           id + len + value
@@ -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

@@ -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

@@ -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 = /[[:ascii:]]/
+    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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyqrpay
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.4.1
 platform: ruby
 authors:
 - Egor Shpalov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2021-06-08 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.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby prompt pay QR-code generator
 test_files: []
-has_rdoc: