solidus_braintree 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7ae76586a99aff5a6eb02f0ab111d2d7d204c2e4b69cdb67b076b462a724baa
-  data.tar.gz: 4af1563fbbfe0de86743e720779e6afcb229a90d6fa68be6d2528a1ad5aed2a2
+  metadata.gz: a594a4aeb7d585ddd83ce566831645aa8a9dea516d5d843ec0adb19be69706cc
+  data.tar.gz: 281cf7ebd47dffac6f7ba3ff0bcdb58b02b146335c45fa1ce11779875c641296
 SHA512:
-  metadata.gz: 845b6fccabb214dfbda78b8d5480e2efc8c9ecffebb3d41084f57a4c7bd3008f81333f84e43024b9e019006458888cc3d5a46f26073c60ffee9b63c2abd7ecc6
-  data.tar.gz: 00bfd9d0d54cdd8b9abd65d0dd8f9e3b99d6bdcbc4ea3d4540339dad8e584e44c053c1da927e9706ae3898cad6e5f9fbc11fce9f981ce69e3317ea530d2256ef
+  metadata.gz: b6ce1d929444ef3ba0e090dba54c4252a7339cd4f0b7f1d9d2d8216f1496ab85e545903f7e71c0cc517e7899455ca9befe3904174874bf42b2db67204553d25a
+  data.tar.gz: 8b2ddbd7938cfb3b99af2ab28e675e539f3c01a8875cdb9af536e7871e7a79a94978705e5cbf86f87f493415f8aff858b797a479d42b282f259be1d7ae027a08

data/app/decorators/models/solidus_braintree/spree_store_decorator.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module SolidusBraintree
+  module SpreeStoreDecorator
+    def self.prepended(base)
+      base.has_one :braintree_configuration, class_name: "SolidusBraintree::Configuration", dependent: :destroy
+      base.before_create :build_default_configuration
+    end
+
+    private
+
+    def build_default_configuration
+      build_braintree_configuration unless braintree_configuration
+    end
+
+    ::Spree::Store.prepend self
+  end
+end

data/app/decorators/models/solidus_braintree/spree_user_decorator.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module SolidusBraintree
+  module SpreeUserDecorator
+    def self.prepended(base)
+      base.has_one :braintree_customer, class_name: 'SolidusBraintree::Customer', inverse_of: :user
+    end
+
+    ::Spree.user_class.prepend self
+  end
+end

data/app/models/solidus_braintree/address.rb

@@ -12,12 +12,8 @@ module SolidusBraintree
       to: :spree_address
 
     def self.split_name(name)
-      if defined?(Spree::Address::Name)
-        address_name = Spree::Address::Name.new(name)
-        [address_name.first_name, address_name.last_name]
-      else
-        name.strip.split(' ', 2)
-      end
+      address_name = Spree::Address::Name.new(name)
+      [address_name.first_name, address_name.last_name].compact
     end
 
     def initialize(spree_address)

data/bin/dummy-app

@@ -30,6 +30,6 @@ fi
 cd ./dummy-app
 unbundled bundle add solidus --github solidusio/solidus --branch "${BRANCH:-main}" --version '> 0.a'
 unbundled bundle exec rake db:drop db:create
-unbundled bundle exec rails generate solidus:install --auto-accept --payment-method=none --no-seed --no-sample "$@"
+unbundled bundle exec rails generate solidus:install --auto-accept --payment-method=none --no-seed --no-sample --admin-preview=false "$@"
 unbundled bundle add $extension_name --path ..
 unbundled bundle exec rails generate $extension_name:install --migrate --specs=all

data/lib/generators/solidus_braintree/install/install_generator.rb

@@ -59,7 +59,7 @@ module SolidusBraintree
         gsub_file 'config/routes.rb',
           "mount SolidusPaypalBraintree::Engine, at: '/solidus_paypal_braintree'\n", ''
 
-        route "mount SolidusBraintree::Engine, at: '/solidus_braintree'"
+        route "mount SolidusBraintree::Engine, at: '#{solidus_mount_point}solidus_braintree'"
       end
 
       def install_solidus_backend_support
@@ -149,6 +149,12 @@ module SolidusBraintree
 
       private
 
+      def solidus_mount_point
+        mount_point = Spree::Core::Engine.routes.find_script_name({})
+        mount_point += "/" unless mount_point.end_with?("/")
+        mount_point
+      end
+
       def support_code_for(component_name, &block)
         if @components[component_name]
           say_status :install, "[#{engine.engine_name}] solidus_#{component_name}", :blue

data/lib/solidus_braintree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusBraintree
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/solidus_braintree.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'activemerchant', '~> 1.48'
-  spec.add_dependency 'braintree', '~> 3.4'
+  spec.add_dependency 'braintree', '~> 4.2'
   spec.add_dependency 'solidus_api', ['>= 3.4.0.dev', '< 5']
   spec.add_dependency 'solidus_backend', ['>= 3.4.0.dev', '< 5']
   spec.add_dependency 'solidus_core', ['>= 3.4.0.dev', '< 5']

data/spec/support/solidus_braintree/capybara.rb

@@ -4,4 +4,4 @@ RSpec.configure do |config|
   end
 end
 
-Capybara.javascript_driver = (ENV['CAPYBARA_DRIVER'] || :selenium_chrome_headless).to_sym
+Capybara.javascript_driver = (ENV['CAPYBARA_JS_DRIVER'] || :selenium_chrome_headless).to_sym

data/spec/system/frontend/braintree_credit_card_checkout_spec.rb

@@ -98,7 +98,7 @@ RSpec.describe 'entering credit card details', type: :feature, js: true do
 
     it "checks out successfully" do
       within(".confirm-step") do
-        expect(page).to have_content("CONFIRM")
+        expect(page).to have_content(/confirm/i)
       end
 
       check('accept_terms_and_conditions')
@@ -114,7 +114,7 @@ RSpec.describe 'entering credit card details', type: :feature, js: true do
         authenticate_3ds
 
         within(".confirm-step") do
-          expect(page).to have_content("CONFIRM")
+          expect(page).to have_content(/confirm/i)
         end
 
         check('accept_terms_and_conditions')
@@ -177,7 +177,7 @@ RSpec.describe 'entering credit card details', type: :feature, js: true do
         click_button("Save and Continue")
 
         within(".confirm-step") do
-          expect(page).to have_content("CONFIRM")
+          expect(page).to have_content(/confirm/i)
         end
 
         check('accept_terms_and_conditions')

data/spec/system/frontend/paypal_checkout_spec.rb

@@ -152,8 +152,7 @@ RSpec.describe "Checkout", type: :feature, js: true do
   end
 
   def add_mug_to_cart
-    visit root_path
-    click_link mug.name
+    visit product_path(mug)
     click_button "add-to-cart-button"
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_braintree
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Stembolt
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: solidus_api
   requirement: !ruby/object:Gem::Requirement
@@ -174,8 +174,8 @@ files:
 - app/assets/stylesheets/spree/backend/solidus_braintree.scss
 - app/decorators/controllers/solidus_braintree/admin_payments_controller_decorator.rb
 - app/decorators/controllers/solidus_braintree/client_tokens_controller.rb
-- app/decorators/models/solidus_braintree/spree/store_decorator.rb
-- app/decorators/models/solidus_braintree/spree/user_decorator.rb
+- app/decorators/models/solidus_braintree/spree_store_decorator.rb
+- app/decorators/models/solidus_braintree/spree_user_decorator.rb
 - app/helpers/solidus_braintree/braintree_admin_helper.rb
 - app/models/application_record.rb
 - app/models/solidus_braintree/address.rb
@@ -363,7 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.23
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Officially supported Braintree extension

data/app/decorators/models/solidus_braintree/spree/store_decorator.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusBraintree
-  module Spree
-    module StoreDecorator
-      def self.prepended(base)
-        base.has_one :braintree_configuration, class_name: "SolidusBraintree::Configuration", dependent: :destroy
-        base.before_create :build_default_configuration
-      end
-
-      private
-
-      def build_default_configuration
-        build_braintree_configuration unless braintree_configuration
-      end
-
-      ::Spree::Store.prepend self
-    end
-  end
-end

data/app/decorators/models/solidus_braintree/spree/user_decorator.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusBraintree
-  module Spree
-    module UserDecorator
-      def self.prepended(base)
-        base.has_one :braintree_customer, class_name: 'SolidusBraintree::Customer', inverse_of: :user
-      end
-
-      ::Spree.user_class.prepend self
-    end
-  end
-end