fawry 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34dc9f1782c59c274ae83ab7cb5bf7542c02df23f12d3343c0bacc06d0385acf
-  data.tar.gz: 1e902699e6671b59e4d83ab246c6811fe4472c2b370843ce2b614e5e74811e80
+  metadata.gz: de7321464f0d145904cb1b356fc8b0659f7258e5693c4c3a32e6ae3276198a5e
+  data.tar.gz: c7bc36bbe23c12fbe7b7ea0b5397cfbf9a5bf696440806a1a7200e61fd10e4c1
 SHA512:
-  metadata.gz: e18d4c44a20192fafd829aae6b9726bdbef550f1f5a32fc28865d61bf7336f93d86c2eec07605eea53d29990ef45eabfd175c29e3e8425ca230d4f0ccd195d63
-  data.tar.gz: 4eed6906aa47aa7e45d7b18fecf2ff2878aca3939e49f071f0e0ce16ffbc2278e0b204261cd03dbe5009f5c5c97bec7b08cc57f8faae52880229e57225fd9ecb
+  metadata.gz: 9ff0c0665c07f5b0abd0b68ece79e6ab934c8c91e2387571986ad652af08e31cae9e8e0a3674aa180b9badbbb7833df24a6e64c8da5f9383ab97299454de4090
+  data.tar.gz: c1a8cdeef0c8fe57010ef68491e95ba88d99c5f990a123829afe03e78c7704a4184c101cd72ed145747d71972e085cf1ace26617feff0b42d781eb4af56d3ff6

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.rubocop.yml

@@ -1,8 +1,9 @@
 AllCops:
+  NewCops: enable
   TargetRubyVersion: 2.6
 Metrics/LineLength:
   Max: 120
 Metrics/BlockLength:
-  ExcludedMethods: ['describe', 'context']
+  IgnoredMethods: ['describe', 'context']
 Style/Documentation:
-  Enabled: false
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fawry (1.1.1)
+    fawry (1.2.1)
       dry-validation (~> 1.3, >= 1.3.1)
       faraday (~> 0.17.0)
 
@@ -10,11 +10,11 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
+    ast (2.4.2)
     byebug (11.0.1)
     concurrent-ruby (1.1.7)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    crack (0.4.5)
+      rexml
     diff-lcs (1.3)
     dry-configurable (0.11.6)
       concurrent-ruby (~> 1.0)
@@ -54,17 +54,18 @@ GEM
       dry-equalizer (~> 0.2)
       dry-initializer (~> 3.0)
       dry-schema (~> 1.5, >= 1.5.2)
-    faraday (0.17.1)
+    faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
-    hashdiff (1.0.0)
-    jaro_winkler (1.5.4)
+    hashdiff (1.0.1)
     multipart-post (2.1.1)
-    parallel (1.18.0)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
-    public_suffix (4.0.1)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (13.0.1)
+    regexp_parser (2.1.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -80,17 +81,20 @@ GEM
     rspec-support (3.9.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.76.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.11.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
-    unicode-display_width (1.6.0)
-    webmock (3.7.6)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.0.0)
+    webmock (3.12.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -100,13 +104,13 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
-  byebug (~> 11.0, >= 11.0.1)
+  byebug (~> 11.0)
   fawry!
   rake (~> 13.0)
   rspec (~> 3.0)
   rspec_junit_formatter
-  rubocop (~> 0.76.0)
-  webmock (~> 3.7, >= 3.7.6)
+  rubocop (~> 1.11)
+  webmock (~> 3.12)
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

data/Rakefile

@@ -2,10 +2,17 @@
 
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:rubocop)
 
-task default: :spec
+task default: :rspec_rubocop
+
+task :rspec_rubocop do
+  Rake::Task['rubocop'].invoke
+  Rake::Task['spec'].invoke
+end
 
 desc 'Start a console session with Fawry gem loaded'
 task :console do

data/fawry.gemspec

@@ -7,14 +7,14 @@ require 'fawry/version'
 Gem::Specification.new do |spec|
   spec.name          = 'fawry'
   spec.version       = Fawry::VERSION
-  spec.authors       = ['Amr Bakry']
-  spec.email         = ['amrrbakry17@gmail.com']
+  spec.authors       = ['Amr El Bakry']
+  spec.email         = ['amrr@hey.com']
 
   spec.summary       = "A library to interface with Fawry's payment gateway API (charge, refund, payment status,
                         service callback)."
   spec.homepage      = 'https://github.com/amrrbakry/fawry'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '~> 2.6'
+  spec.required_ruby_version = '>= 2.6'
 
   spec.metadata['homepage_uri'] = 'https://github.com/amrrbakry/fawry'
   spec.metadata['source_code_uri'] = 'https://github.com/amrrbakry/fawry'
@@ -32,10 +32,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday', '~> 0.17.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'byebug', '~> 11.0', '>= 11.0.1'
+  spec.add_development_dependency 'byebug', '~> 11.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter'
-  spec.add_development_dependency 'rubocop', '~> 0.76.0'
-  spec.add_development_dependency 'webmock', '~> 3.7', '>= 3.7.6'
+  spec.add_development_dependency 'rubocop', '~> 1.11'
+  spec.add_development_dependency 'webmock', '~> 3.12'
 end

data/lib/fawry/connection.rb

@@ -45,12 +45,12 @@ module Fawry
 
       def connection
         @connection ||= Faraday.new(url: FAWRY_BASE_URL, headers: { 'Content-Type': 'application/json',
-                                                                    'Accept': 'application/json' })
+                                                                    Accept: 'application/json' })
       end
 
       def sandbox_connection
         @sandbox_connection ||= Faraday.new(url: FAWRY_SANDBOX_BASE_URL, headers: { 'Content-Type': 'application/json',
-                                                                                    'Accept': 'application/json' })
+                                                                                    Accept: 'application/json' })
       end
 
       # Fawry does not understand encoded params

data/lib/fawry/errors.rb

@@ -2,5 +2,6 @@
 
 module Fawry
   class InvalidFawryRequestError < StandardError; end
+
   class InvalidSignatureError < StandardError; end
 end

data/lib/fawry/fawry_request.rb

@@ -18,7 +18,6 @@ module Fawry
 
     # rubocop:disable Metrics/MethodLength
     # rubocop:disable Metrics/AbcSize
-    # rubocop:disable Metrics/CyclomaticComplexity
     def build_request
       case action
       when 'charge'
@@ -46,7 +45,6 @@ module Fawry
         validate_delete_token_params!
         @request = build_delete_token_request
       end
-      # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/MethodLength
     end

data/lib/fawry/requests/create_card_token_request.rb

@@ -27,7 +27,6 @@ module Fawry
         @create_card_token_request ||= params
       end
 
-      # rubocop:disable Metrics/AbcSize
       def create_card_token_request_transformed_params
         {
           merchantCode: fawry_merchant_code,
@@ -41,8 +40,6 @@ module Fawry
         }.compact
       end
 
-      # rubocop:enable Metrics/AbcSize
-
       def fawry_merchant_code
         ENV.fetch('FAWRY_MERCHANT_CODE') { create_card_token_request[:merchant_code] }
       end

data/lib/fawry/utils.rb

@@ -17,7 +17,7 @@ module Fawry
     # fawry_res.status_code => 200
     # fawry_res.reference_number => 1234567
     def enrich_object(fawry_params)
-      fawry_params.keys.each do |key|
+      fawry_params.each_key do |key|
         method_name = key.to_s.split(/(?=[A-Z])/).map(&:downcase).join('_') # statusCode => status_code
         instance_variable_set("@#{method_name}", fawry_params[key])
         method_body = proc { instance_variable_get("@#{method_name}") }

data/lib/fawry/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fawry
-  VERSION = '1.1.1'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fawry
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
-- Amr Bakry
+- Amr El Bakry
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2021-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-validation
@@ -65,9 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,9 +72,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,42 +120,37 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.76.0
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.76.0
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.6
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.6
+        version: '3.12'
 description:
 email:
-- amrrbakry17@gmail.com
+- amrr@hey.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -207,7 +196,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -216,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: A library to interface with Fawry's payment gateway API (charge, refund,