solidus_culqi 0.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2ffd16d55727246157726af60755d45bd77af4ff
-  data.tar.gz: 0eed2658dd67b31df98b22900e76fc2d216ac74a
+SHA256:
+  metadata.gz: 80cce90c55f9d866e00d85e7243b021f569d528561a2711fbfaa7ef8fe8be170
+  data.tar.gz: cfc0718aaf923d29f3447c46c6e7b30fe1117e782f6a3338c97cf915f746e6c5
 SHA512:
-  metadata.gz: 0372c44fda0f92504e10f0881f1e36e9702736a68e544071f519f9b0c377c95f25751aba199438a669536d039da85518009393749fa381f34ec623f03afad874
-  data.tar.gz: 282edb48b247d1b4a6cd75680cc1545237dbb5d81ad6adb441673427eeba22282b6da6bbdacebf18b734d04144b6016698c631b9f7edae193c77d319ef7f67a9
+  metadata.gz: f50980b022b282ccc932651ee5111dccdf36e1711f18acd5f834596c2fb40611a050bf3bf6cf2b49972b13580bd83a1efb53fbe321b5e549e86d4ac0e821b5a6
+  data.tar.gz: 3dd82aaf6b1e7505011c58a7a714e6c68cfe1f1cd1c3340d1491028926e6839fb653ca5e54d14732661ba7facb7077344d4e1b664fd343273bf5a688caaa74ce

data/.rubocop.yml

@@ -4,22 +4,13 @@ AllCops:
   Exclude:
     - 'spec/dummy/**/*'
     - 'vendor/bundle/**/*'
-  TargetRubyVersion: 2.1
-
-# Sometimes I believe this reads better
-# This also causes spacing issues on multi-line fixes
-Style/BracesAroundHashParameters:
-  Enabled: false
+  TargetRubyVersion: 2.6
 
 # We use class vars and will have to continue doing so for compatability
 Style/ClassVars:
   Enabled: false
 
-# We need these names for backwards compatability
-Style/PredicateName:
-  Enabled: false
-
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Enabled: false
 
 # This has been used for customization
@@ -38,15 +29,16 @@ Style/WordArray:
 Style/ConditionalAssignment:
   Enabled: false
 
-Performance/Count:
-  Enabled: false
-
 Style/RaiseArgs:
   Enabled: false
 
 Naming/BinaryOperatorParameterName:
   Enabled: false
 
+# We need these names for backwards compatability
+Naming/PredicateName:
+  Enabled: false
+
 # We can use good judgement here
 Style/RegexpLiteral:
   Enabled: false
@@ -55,31 +47,22 @@ Style/RegexpLiteral:
 Style/AsciiComments:
   Enabled: false
 
-Lint/EndAlignment:
+Layout/EndAlignment:
   Enabled: false
 
-Style/ElseAlignment:
+Layout/ElseAlignment:
   Enabled: false
 
-Style/IndentationWidth:
+Layout/IndentationWidth:
   Enabled: false
 
-Style/AlignParameters:
+Layout/ClosingParenthesisIndentation:
   Enabled: false
 
-Style/ClosingParenthesisIndentation:
+Layout/MultilineMethodCallIndentation:
   Enabled: false
 
-Style/MultilineMethodCallIndentation:
-  Enabled: false
-
-Style/IndentArray:
-  Enabled: false
-
-Style/IndentHash:
-  Enabled: false
-
-Style/AlignHash:
+Layout/LineLength:
   Enabled: false
 
 # From http://relaxed.ruby.style/
@@ -100,7 +83,7 @@ Style/Documentation:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#styledocumentation
 
-Style/DotPosition:
+Layout/DotPosition:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#styledotposition
 
@@ -168,11 +151,11 @@ Style/SingleLineMethods:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
 
-Style/SpaceBeforeBlockBraces:
+Layout/SpaceBeforeBlockBraces:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
 
-Style/SpaceInsideParens:
+Layout/SpaceInsideParens:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
 
@@ -191,6 +174,15 @@ Style/WhileUntilModifier:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylewhileuntilmodifier
 
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
@@ -199,7 +191,7 @@ Lint/AssignmentInCondition:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Exclude:
     - 'Rakefile'
 
@@ -222,9 +214,6 @@ Metrics/ModuleLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Metrics/LineLength:
-  Enabled: false
-
 Metrics/MethodLength:
   Enabled: false
 

data/.travis.yml

@@ -2,27 +2,20 @@ sudo: false
 cache: bundler
 language: ruby
 bundler_args: --quiet
-before_install:
-  - gem install bundler --pre
 script:
   - bundle exec rake
 rvm:
-  - 2.4.1
+  - 2.6.5
+services:
+  - postgresql
+  - mysql
 env:
   matrix:
-    - SOLIDUS_BRANCH=v1.2 DB=postgres
-    - SOLIDUS_BRANCH=v1.3 DB=postgres
-    - SOLIDUS_BRANCH=v1.4 DB=postgres
-    - SOLIDUS_BRANCH=v2.0 DB=postgres
-    - SOLIDUS_BRANCH=v2.1 DB=postgres
-    - SOLIDUS_BRANCH=v2.2 DB=postgres
-    - SOLIDUS_BRANCH=v2.3 DB=postgres
+    - SOLIDUS_BRANCH=v2.9 DB=postgres
+    - SOLIDUS_BRANCH=v2.10 DB=postgres
+    - SOLIDUS_BRANCH=v2.11 DB=postgres
     - SOLIDUS_BRANCH=master DB=postgres
-    - SOLIDUS_BRANCH=v1.2 DB=mysql
-    - SOLIDUS_BRANCH=v1.3 DB=mysql
-    - SOLIDUS_BRANCH=v1.4 DB=mysql
-    - SOLIDUS_BRANCH=v2.0 DB=mysql
-    - SOLIDUS_BRANCH=v2.1 DB=mysql
-    - SOLIDUS_BRANCH=v2.2 DB=mysql
-    - SOLIDUS_BRANCH=v2.3 DB=mysql
+    - SOLIDUS_BRANCH=v2.9 DB=mysql
+    - SOLIDUS_BRANCH=v2.10 DB=mysql
+    - SOLIDUS_BRANCH=v2.11 DB=mysql
     - SOLIDUS_BRANCH=master DB=mysql

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
@@ -5,10 +7,14 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem 'solidus', github: 'solidusio/solidus', branch: branch
 
+gem 'deface'
 gem 'ffaker'
-gem 'mysql2'
-gem 'pg'
+gem 'mysql2', '0.4.10'
+gem 'pg', '~> 0.21'
+gem 'puma'
 gem 'solidus_auth_devise'
 gem 'sqlite3'
 
 gemspec
+
+gem 'culqi-ruby', github: 'culqi/culqi-ruby'

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 
 Bundler::GemHelper.install_tasks

data/app/models/concerns/solidus_culqi/inject_installments_concern.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusCulqi
   module InjectInstallmentsConcern
     extend ActiveSupport::Concern
@@ -8,7 +10,7 @@ module SolidusCulqi
     module InstanceMethods
       def gateway_options
         options = super
-        installments = order.installments
+        installments = order.try(:installments)
         options[:installments] = installments if installments
         options
       end

data/app/models/concerns/solidus_culqi/permitted_attributes_concern.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusCulqi
   module PermittedAttributesConcern
     def checkout_attributes

data/app/models/payment_decorator.rb

@@ -1 +1,5 @@
-Spree::Payment.include SolidusCulqi::InjectInstallmentsConcern
+# frozen_string_literal: true
+
+module PaymentDecorator
+  Spree::Payment.include SolidusCulqi::InjectInstallmentsConcern
+end

data/app/models/permitted_attributes_decorator.rb

@@ -1 +1,5 @@
-Spree::PermittedAttributes.singleton_class.prepend SolidusCulqi::PermittedAttributesConcern
+# frozen_string_literal: true
+
+module PermittedAttributesDecorator
+  Spree::PermittedAttributes.singleton_class.prepend SolidusCulqi::PermittedAttributesConcern
+end

data/app/models/solidus/gateway/culqi_gateway.rb

@@ -1,12 +1,17 @@
-module Solidus
-  class Gateway::CulqiGateway < SolidusCulqi::Gateway.parent_class
-    extend SolidusCulqi::Gateway
+# frozen_string_literal: true
 
+module Solidus
+  class Gateway::CulqiGateway < Spree::PaymentMethod::CreditCard
     preference :public_key, :string
     preference :secret_key, :string
 
-    partial_method 'culqi'
-    provider_method self.class
+    def partial_name
+      'culqi'
+    end
+
+    def gateway_class
+      self.class
+    end
 
     def default_currency
       "PEN"
@@ -51,15 +56,16 @@ module Solidus
 
     def create_profile(payment)
       return unless payment.source.gateway_customer_profile_id.nil?
+
       init_culqi
       customer = get_customer(payment)
       token = payment.source.gateway_payment_profile_id
       card_token = generate_card(customer, token)
       unless customer.nil? || card_token.nil?
-        payment.source.update({
+        payment.source.update(
           gateway_customer_profile_id: customer,
           gateway_payment_profile_id: card_token
-        })
+        )
       end
     end
 
@@ -71,7 +77,7 @@ module Solidus
     end
 
     def commit(amount, creditcard, gateway_options, capture)
-      installments = gateway_options[:installments]
+      installments = gateway_options.try(:installments)
       authorization = creditcard[:gateway_payment_profile_id]
       charge = Culqi::Charge.create(
         amount: amount,
@@ -88,8 +94,8 @@ module Solidus
     def parse_response(response)
       res = JSON.parse(response)
       ActiveMerchant::Billing::Response.new(
-        res[:object] != "error",
-        res[:merchant_message],
+        res["object"] != "error",
+        res["merchant_message"],
         res,
         authorization: res["id"]
       )
@@ -125,7 +131,8 @@ module Solidus
     def generate_card(customer, token)
       card = Culqi::Card.create(
         customer_id: customer,
-        token_id: token
+        token_id: token,
+        validate: false
       )
       JSON.parse(card)["id"]
     end

data/bin/geckodriver

@@ -0,0 +1,28 @@
+require 'json'
+require 'net/http'
+require 'fileutils'
+require 'open-uri'
+require 'archive/zip'
+
+path = 'https://api.github.com/repos/mozilla/geckodriver/releases/latest'
+
+res = Net::HTTP.get_response(URI(path))
+json = JSON.parse(res.body)
+download_url = json['url']
+
+filename = 'geckodriver'
+
+Dir.chdir platform_install_dir do
+  FileUtils.rm_f filename
+  File.open(filename, "wb") do |saved_file|
+    URI.parse(download_url).open("rb") do |read_file|
+      saved_file.write(read_file.read)
+    end
+  end
+
+  raise "Could not download #{download_url}" unless File.exists? filename
+  Archive::Zip.extract(filename, '.', :overwrite => :all)
+end
+raise "Could not unzip #{filename} to get #{binary_path}" unless File.exists? binary_path
+FileUtils.chmod "ugo+rx", binary_path
+File.open(version_path, 'w') { |file| file.write(download_version) }

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Spree::Core::Engine.routes.draw do
   # Add your extension routes here
 end

data/db/migrate/20170919145201_add_installments_to_orders.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddInstallmentsToOrders < SolidusSupport::Migration[4.2]
   def change
     add_column :spree_orders, :installments, :integer

data/lib/generators/solidus_culqi/install/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusCulqi
   module Generators
     class InstallGenerator < Rails::Generators::Base

data/lib/solidus_culqi.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require 'solidus_core'
 require 'solidus_support'
 require 'culqi-ruby'
 require 'solidus_culqi/support'
-require 'solidus_culqi/gateway'
 require 'solidus_culqi/engine'

data/lib/solidus_culqi/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusCulqi
   class Engine < Rails::Engine
     engine_name 'solidus_culqi'
@@ -12,7 +14,7 @@ module SolidusCulqi
     end
 
     def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
+      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')).sort.map do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
     end

data/lib/solidus_culqi/factories.rb

@@ -1,4 +1,6 @@
-FactoryGirl.define do
+# frozen_string_literal: true
+
+FactoryBot.define do
   # Define your Spree extensions Factories within this file to enable applications, and other extensions to use and override them.
   #
   # Example adding this to your spec_helper will load these Factories for use:

data/lib/solidus_culqi/support.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusCulqi
   module Support
     def self.solidus_earlier(version)

data/lib/solidus_culqi/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusCulqi
-  VERSION = '0.0.2'
+  VERSION = '1.1.0'
 end

data/solidus_culqi.gemspec

@@ -1,4 +1,6 @@
-$:.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$:.push File.expand_path('lib', __dir__)
 
 require 'solidus_culqi/version'
 
@@ -16,19 +18,17 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
 
+  s.required_ruby_version = Gem::Requirement.new('~> 2.6')
+
+  s.add_dependency 'culqi-ruby'
   s.add_dependency 'solidus_core'
   s.add_dependency 'solidus_support'
-  s.add_dependency 'culqi-ruby'
 
-  s.add_development_dependency 'capybara'
-  s.add_development_dependency 'poltergeist'
   s.add_development_dependency 'database_cleaner'
-  s.add_development_dependency 'factory_girl'
+  s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rubocop-rspec'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'vcr'
-  s.add_development_dependency 'webmock'
 end