spree_gateway 3.2.0 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 59d06c29878a6203de1b5ca3c4cd97b88f7ed257
-  data.tar.gz: 7a20a8c0667e50b87bac1cc29781a265b1eba85a
+SHA256:
+  metadata.gz: 648d40901742451fde4132f84a47a1cb6cd87da368e231026bd43bc0de827317
+  data.tar.gz: a7074f7a84f7f59e91302d2fa40d939d074df09665a6c5187cf2282104a5d934
 SHA512:
-  metadata.gz: 3674f7cc0061a2428959eff085930bca279454526d537df7dfd5d3667e5394d8c2aedcc881333bef6c5a8d5fb37c22c03f936affa9229a3b2f4bddc2a57a3d0b
-  data.tar.gz: 98b84448539919606b6149100def41019f17690fc11b92caf54122d43cf2e6b40c72be7bf27638c7fa187443434ded19a3c445a310a53835224ccf3a781c73a1
+  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
@@ -20,9 +23,15 @@ rvm:
   - 2.3.1
   - 2.2.7
 
-addons:
-  apt:
-    packages:
-    - mysql-server-5.6
-    - mysql-client-core-5.6
-    - mysql-client-5.6
+matrix:
+    allow_failures:
+          - gemfile: gemfiles/spree_master.gemfile
+
+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/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'rails-controller-testing'
 gem 'spree', github: 'spree/spree', branch: 'master'
 
 gemspec

data/README.md

@@ -16,7 +16,7 @@ need to manually add it to your rails app Gemfile.
   #### Spree >= 3.1
 
   ```ruby
-  gem 'spree_gateway', github: 'spree/spree_gateway'
+  gem 'spree_gateway', '~> 3.3'
   ```
 
   #### Spree 3.0 and Spree 2.x

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

@@ -0,0 +1,14 @@
+module Spree
+  class Gateway::EwayRapid < Gateway
+    preference :login, :string
+    preference :password, :string
+
+    def provider_class
+      ActiveMerchant::Billing::EwayRapidGateway
+    end
+
+    def options
+      super().merge(:test => self.preferred_test_mode)
+    end
+  end
+end

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)
@@ -60,7 +60,7 @@ module Spree
       }.merge! address_for(payment)
 
       source = update_source!(payment.source)
-      if source.number.blank? && source.gateway_payment_profile_id.present?
+      if source.gateway_payment_profile_id.present?
         creditcard = source.gateway_payment_profile_id
       else
         creditcard = source
@@ -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/config/locales/bg.yml

@@ -2,10 +2,3 @@
 bg:
   spree:
     payment_has_been_cancelled: Плащането беше прекъснато.
-    complete_skrill_checkout: Моля довършете Вашето плащане със Skrill преди да продължите
-    skrill: Skrill
-    skrill_transaction: Транзакция
-    skrill_customer_id: Клиентски номер
-    skrill_transaction_id: Номер на транкцията
-    skrill_payment_type: Вид на плащане
-    skrill_payment_currency: Валута

data/config/locales/de.yml

@@ -2,10 +2,3 @@
 de:
   spree:
     payment_has_been_cancelled: Die Zahlung wurde abgebrochen.
-    complete_skrill_checkout: Bitte schliessen Sie die Skrill-Zahlung ab
-    skrill: Skrill
-    skrill_transaction: Transaktion
-    skrill_customer_id: Kunden ID
-    skrill_transaction_id: Transaktions ID
-    skrill_payment_type: Bezahlart
-    skrill_payment_currency: Währung

data/config/locales/en.yml

@@ -2,13 +2,6 @@
 en:
   spree:
     payment_has_been_cancelled: The payment has been cancelled.
-    complete_skrill_checkout: Please complete Skrill checkout before continuing
-    skrill: Skrill
-    skrill_transaction: Transaction
-    skrill_customer_id: Customer ID
-    skrill_transaction_id: Transaction ID
-    skrill_payment_type: Payment Type
-    skrill_payment_currency: Payment Currency
     log_entry:
       braintree:
         message: Message

data/config/locales/sv.yml

@@ -2,10 +2,3 @@
 sv:
   spree:
     payment_has_been_cancelled: Betalningen har avbrutits.
-    complete_skrill_checkout: Var god fyll i Skrill kassan innan du fortsätter
-    skrill: Skrill
-    skrill_transaction: Transaktion
-    skrill_customer_id: Kund ID
-    skrill_transaction_id: Transaktion ID
-    skrill_payment_type: Betalningstyp
-    skrill_payment_currency: Betalningsvaluta

data/db/migrate/20121017004102_update_braintree_payment_method_type.rb

@@ -1,8 +1,8 @@
-class UpdateBraintreePaymentMethodType < ActiveRecord::Migration
+class UpdateBraintreePaymentMethodType < SpreeExtension::Migration[4.2]
   def up
     Spree::PaymentMethod.where(:type => "Spree::Gateway::Braintree").update_all(:type => "Spree::Gateway::BraintreeGateway")
   end
-  
+
   def down
     Spree::PaymentMethod.where(:type => "Spree::Gateway::BraintreeGateway").update_all(:type => "Spree::Gateway::Braintree")
   end

data/db/migrate/20130213222555_update_stripe_payment_method_type.rb

@@ -1,8 +1,8 @@
-class UpdateStripePaymentMethodType < ActiveRecord::Migration
+class UpdateStripePaymentMethodType < SpreeExtension::Migration[4.2]
   def up
     Spree::PaymentMethod.where(:type => "Spree::Gateway::Stripe").update_all(:type => "Spree::Gateway::StripeGateway")
   end
-  
+
   def down
     Spree::PaymentMethod.where(:type => "Spree::Gateway::StripeGateway").update_all(:type => "Spree::Gateway::Stripe")
   end

data/db/migrate/20130415222802_update_balanced_payment_method_type.rb

@@ -1,9 +1,9 @@
-class UpdateBalancedPaymentMethodType < ActiveRecord::Migration
+class UpdateBalancedPaymentMethodType < SpreeExtension::Migration[4.2]
   def up
     Spree::PaymentMethod.where(:type => "Spree::Gateway::Balanced").update_all(:type => "Spree::Gateway::BalancedGateway")
   end
-  
+
   def down
     Spree::PaymentMethod.where(:type => "Spree::Gateway::BalancedGateway").update_all(:type => "Spree::Gateway::Balanced")
   end
-end
+end

data/db/migrate/20131008221012_update_paypal_payment_method_type.rb

@@ -1,8 +1,8 @@
-class UpdatePaypalPaymentMethodType < ActiveRecord::Migration
+class UpdatePaypalPaymentMethodType < SpreeExtension::Migration[4.2]
   def up
     Spree::PaymentMethod.where(:type => "Spree::Gateway::PayPal").update_all(:type => "Spree::Gateway::PayPalGateway")
   end
-  
+
   def down
     Spree::PaymentMethod.where(:type => "Spree::Gateway::PayPalGateway").update_all(:type => "Spree::Gateway::PayPal")
   end

data/db/migrate/20131112133401_migrate_stripe_preferences.rb

@@ -1,4 +1,4 @@
-class MigrateStripePreferences < ActiveRecord::Migration
+class MigrateStripePreferences < SpreeExtension::Migration[4.2]
   def up
     Spree::Preference.where("#{ActiveRecord::Base.connection.quote_column_name("key")} LIKE 'spree/gateway/stripe_gateway/login%'").each do |pref|
       pref.key = pref.key.gsub('login', 'secret_key')

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,3 +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

@@ -5,7 +5,6 @@ module SpreeGateway
     config.autoload_paths += %W(#{config.root}/lib)
 
     initializer "spree.gateway.payment_methods", :after => "spree.register.payment_methods" do |app|
-      app.config.spree.payment_methods << Spree::BillingIntegration::Skrill::QuickCheckout
       app.config.spree.payment_methods << Spree::Gateway::AuthorizeNet
       app.config.spree.payment_methods << Spree::Gateway::AuthorizeNetCim
       app.config.spree.payment_methods << Spree::Gateway::BalancedGateway
@@ -17,6 +16,7 @@ module SpreeGateway
       app.config.spree.payment_methods << Spree::Gateway::DataCash
       app.config.spree.payment_methods << Spree::Gateway::Epay
       app.config.spree.payment_methods << Spree::Gateway::Eway
+      app.config.spree.payment_methods << Spree::Gateway::EwayRapid
       app.config.spree.payment_methods << Spree::Gateway::Maxipago
       app.config.spree.payment_methods << Spree::Gateway::Migs
       app.config.spree.payment_methods << Spree::Gateway::Moneris
@@ -38,12 +38,15 @@ module SpreeGateway
       if SpreeGateway::Engine.frontend_available?
         Rails.application.config.assets.precompile += [
           'lib/assets/javascripts/spree/frontend/spree_gateway.js',
-          'lib/assets/javascripts/spree/frontend/spree_gateway.css',
+          'lib/assets/stylesheets/spree/frontend/spree_gateway.css',
         ]
         Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/frontend/*/*_decorator*.rb")) do |c|
           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/models/gateway/eway_rapid_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Spree::Gateway::EwayRapid do
+  let(:gateway) { described_class.create!(name: 'eWAY Rapid') }
+
+  describe '#provider_class' do
+    it 'should be an eWAY Rapid gateway' do
+      expect(gateway.provider_class).to eq ::ActiveMerchant::Billing::EwayRapidGateway
+    end
+  end
+
+  describe '#options' do
+    it 'should flag test option if preferred_test_mode is true' do
+      gateway.preferred_test_mode = true
+      expect(gateway.options[:test]).to be true
+    end
+
+    it 'should unflag test option if preferred_test_mode is false' do
+      gateway.preferred_test_mode = false
+      expect(gateway.options[:test]).to be false
+    end
+  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'
@@ -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,15 +1,20 @@
 # 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.2.0'
+  s.version     = SpreeGateway.version
   s.summary     = 'Additional Payment Gateways for Spree Commerce'
   s.description = s.summary
 
   s.author       = 'Spree Commerce'
   s.email        = 'gems@spreecommerce.com'
-  s.homepage     = 'http://www.spreecommerce.com'
-  s.license      = %q{BSD-3}
+  s.homepage     = 'https://spreecommerce.org'
+  s.license      = 'BSD-3-Clause'
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- spec/*`.split("\n")
@@ -18,6 +23,7 @@ Gem::Specification.new do |s|
 
   spree_version = '>= 3.1.0', '< 4.0'
   s.add_dependency 'spree_core', spree_version
+  s.add_dependency 'spree_extension'
 
   s.add_development_dependency 'braintree'
   s.add_development_dependency 'capybara'
@@ -25,19 +31,21 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'coffee-rails'
   s.add_development_dependency 'database_cleaner'
   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'
-  s.add_development_dependency 'poltergeist'
+  s.add_development_dependency 'pg', '~> 0.18'
   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.2.0
+  version: 3.3.5
 platform: ruby
 authors:
 - Spree Commerce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: spree_extension
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: braintree
   requirement: !ruby/object:Gem::Requirement
@@ -114,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
@@ -174,18 +202,18 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -199,7 +227,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -282,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
@@ -300,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
@@ -340,7 +382,6 @@ files:
 - README.md
 - Rakefile
 - app/models/spree/billing_integration.rb
-- app/models/spree/billing_integration/skrill/quick_checkout.rb
 - app/models/spree/gateway/authorize_net.rb
 - app/models/spree/gateway/authorize_net_cim.rb
 - app/models/spree/gateway/balanced_gateway.rb
@@ -352,6 +393,7 @@ files:
 - app/models/spree/gateway/data_cash.rb
 - app/models/spree/gateway/epay.rb
 - app/models/spree/gateway/eway.rb
+- app/models/spree/gateway/eway_rapid.rb
 - app/models/spree/gateway/maxipago.rb
 - app/models/spree/gateway/migs.rb
 - app/models/spree/gateway/moneris.rb
@@ -367,13 +409,10 @@ files:
 - app/models/spree/gateway/stripe_gateway.rb
 - app/models/spree/gateway/usa_epay_transaction.rb
 - app/models/spree/gateway/worldpay.rb
-- app/models/spree/skrill_transaction.rb
 - config/locales/bg.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/sv.yml
-- config/routes.rb
-- db/migrate/20111118164631_create_skrill_transactions.rb
 - db/migrate/20121017004102_update_braintree_payment_method_type.rb
 - db/migrate/20130213222555_update_stripe_payment_method_type.rb
 - db/migrate/20130415222802_update_balanced_payment_method_type.rb
@@ -382,30 +421,21 @@ files:
 - gemfiles/spree_3_1.gemfile
 - gemfiles/spree_3_2.gemfile
 - gemfiles/spree_master.gemfile
-- lib/active_merchant/billing/skrill.rb
+- 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/controllers/frontend/spree/checkout_controller_decorator.rb
-- lib/controllers/frontend/spree/skrill_status_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
 - lib/views/backend/spree/admin/payments/source_forms/_stripe.html.erb
-- lib/views/backend/spree/admin/payments/source_views/_quickcheckout.html.erb
 - lib/views/backend/spree/admin/payments/source_views/_stripe.html.erb
-- lib/views/frontend/spree/checkout/payment/_quickcheckout.html.erb
 - lib/views/frontend/spree/checkout/payment/_stripe.html.erb
 - script/rails
-- spec/controllers/spree/checkout_controller_spec.rb
-- spec/controllers/spree/skrill_status_controller_spec.rb
-- spec/factories/payment_method_factory.rb
-- spec/factories/skrill_transaction_factory.rb
 - spec/features/stripe_checkout_spec.rb
-- spec/lib/active_merchant/billing_skrill_spec.rb
-- spec/models/billing_integration/skrill_quick_checkout_spec.rb
 - spec/models/gateway/authorize_net_cim_spec.rb
 - spec/models/gateway/authorize_net_spec.rb
 - spec/models/gateway/balanced_gateway_spec.rb
@@ -416,6 +446,7 @@ files:
 - spec/models/gateway/cyber_source_spec.rb
 - spec/models/gateway/data_cache_spec.rb
 - spec/models/gateway/epay_spec.rb
+- spec/models/gateway/eway_rapid_spec.rb
 - spec/models/gateway/eway_spec.rb
 - spec/models/gateway/maxipago_spec.rb
 - spec/models/gateway/moneris_spec.rb
@@ -430,13 +461,12 @@ files:
 - spec/models/gateway/stripe_gateway_spec.rb
 - spec/models/gateway/usa_epay_transaction_spec.rb
 - spec/models/gateway/worldpay_spec.rb
-- spec/models/skrill_transaction_spec.rb
 - spec/spec_helper.rb
 - spec/support/wait_for_stripe.rb
 - spree_gateway.gemspec
-homepage: http://www.spreecommerce.com
+homepage: https://spreecommerce.org
 licenses:
-- BSD-3
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -454,19 +484,12 @@ 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
 test_files:
-- spec/controllers/spree/checkout_controller_spec.rb
-- spec/controllers/spree/skrill_status_controller_spec.rb
-- spec/factories/payment_method_factory.rb
-- spec/factories/skrill_transaction_factory.rb
 - spec/features/stripe_checkout_spec.rb
-- spec/lib/active_merchant/billing_skrill_spec.rb
-- spec/models/billing_integration/skrill_quick_checkout_spec.rb
 - spec/models/gateway/authorize_net_cim_spec.rb
 - spec/models/gateway/authorize_net_spec.rb
 - spec/models/gateway/balanced_gateway_spec.rb
@@ -477,6 +500,7 @@ test_files:
 - spec/models/gateway/cyber_source_spec.rb
 - spec/models/gateway/data_cache_spec.rb
 - spec/models/gateway/epay_spec.rb
+- spec/models/gateway/eway_rapid_spec.rb
 - spec/models/gateway/eway_spec.rb
 - spec/models/gateway/maxipago_spec.rb
 - spec/models/gateway/moneris_spec.rb
@@ -491,6 +515,5 @@ test_files:
 - spec/models/gateway/stripe_gateway_spec.rb
 - spec/models/gateway/usa_epay_transaction_spec.rb
 - spec/models/gateway/worldpay_spec.rb
-- spec/models/skrill_transaction_spec.rb
 - spec/spec_helper.rb
 - spec/support/wait_for_stripe.rb

data/app/models/spree/billing_integration/skrill/quick_checkout.rb

@@ -1,48 +0,0 @@
-module Spree
-  class BillingIntegration::Skrill::QuickCheckout < BillingIntegration
-    preference :merchant_id, :string
-    preference :language, :string, :default => 'EN'
-    preference :currency, :string, :default => 'EUR'
-    preference :payment_options, :string, :default => 'ACC'
-    preference :pay_to_email, :string ,   :default => 'your@merchant.email_here'
-
-    def provider_class
-      ActiveMerchant::Billing::Skrill
-    end
-
-    def redirect_url(order, opts = {})
-      opts.merge! self.preferences
-
-      set_global_options(opts)
-
-      opts[:detail1_text] = order.number
-      opts[:detail1_description] = "Order:"
-
-      opts[:pay_from_email] = order.email
-      opts[:firstname] = order.bill_address.firstname
-      opts[:lastname] = order.bill_address.lastname
-      opts[:address] = order.bill_address.address1
-      opts[:address2] = order.bill_address.address2
-      opts[:phone_number] = order.bill_address.phone.gsub(/\D/,'') if order.bill_address.phone
-      opts[:city] = order.bill_address.city
-      opts[:postal_code] = order.bill_address.zipcode
-      opts[:state] = order.bill_address.state.nil? ? order.bill_address.state_name.to_s : order.bill_address.state.abbr
-      opts[:country] = order.bill_address.country.name
-      opts[:pay_to_email] = self.preferred_pay_to_email
-      opts[:hide_login] = 1
-      opts[:merchant_fields] = 'platform,order_id,payment_method_id'
-      opts[:platform] = 'Spree'
-      opts[:order_id] = order.number
-
-      skrill = self.provider
-      skrill.payment_url(opts)
-    end
-
-    private
-      def set_global_options(opts)
-        opts[:recipient_description] = Spree::Config[:site_name]
-        opts[:payment_methods] = self.preferred_payment_options
-      end
-
-  end
-end

data/app/models/spree/skrill_transaction.rb

@@ -1,19 +0,0 @@
-module Spree
-  class SkrillTransaction < ActiveRecord::Base
-    has_many :payments, :as => :source
-
-    def actions
-      []
-    end
-
-    def self.create_from_postback(params)
-       SkrillTransaction.create(:email => params[:pay_from_email],
-                               :amount => params[:mb_amount],
-                               :currency => params[:mb_currency],
-                               :transaction_id => params[:mb_transaction_id],
-                               :customer_id => params[:customer_id],
-                               :payment_type => params[:payment_type])
-    end
-
-  end
-end

data/config/routes.rb

@@ -1,13 +0,0 @@
-Spree::Core::Engine.add_routes do
-  # Add your extension routes here
-  resources :orders, :only => [] do
-    resource :checkout, :controller => 'checkout' do
-      member do
-        get :skrill_cancel
-        get :skrill_return
-      end
-    end
-  end
-
-  post '/skrill' => 'skrill_status#update'
-end

data/db/migrate/20111118164631_create_skrill_transactions.rb

@@ -1,13 +0,0 @@
-class CreateSkrillTransactions < ActiveRecord::Migration
-  def change
-    create_table :spree_skrill_transactions do |t|
-      t.string :email
-      t.float :amount
-      t.string :currency
-      t.integer :transaction_id
-      t.integer :customer_id
-      t.string :payment_type
-      t.timestamps null: true
-    end
-  end
-end

data/lib/active_merchant/billing/skrill.rb

@@ -1,18 +0,0 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
-    class Skrill < Gateway
-
-      def service_url
-        "https://www.moneybookers.com/app/payment.pl"
-      end
-
-      def payment_url(opts)
-        post = PostData.new
-        post.merge! opts
-
-        "#{service_url}?#{post.to_s}"
-      end
-
-    end
-  end
-end

data/lib/controllers/frontend/spree/checkout_controller_decorator.rb

@@ -1,51 +0,0 @@
-module Spree
-  CheckoutController.class_eval do
-    before_filter :confirm_skrill, :only => [:update]
-
-    def skrill_return
-
-      unless @order.payments.where(:source_type => 'Spree::SkrillTransaction').present?
-        payment_method = PaymentMethod.find(params[:payment_method_id])
-        skrill_transaction = SkrillTransaction.new
-
-        payment = @order.payments.create({:amount => @order.total,
-                                         :source => skrill_transaction,
-                                         :payment_method => payment_method},
-                                         :without_protection => true)
-        payment.started_processing!
-        payment.pend!
-      end
-
-      @order.update_attributes({:state => "complete", :completed_at => Time.now}, :without_protection => true)
-
-      until @order.state == "complete"
-        if @order.next!
-          @order.update_with_updater!
-          state_callback(:after)
-        end
-      end
-
-      @order.finalize!
-
-      flash.notice = Spree.t(:order_processed_successfully)
-      redirect_to completion_route
-    end
-
-    def skrill_cancel
-      flash[:error] = Spree.t(:payment_has_been_cancelled)
-      redirect_to edit_order_path(@order)
-    end
-
-    private
-    def confirm_skrill
-      return unless (params[:state] == "payment") && params[:order] && params[:order][:payments_attributes]
-
-      payment_method = PaymentMethod.find(params[:order][:payments_attributes].first[:payment_method_id])
-      if payment_method.kind_of?(BillingIntegration::Skrill::QuickCheckout)
-        #TODO confirming payment method
-        redirect_to edit_order_checkout_url(@order, :state => 'payment'),
-                    :notice => Spree.t(:complete_skrill_checkout)
-      end
-    end
-  end
-end

data/lib/controllers/frontend/spree/skrill_status_controller.rb

@@ -1,39 +0,0 @@
-module Spree
-  class SkrillStatusController < ApplicationController
-    def update
-      @order = Order.find_by_number!(params[:order_id])
-      payment_method = PaymentMethod.find(params[:payment_method_id])
-      skrill_transaction = SkrillTransaction.create_from_postback params
-
-      payment = @order.payments.where(:state => "pending",
-                                      :payment_method_id => payment_method).first
-
-      if payment
-        payment.source = skrill_transaction
-        payment.save
-      else
-        payment = @order.payments.create(:amount => @order.total,
-                                         :source => skrill_transaction,
-                                         :payment_method => payment_method)
-      end
-
-      payment.started_processing!
-
-       unless payment.completed?
-        case params[:status]
-          when "0"
-            payment.pend #may already be pending
-          when "2" #processed / captured
-            payment.complete!
-          when "-1", "-2"
-            payment.failure!
-          else
-            raise "Unexpected payment status"
-        end
-      end
-
-      render :text => ""
-    end
-
-  end
-end

data/lib/views/backend/spree/admin/payments/source_views/_quickcheckout.html.erb

@@ -1,39 +0,0 @@
-<fieldset>
-  <legend><%= Spree.t(:skrill) %></legend>
-
-  <table class="index">
-    <tr>
-      <th colspan="6"><%= Spree.t(:skrill_transaction) %></th>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:email) %>:</label></td>
-      <td>
-        <%= payment.source.email %>
-      </td>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:skrill_customer_id) %>:</label></td>
-      <td>
-        <%= payment.source.customer_id %>
-      </td>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:skrill_transaction_id) %>:</label></td>
-      <td>
-        <%= payment.source.transaction_id %>
-      </td>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:skrill_payment_type) %>:</label></td>
-      <td>
-        <%= payment.source.payment_type %>
-      </td>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:skrill_payment_currency) %>:</label></td>
-      <td>
-        <%= payment.source.currency %>
-      </td>
-    </tr>
-  </table>
-</fieldset>

data/lib/views/frontend/spree/checkout/payment/_quickcheckout.html.erb

@@ -1,26 +0,0 @@
-<p data-hook="skrill_quick_checkout"></p>
-
-<%
-opts = {}
-opts[:transaction_id] = "#{@order.number}"
-opts[:amount] = @order.total
-opts[:return_url] = skrill_return_order_checkout_url(@order, :token => @order.guest_token,
-                                                             :payment_method_id => payment_method.id)
-opts[:cancel_url] = skrill_cancel_order_checkout_url(@order, :token => @order.guest_token)
-opts[:status_url] = skrill_url
-opts[:payment_method_id] = payment_method.id
-%>
-
-<style>
-  iframe.skrill_frame{
-    border: 0px;
-    width: 500px;
-    height: 500px;
-  }
-</style>
-
-<fieldset id="skrill_payment__<%= payment_method.id %>" data-hook>
-  <legend><%= Spree.t(:payment_information) %></legend>
-  <iframe id="skrill_frame_<%= payment_method.id %>"
-          class="skrill_frame" src="<%= payment_method.redirect_url @order, opts %>"></iframe>
-</fieldset>

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe Spree::CheckoutController do
-  context '#skrill_return' do
-    specify do
-    end
-  end
-
-  context '#skrill_cancel' do
-    specify do
-    end
-  end
-end

data/spec/controllers/spree/skrill_status_controller_spec.rb

@@ -1,8 +0,0 @@
-require 'spec_helper'
-
-describe Spree::SkrillStatusController do
-  context '#update' do
-    specify do
-    end
-  end
-end

data/spec/factories/payment_method_factory.rb

@@ -1,5 +0,0 @@
-FactoryGirl.define do
-  factory :skrill_quick_checkout, class: Spree::BillingIntegration::Skrill::QuickCheckout do
-    name 'Skrill - Quick Checkout'
-  end
-end

data/spec/factories/skrill_transaction_factory.rb

@@ -1,10 +0,0 @@
-FactoryGirl.define do
-  factory :skrill_transaction, class: Spree::SkrillTransaction do
-    email ''
-    amount 0.0
-    currency 'USD'
-    transaction_id nil
-    customer_id nil
-    payment_type nil
-  end
-end

data/spec/lib/active_merchant/billing_skrill_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe ActiveMerchant::Billing::Skrill do
-  let(:url) { 'https://www.moneybookers.com/app/payment.pl' }
-
-  context '.service_url' do
-    it 'return its url' do
-      expect(subject.service_url).to eq url
-    end
-  end
-
-  context '.payment_url' do
-    it 'prepend options to url' do
-      options = { 'hi' => 'you' }
-      expect(subject.payment_url(options)).to eq "#{url}?hi=you"
-    end
-  end
-end

data/spec/models/billing_integration/skrill_quick_checkout_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe Spree::BillingIntegration::Skrill::QuickCheckout, focus: true do
-  let(:quick_checkout) { create(:skrill_quick_checkout) }
-
-  context '.provider_class' do
-    it 'is a Billing::Skrill class' do
-      expect(quick_checkout.provider_class).to eq ::ActiveMerchant::Billing::Skrill
-    end
-  end
-end

data/spec/models/skrill_transaction_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe Spree::SkrillTransaction do
-  let(:skrill_transaction) { create(:skrill_transaction) }
-
-  context '.actions' do
-    it { expect(subject.actions).to match_array([]) }
-  end
-end