spree_gateway 3.6.1 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe136745a4952c109be6bf5181f835c8bead01e7a4af597298151c6a7ab99906
-  data.tar.gz: dd862525415b7c5ab06707916b82261a46ad208e4a9c9b3e0cb36674abaac858
+  metadata.gz: 0552edd565bc5548c37193554fab4ac475fdafc0e46a50cd35cb9dea9f008752
+  data.tar.gz: b9de992c711cd14a26e22c7ba7e395d0b81dd9acbdee55f032d274b6e1712f40
 SHA512:
-  metadata.gz: 4c459f16bf20b77fee7444def8c37ffd34d03c6cb294aebd82b80b990bca8ad390604e7b063f804df233bbebbf152d923c476d337a7d2b84052467a9c11bec21
-  data.tar.gz: e447da970e9bfacbff93f49dd0dc5e9cc9622f29a8c3ec819114579fca1fa8a8728d358fd2d80635752057b2a80b7d399963c4c20056bc901bf0c0affe57ade3
+  metadata.gz: 4ef24a0aff0e214d043c325f95e00b72d86def24a51d97d603ba424d6df5df7ebc2a42dea8a6de69c6d8a2ff95ff042c2ba9363bfb53637682b04dd5ec722fb7
+  data.tar.gz: 422e86964485e15bc21347324d923f4108b1e9b7ed132e3023a1b177668c6942178a578fc8cbb97149a3eee0ef6c78609380184768d788e258bf2406dff3c0e9

data/.travis.yml

@@ -15,6 +15,7 @@ gemfile:
   # - gemfiles/spree_3_2.gemfile
   - gemfiles/spree_3_5.gemfile
   - gemfiles/spree_3_7.gemfile
+  - gemfiles/spree_4_0.gemfile
   - gemfiles/spree_master.gemfile
 
 script:
@@ -34,10 +35,16 @@ matrix:
         gemfile: gemfiles/spree_master.gemfile
       - rvm: 2.4.4
         gemfile: gemfiles/spree_master.gemfile
+      - rvm: 2.3.7
+        gemfile: gemfiles/spree_4_0.gemfile
+      - rvm: 2.4.4
+        gemfile: gemfiles/spree_4_0.gemfile
       - rvm: 2.5.1
         gemfile: gemfiles/spree_3_2.gemfile
       - rvm: 2.4.4
         gemfile: gemfiles/spree_3_2.gemfile
+      - rvm: 2.5.1
+        gemfile: gemfiles/spree_3_5.gemfile
 
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"

data/Appraisals

@@ -14,6 +14,11 @@ appraise 'spree-3-7' do
   gem 'rails-controller-testing'
 end
 
+appraise 'spree-4-0' do
+  gem 'spree', '~> 4.0.0.rc2'
+  gem 'rails-controller-testing'
+end
+
 appraise 'spree-master' do
   gem 'spree', github: 'spree/spree', branch: 'master'
   gem 'rails-controller-testing'

data/app/models/spree/gateway/stripe_gateway.rb

@@ -40,16 +40,16 @@ module Spree
       provider.capture(money, response_code, gateway_options)
     end
 
-    def credit(money, creditcard, response_code, gateway_options)
-      provider.refund(money, response_code, {})
+    def credit(money, creditcard, response_code, gateway_options)tes
+      provider.refund(money, response_code, {}, gateway_options)
     end
 
     def void(response_code, creditcard, gateway_options)
-      provider.void(response_code, {})
+      provider.void(response_code, {}, gateway_options)
     end
 
     def cancel(response_code)
-      provider.void(response_code, {})
+      provider.void(response_code, {}, gateway_options)
     end
 
     def create_profile(payment)
@@ -87,14 +87,17 @@ module Spree
 
     # In this gateway, what we call 'secret_key' is the 'login'
     def options
-      options = super
-      options.merge(:login => preferred_secret_key)
+      super.merge(
+        login: preferred_secret_key,
+        application: app_info
+      )
     end
 
     def options_for_purchase_or_auth(money, creditcard, gateway_options)
       options = {}
       options[:description] = "Spree Order ID: #{gateway_options[:order_id]}"
       options[:currency] = gateway_options[:currency]
+      options[:application] = app_info
 
       if customer = creditcard.gateway_customer_profile_id
         options[:customer] = customer
@@ -133,5 +136,11 @@ module Spree
       source.cc_type = CARD_TYPE_MAPPING[source.cc_type] if CARD_TYPE_MAPPING.include?(source.cc_type)
       source
     end
+
+    def app_info
+      name_with_version = "SpreeGateway/#{SpreeGateway.version}"
+      url = 'https://spreecommerce.org'
+      "#{name_with_version} #{url}"
+    end
   end
 end

data/gemfiles/spree_4_0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails-controller-testing"
+gem "spree", "~> 4.0.0.rc2"
+
+gemspec path: "../"

data/lib/active_merchant/billing/stripe_gateway_decorator.rb

@@ -0,0 +1,27 @@
+module ActiveMerchant
+  module Billing
+    module StripeGatewayDecorator
+      def self.prepended(base)
+        base.class_eval do
+          alias_method :original_headers, :headers
+          alias_method :original_add_customer_data, :add_customer_data
+
+          private
+
+          def headers(options = {})
+            headers = original_headers(options)
+            headers['User-Agent'] = headers['X-Stripe-Client-User-Agent']
+            headers
+          end
+
+          def add_customer_data(post, options)
+            original_add_customer_data(post, options)
+            post[:payment_user_agent] = "SpreeGateway/#{SpreeGateway.version}"
+          end
+        end
+      end
+    end
+  end
+end
+
+ActiveMerchant::Billing::StripeGateway.prepend(ActiveMerchant::Billing::StripeGatewayDecorator)

data/lib/spree_gateway.rb

@@ -1,3 +1,4 @@
 require 'spree_core'
 require 'spree_gateway/engine'
+require 'spree_gateway/version'
 require 'spree_extension'

data/lib/spree_gateway/engine.rb

@@ -40,6 +40,9 @@ module SpreeGateway
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/spree/*_decorator*.rb')) do |c|
         Rails.application.config.cache_classes ? require(c) : load(c)
       end
+      Dir.glob(File.join(File.dirname(__FILE__), '../../lib/active_merchant/**/*_decorator*.rb')) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
     end
 
     def self.backend_available?

data/lib/spree_gateway/version.rb

@@ -0,0 +1,5 @@
+module SpreeGateway
+  def self.version
+    '3.6.4'
+  end
+end

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ require 'capybara/rspec'
 require 'capybara/rails'
 require 'capybara-screenshot/rspec'
 require "selenium-webdriver"
+require 'webdrivers'
 require 'database_cleaner'
 require 'ffaker'
 require 'rspec/active_model/mocks'
@@ -56,8 +57,10 @@ RSpec.configure do |config|
   Capybara.register_driver :chrome do |app|
     Capybara::Selenium::Driver.new app,
       browser: :chrome,
-      options: Selenium::WebDriver::Chrome::Options.new(args: %w[disable-popup-blocking headless disable-gpu window-size=1920,1080])
+      options: Selenium::WebDriver::Chrome::Options.new(
+        args: %w[no-sandbox disable-dev-shm-usage disable-popup-blocking headless disable-gpu window-size=1920,1080 --enable-features=NetworkService,NetworkServiceInProcess --disable-features=VizDisplayCompositor],
+        log_level: :error
+      )
   end
-
   Capybara.javascript_driver = :chrome
 end

data/spree_gateway.gemspec

@@ -1,8 +1,13 @@
 # coding: utf-8
+lib = File.expand_path('../lib/', __FILE__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
+
+require 'spree_gateway/version'
+
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_gateway'
-  s.version     = '3.6.1'
+  s.version     = SpreeGateway.version
   s.summary     = 'Additional Payment Gateways for Spree Commerce'
   s.description = s.summary
 
@@ -21,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_extension'
 
   s.add_development_dependency 'appraisal'
-  s.add_development_dependency 'bootstrap-sass', '>= 3.3.5.1'
+  s.add_development_dependency 'bootstrap-sass'
   s.add_development_dependency 'braintree'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'capybara-screenshot'
@@ -31,14 +36,15 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'launchy'
-  s.add_development_dependency 'mysql2', '~> 0.5.1'
-  s.add_development_dependency 'pg', '~> 0.18'
+  s.add_development_dependency 'mysql2'
+  s.add_development_dependency 'pg'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'puma'
   s.add_development_dependency 'rspec-activemodel-mocks'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'selenium-webdriver'
+  s.add_development_dependency 'webdrivers'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3', '~> 1.4.1'
+  s.add_development_dependency 'sqlite3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_gateway
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.4
 platform: ruby
 authors:
 - Spree Commerce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.5.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.5.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: braintree
   requirement: !ruby/object:Gem::Requirement
@@ -202,30 +202,30 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -310,6 +310,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -328,16 +342,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '0'
 description: Additional Payment Gateways for Spree Commerce
 email: gems@spreecommerce.com
 executables: []
@@ -399,11 +413,14 @@ files:
 - gemfiles/spree_3_2.gemfile
 - gemfiles/spree_3_5.gemfile
 - gemfiles/spree_3_7.gemfile
+- gemfiles/spree_4_0.gemfile
 - gemfiles/spree_master.gemfile
+- lib/active_merchant/billing/stripe_gateway_decorator.rb
 - lib/controllers/spree/apple_pay_domain_verification_controller.rb
 - lib/generators/spree_gateway/install/install_generator.rb
 - lib/spree_gateway.rb
 - lib/spree_gateway/engine.rb
+- lib/spree_gateway/version.rb
 - lib/views/backend/spree/admin/log_entries/_braintree.html.erb
 - lib/views/backend/spree/admin/log_entries/_stripe.html.erb
 - lib/views/backend/spree/admin/payments/source_forms/_quickcheckout.html.erb