spree_gateway 3.3.3 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0797ee9ac672b7bc3c0d560df24c63ae049ceb09
-  data.tar.gz: 3aa79156ee10d3c62c8dde5fe221ad39fd65e58c
+SHA256:
+  metadata.gz: 648d40901742451fde4132f84a47a1cb6cd87da368e231026bd43bc0de827317
+  data.tar.gz: a7074f7a84f7f59e91302d2fa40d939d074df09665a6c5187cf2282104a5d934
 SHA512:
-  metadata.gz: 9638942a8d2612a426f121e34e8d8b6df4cd6dc90da9f4494ac5b59782310825b068a81b34335757697212ed2b4345a8db7a91a3c4bd8de37a9a913b2f27c800
-  data.tar.gz: 0d7f46182bea7350373611872731922d87bc2559c9fea6210af45934b2d952e36ddab6bb0a2b28422244c24e42e68a39625019d3a5c110cfc9e44ce3e00684f8
+  metadata.gz: ab2a9999f550f7c983f74fd4d373e5283e8b4c851c51db219358c8003f3d0c24fef1436ee259fc872399e40c8660c843d3edb589f6371739ed92379dc869473e
+  data.tar.gz: 03dfc59510f180067067e29cdd37cbd4a545c1b172c0a096ede0a9a3f1ff8006be49b35ac93755c15eeede25a94bff3f9016f0a887505d21b71f87b9183d75ed

data/.travis.yml

@@ -3,6 +3,9 @@ dist: trusty
 
 language: ruby
 
+addons:
+  chrome: stable
+
 env:
   - DB=postgres
   - DB=mysql
@@ -26,3 +29,9 @@ matrix:
 
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
+  - wget -N https://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip -P ~/
+  - unzip ~/chromedriver_linux64.zip -d ~/
+  - rm ~/chromedriver_linux64.zip
+  - sudo mv -f ~/chromedriver /usr/local/share/
+  - sudo chmod +x /usr/local/share/chromedriver
+  - sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver

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/lib/active_merchant/billing/gateways/stripe_decorator.rb

@@ -0,0 +1,17 @@
+ActiveMerchant::Billing::StripeGateway.class_eval do
+  private
+
+  alias_method :original_headers, :headers
+  alias_method :original_add_customer_data, :add_customer_data
+
+  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

data/lib/spree_gateway.rb

@@ -1,4 +1,5 @@
 require 'spree_core'
 require 'spree_gateway/engine'
+require 'spree_gateway/version'
 require 'sass/rails'
 require 'spree_extension'

data/lib/spree_gateway/engine.rb

@@ -44,6 +44,9 @@ module SpreeGateway
           Rails.configuration.cache_classes ? require(c) : load(c)
         end
       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.3.5'
+  end
+end

data/spec/spec_helper.rb

@@ -9,8 +9,9 @@ require 'rspec/rails'
 require 'rspec/active_model/mocks'
 require 'capybara/rspec'
 require 'capybara/rails'
-require 'capybara/poltergeist'
 require 'capybara-screenshot/rspec'
+require "selenium-webdriver"
+require 'webdrivers'
 require 'database_cleaner'
 require 'ffaker'
 require 'rspec/active_model/mocks'
@@ -22,7 +23,7 @@ require 'spree/testing_support/order_walkthrough'
 require 'spree/testing_support/preferences'
 require 'spree/testing_support/capybara_ext'
 
-FactoryBot.find_definitions
+FactoryGirl.find_definitions
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
@@ -34,7 +35,7 @@ RSpec.configure do |config|
   #config.filter_run focus: true
   #config.filter_run_excluding slow: true
 
-  config.include FactoryBot::Syntax::Methods
+  config.include FactoryGirl::Syntax::Methods
   config.include Spree::TestingSupport::Preferences
 
   config.before :suite do
@@ -52,5 +53,13 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
-  Capybara.javascript_driver = :poltergeist
+  Capybara.register_driver :chrome do |app|
+    Capybara::Selenium::Driver.new app,
+      browser: :chrome,
+      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.3.3'
+  s.version     = SpreeGateway.version
   s.summary     = 'Additional Payment Gateways for Spree Commerce'
   s.description = s.summary
 
@@ -25,20 +30,22 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'capybara-screenshot'
   s.add_development_dependency 'coffee-rails'
   s.add_development_dependency 'database_cleaner'
-  s.add_development_dependency 'factory_bot'
+  s.add_development_dependency 'factory_girl'
+  s.add_development_dependency 'factory_bot', '~> 4.7'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'launchy'
   s.add_development_dependency 'mysql2'
   s.add_development_dependency 'pg', '~> 0.18'
-  s.add_development_dependency 'poltergeist'
   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 'bootstrap-sass', '>= 3.3.5.1'
   s.add_development_dependency 'sass-rails', '>= 3.2'
   s.add_development_dependency 'selenium-webdriver'
+  s.add_development_dependency 'webdrivers', '~> 3.9.0'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'sqlite3', '~> 1.3.6'
   s.add_development_dependency 'appraisal'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_gateway
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.5
 platform: ruby
 authors:
 - Spree Commerce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -115,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot
+  name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -128,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +213,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -213,7 +227,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -296,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: 3.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -314,16 +342,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -393,11 +421,13 @@ files:
 - gemfiles/spree_3_1.gemfile
 - gemfiles/spree_3_2.gemfile
 - gemfiles/spree_master.gemfile
+- lib/active_merchant/billing/gateways/stripe_decorator.rb
 - lib/assets/javascripts/spree/frontend/spree_gateway.js
 - lib/assets/stylesheets/spree/frontend/spree_gateway.css
 - 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
@@ -454,8 +484,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Additional Payment Gateways for Spree Commerce