spree_mollie_gateway 3.2.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e2cca6790b23f484d63d21c1a4fd7b2bf0395669451747997ea74defc395bb1
-  data.tar.gz: b72b07e1cd8f1031778836a93921bd7051b3a8342cff0fad5391b3251421f85b
+  metadata.gz: 7670b2cbf5bea5087da07d54d0ca3136e0d64429bf83afeb09030c1fe4533c0f
+  data.tar.gz: 4524d823f88e2c1de00c6fe57988f5e9b6d505dfa7bd3d8acdc126e5d527f7f7
 SHA512:
-  metadata.gz: 496d9da85c83ccaae696231b382595e9967a8ee78c9e5a2e5fc6181aec5d5ff789e636123265e80f2d5bf3d6758d4e3c7d15d2004aab2df6c80811740cae2a47
-  data.tar.gz: c46c73fccbd1f90d853bb7ddcdcc6637911e52bd99338d7376cfad33397df95c47bd6fa0b30096130e706400360b4ca379df240d53eae60a591f5f804c794ecf
+  metadata.gz: 2036af6da07847e7816c807163a3c61a1f6d755f6538e697ddaea6ea6db856028f4945aee0d7dafdcc25064e99991ee7f82e5e9a6f14a65854acf5f34851d9a3
+  data.tar.gz: a6273f54097c37d9e14d9ef43121046ea3c25a55e1b9e25a75b3dcc8356c3c8a1330117621466788344c423f53457b1c133c07410a145c8a483d5da0c975d543

data/.travis.yml

@@ -4,25 +4,20 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.3.8
-  - 2.4.4
   - 2.5.1
+  - 2.6.5
 
 gemfile:
   - gemfiles/spree_3_5.gemfile
   - gemfiles/spree_3_6.gemfile
   - gemfiles/spree_3_7.gemfile
+  - gemfiles/spree_4_0.gemfile
 
 # Use legacy bundler (1.x) when using Ruby 2.3.x
 before_install:
   - if [ "USE_LEGACY_BUNDLER" != "false" ]; then gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true; fi
   - if [ "USE_LEGACY_BUNDLER" != "false" ]; then gem install bundler -v '< 2'; fi
 
-# Allow failing tests against Spree 3.7.x for now
-matrix:
-  allow_failures:
-    - gemfile: gemfiles/spree_3_7.gemfile
-
 script:
   - bundle exec rake test_app
   - bundle exec rake spec

data/Appraisals

@@ -10,4 +10,10 @@ end
 
 appraise 'spree-3-7' do
   gem 'spree', '~> 3.7.2'
+end
+
+appraise 'spree-4-0' do
+  gem 'spree', '~> 4.0.3'
+  gem 'spree_api', '~> 4.0.3'
+  gem 'rails', '~> 6.0.0'
 end

data/app/controllers/spree/api/v1/shipments_controller_decorator.rb

@@ -1,4 +1,4 @@
-Spree::Api::V1::ShipmentsController.class_eval do
+module Spree::Api::V1::ShipmentsControllerDecorator
   def ship
     unless @shipment.tracking.present?
       # We should enforce entering tracking details, otherwise shipments cannot
@@ -10,3 +10,5 @@ Spree::Api::V1::ShipmentsController.class_eval do
     respond_with(@shipment, default_template: :show)
   end
 end
+
+Spree::Api::V1::ShipmentsController.prepend(Spree::Api::V1::ShipmentsControllerDecorator)

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -20,11 +20,7 @@ module Spree
     end
   end
 
-  CheckoutController.class_eval do
-    prepend CheckoutWithMollie
-
-    private
-
+  module CheckoutControllerDecorator
     def payment_method_id_param
       params[:order][:payments_attributes].first[:payment_method_id]
     end
@@ -38,4 +34,8 @@ module Spree
       (params[:state] === 'payment') && params[:order][:payments_attributes]
     end
   end
+
+  CheckoutController.prepend(CheckoutWithMollie)
+  CheckoutController.prepend(CheckoutControllerDecorator)
+
 end

data/app/models/mollie/client_decorator.rb

@@ -1,4 +1,4 @@
-Mollie::Client.class_eval do
+module Mollie::ClientDecorator
   attr_accessor :version_strings
 
   def initialize(api_key = nil)
@@ -11,3 +11,5 @@ Mollie::Client.class_eval do
     add_version_string OpenSSL::OPENSSL_VERSION.split(' ').slice(0, 2).join '/'
   end
 end
+
+Mollie::Client.prepend(Mollie::ClientDecorator)

data/app/models/spree/address_decorator.rb

@@ -1,4 +1,4 @@
-Spree::Address.class_eval do
+module Spree::AddressDecorator
   def active_merchant_hash
     {
       name: full_name,
@@ -14,3 +14,5 @@ Spree::Address.class_eval do
     }
   end
 end
+
+Spree::Address.prepend(Spree::AddressDecorator)

data/app/models/spree/line_item_decorator.rb

@@ -1,4 +1,5 @@
-Spree::LineItem.class_eval do
+module Spree::LineItemDecorator
+  extend Spree::DisplayMoney
   money_methods :discount_amount, :vat_amount
 
   def discount_amount
@@ -27,3 +28,5 @@ Spree::LineItem.class_eval do
     end
   end
 end
+
+Spree::LineItem.prepend(Spree::LineItemDecorator)

data/app/models/spree/mollie/payment_state_updater.rb

@@ -52,7 +52,7 @@ module Spree
 
       def transition_to_failed!
         @spree_payment.failure! unless @spree_payment.failed?
-        @spree_payment.order.update_attributes(state: 'payment', completed_at: nil) unless @spree_payment.order.paid_or_authorized?
+        @spree_payment.order.update(state: 'payment', completed_at: nil) unless @spree_payment.order.paid_or_authorized?
         MollieLogger.debug("Mollie order is #{@mollie_order.status} and will be marked as failed")
       end
 

data/app/models/spree/order_decorator.rb

@@ -1,4 +1,5 @@
-Spree::Order.class_eval do
+module Spree::OrderDecorator
+  extend Spree::DisplayMoney
   money_methods :order_adjustment_total, :shipping_discount
 
   # Make sure the order confirmation is delivered when the order has been paid for.
@@ -58,3 +59,5 @@ Spree::Order.class_eval do
     order_adjustment_total.abs > 0
   end
 end
+
+Spree::Order.prepend(Spree::OrderDecorator)

data/app/models/spree/payment/gateway_options_decorator.rb

@@ -1,4 +1,4 @@
-Spree::Payment::GatewayOptions.class_eval do
+module Spree::Payment::GatewayOptionsDecorator
   def hash_methods
     %i[
       email
@@ -17,3 +17,5 @@ Spree::Payment::GatewayOptions.class_eval do
     ]
   end
 end
+
+Spree::Payment::GatewayOptions.prepend(Spree::Payment::GatewayOptionsDecorator)

data/app/models/spree/payment/processing_decorator.rb

@@ -1,9 +1,10 @@
-Spree::Payment::Processing.module_eval do
-  def process!(_amount = nil)
+module Spree::Payment::ProcessingDecorator
+  
+  def process!
     if payment_method.is_a? Spree::Gateway::MollieGateway
       process_with_mollie
     else
-      process_with_spree
+      super
     end
   end
 
@@ -11,30 +12,17 @@ Spree::Payment::Processing.module_eval do
     if payment_method.is_a? Spree::Gateway::MollieGateway
       cancel_with_mollie
     else
-      cancel_with_spree
+      super
     end
   end
 
   private
 
-  def cancel_with_spree
-    response = payment_method.cancel(response_code)
-    handle_response(response, :void, :failure)
-  end
-
   def cancel_with_mollie
     response = payment_method.cancel(transaction_id)
     handle_response(response, :void, :failure)
   end
 
-  def process_with_spree
-    if payment_method && payment_method.auto_capture?
-      purchase!
-    else
-      authorize!
-    end
-  end
-
   def process_with_mollie
     amount ||= money.money
     started_processing!
@@ -46,3 +34,5 @@ Spree::Payment::Processing.module_eval do
     handle_response(response, :started_processing, :failure)
   end
 end
+
+Spree::Payment.include(Spree::Payment::ProcessingDecorator)

data/app/models/spree/payment_decorator.rb

@@ -1,4 +1,4 @@
-Spree::Payment.class_eval do
+module Spree::PaymentDecorator
   def transaction_id
     if payment_method.is_a? Spree::Gateway::MollieGateway
       source.transaction_id
@@ -37,3 +37,5 @@ Spree::Payment.class_eval do
     end
   end
 end
+
+Spree::Payment.prepend(Spree::PaymentDecorator)

data/app/models/spree/payment_method_decorator.rb

@@ -1,5 +1,7 @@
-Spree::PaymentMethod.class_eval do
+module Spree::PaymentMethodDecorator
   def gateways(_options = {})
     []
   end
 end
+
+Spree::PaymentMethod.prepend(Spree::PaymentMethodDecorator)

data/app/models/spree/user_decorator.rb

@@ -1,5 +1,9 @@
-Spree.user_class.class_eval do
-  after_create :create_mollie_customer
+module Spree::UserDecorator
+
+  def self.prepended(base)
+    base.after_create :create_mollie_customer
+  end
+
 
   def create_mollie_customer
     # Don't create Mollie customers if spree_auth_devise is not installed.
@@ -12,3 +16,5 @@ Spree.user_class.class_eval do
     update mollie_customer_id: mollie_customer.id
   end
 end
+
+Spree.user_class.prepend(Spree::UserDecorator)

data/gemfiles/spree_4_0.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mollie-api-ruby", "~> 4.2.0"
+gem "spree", "~> 4.0.3"
+gem "spree_api", "~> 4.0.3"
+gem "rails", "~> 6.0.0"
+
+gemspec path: "../"

data/lib/spree_mollie_gateway/factories.rb

@@ -1,3 +1,4 @@
+module SpreeMollieGateway::Factories; end
 FactoryBot.define do
   # Define your Spree extensions Factories within this file to enable applications, and other extensions to use and override them.
   #

data/lib/spree_mollie_gateway/version.rb

@@ -1,3 +1,3 @@
 module SpreeMollieGateway
-  VERSION = '3.2.1'.freeze
+  VERSION = '4.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_mollie_gateway
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Vernon de Goede
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2020-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_backend
@@ -373,6 +373,7 @@ files:
 - gemfiles/spree_3_5.gemfile
 - gemfiles/spree_3_6.gemfile
 - gemfiles/spree_3_7.gemfile
+- gemfiles/spree_4_0.gemfile
 - lib/generators/spree_mollie_gateway/install/install_generator.rb
 - lib/spree_mollie_gateway.rb
 - lib/spree_mollie_gateway/engine.rb
@@ -399,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Mollie payments for Spree Commerce.