Merge pull request #117 from bookmebus/108-support-spree-450-removed-…

…spree-frontend

close #108 support spree v4.5.0

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
           POSTGRES_PASSWORD: mypassword
           POSTGRES_DB: test_db
 
-        ports: ["5432:5432"]
+        ports: ['5432:5432']
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -38,7 +38,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.7.6"
+          ruby-version: '3.2.0'
 
           # bundle-cache might cause problem when upgrading ruby. Disable it when upgrading to solve the problem.
           # bundler-cache: true

.ruby-version

@@ -1 +1 @@
-2.7.6
+3.2.0

Gemfile

@@ -5,8 +5,6 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-gem 'spree', github: 'spree/spree', branch: '4-2-stable'
-
 group :development, :test do
   gem 'brakeman'
   gem 'rails-controller-testing'

app/assets/config/spree_vpago_manifest.js

@@ -0,0 +1 @@
+//= link_tree ../images

config/initializers/assets.rb

@@ -0,0 +1 @@
+Rails.application.config.assets.precompile << 'spree_vpago_manifest.js'

config/initializers/spree_permitted_attributes.rb

@@ -0,0 +1,5 @@
+module Spree
+  module PermittedAttributes
+    @@source_attributes += %i[payment_option payment_id payment_method_id]
+  end
+end

lib/spree_vpago/engine.rb

@@ -5,35 +5,30 @@ class Engine < Rails::Engine
     engine_name 'spree_vpago'
 
     config.autoload_paths += %W[#{config.root}/lib]
-    
+
     # use rspec for tests
     config.generators do |g|
       g.test_framework :rspec
     end
 
-    config.assets.precompile += [
-      'vpago/payway/*',
-    ]
+    initializer 'spree_vpago.environment', before: :load_config_initializers do |_app|
+      Config = Configuration.new
+    end
 
-    def self.activate
-      ::Rails.application.config.spree.payment_methods << Spree::Gateway::Payway
-      ::Rails.application.config.spree.payment_methods << Spree::Gateway::PaywayV2
-      ::Rails.application.config.spree.payment_methods << Spree::Gateway::WingSdk
-      ::Rails.application.config.spree.payment_methods << Spree::Gateway::Acleda
-      ::Rails.application.config.spree.payment_methods << Spree::Gateway::AcledaMobile
+    config.after_initialize do
+      Rails.application.config.spree.payment_methods.concat [
+        Spree::Gateway::Payway,
+        Spree::Gateway::PaywayV2,
+        Spree::Gateway::WingSdk,
+        Spree::Gateway::Acleda,
+        Spree::Gateway::AcledaMobile
+      ]
+    end
 
+    def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
-
-
-      Spree::PermittedAttributes.source_attributes << :payment_option
-      Spree::PermittedAttributes.source_attributes << :payment_id
-      Spree::PermittedAttributes.source_attributes << :payment_method_id
-
-      Spree::Api::ApiHelpers.payment_source_attributes << :payment_option
-      Spree::Api::ApiHelpers.payment_source_attributes << :payment_id
-      Spree::Api::ApiHelpers.payment_source_attributes << :payment_method_id
     end
 
     config.to_prepare(&method(:activate).to_proc)

spec/factories/acleda_mobille_gateways.rb

@@ -1,5 +1,14 @@
 FactoryBot.define do
   factory :acleda_mobile_gateway, class: Spree::Gateway::Payway do
     name { 'Acleda Mobile Gateway' }
+
+    before(:create) do |payway_gateway|
+      if payway_gateway.stores.empty?
+        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+        store = default_store || create(:store)
+
+        payway_gateway.stores << store
+      end
+    end
   end
 end

spec/factories/payway_gateways.rb

@@ -1,5 +1,14 @@
 FactoryBot.define do
   factory :payway_gateway, class: Spree::Gateway::Payway do
     name { 'Payway Payment Gateway' }
+
+    before(:create) do |payway_gateway|
+      if payway_gateway.stores.empty?
+        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+        store = default_store || create(:store)
+
+        payway_gateway.stores << store
+      end
+    end
   end
 end

spec/factories/wing_sdk_gateway.rb

@@ -1,5 +1,14 @@
 FactoryBot.define do
   factory :wing_sdk_gateway, class: Spree::Gateway::WingSdk do
     name { 'WingPay Payment Gateway' }
+
+    before(:create) do |payway_gateway|
+      if payway_gateway.stores.empty?
+        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+        store = default_store || create(:store)
+
+        payway_gateway.stores << store
+      end
+    end
   end
 end

spree_vpago.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  spree_version = '>= 3.2.0', '< 4.3.0'
+  spree_version = '>= 4.5'
   s.add_dependency 'spree_core', spree_version
   s.add_dependency 'spree_api', spree_version
   s.add_dependency 'spree_backend', spree_version
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'spree_dev_tools'
   s.add_development_dependency 'byebug'
-  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'pg'
 
 end