solidus_braintree 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a594a4aeb7d585ddd83ce566831645aa8a9dea516d5d843ec0adb19be69706cc
-  data.tar.gz: 281cf7ebd47dffac6f7ba3ff0bcdb58b02b146335c45fa1ce11779875c641296
+  metadata.gz: 7c477c4fb737d9baee566d1ab8b32a9c7392568ff6eeb50626fc6051a207a8bd
+  data.tar.gz: 571f9fcea4d239cba51c81df5f8b4ce311041531a1f1224d38f0958cdce662f1
 SHA512:
-  metadata.gz: b6ce1d929444ef3ba0e090dba54c4252a7339cd4f0b7f1d9d2d8216f1496ab85e545903f7e71c0cc517e7899455ca9befe3904174874bf42b2db67204553d25a
-  data.tar.gz: 8b2ddbd7938cfb3b99af2ab28e675e539f3c01a8875cdb9af536e7871e7a79a94978705e5cbf86f87f493415f8aff858b797a479d42b282f259be1d7ae027a08
+  metadata.gz: 34832b18ee08aa908a519c85c3c4e5d1b2593a540503791105f7a49f23599d851aa58544795e8ae5e5e30c2e2feddc1e7762c9d0e7ee80a6ca682ec3848d66e0
+  data.tar.gz: '085b9c9baad9f06b98239ecaf625fdfe6b32aa025ebd58d5672d06a0202934416262f89675fdea4e9e1c6f0ac321872446e8cecb8e87cca0c4da609b2c7a0dae'

data/.circleci/config.yml

@@ -24,37 +24,36 @@ commands:
           command: |
             export FRONTEND=starter
             sudo gem update --system
-            gem install bundler rails
-            bin/dummy-app
-            bin/rspec
+            gem install bundler rails:'~>7.2'
+            bundle exec rake
       - solidusio_extensions/store-test-results
 
 jobs:
   run-specs-with-postgres:
     executor:
       name: solidusio_extensions/postgres
-      ruby_version: '3.2'
+      ruby_version: "3.2"
     steps:
       - test-with-starter-frontend
 
   run-specs-with-mysql:
     executor:
       name: solidusio_extensions/mysql
-      ruby_version: '3.1'
+      ruby_version: "3.1"
     steps:
       - test-with-starter-frontend
 
   run-specs-with-sqlite:
     executor:
       name: solidusio_extensions/sqlite
-      ruby_version: '3.0'
+      ruby_version: "3.1"
     steps:
       - test-with-starter-frontend
 
   lint-code:
     executor:
       name: solidusio_extensions/sqlite-memory
-      ruby_version: '3.0'
+      ruby_version: "3.1"
     steps:
       - solidusio_extensions/lint-code
 

data/Gemfile

@@ -6,10 +6,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
 gem 'solidus', github: 'solidusio/solidus', branch: branch
 
-# Needed to help Bundler figure out how to resolve dependencies,
-# otherwise it takes forever to resolve them.
-# See https://github.com/bundler/bundler/issues/6677
-gem 'rails', '>0.a'
+gem 'rails', ENV.fetch('RAILS_VERSION', '~> 7.0')
 
 # Provides basic authentication functionality for testing parts of your engine
 gem 'solidus_auth_devise'

data/app/models/solidus_braintree/base_record.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module SolidusBraintree
+  def self.table_name_prefix
+    'solidus_paypal_braintree_'
+  end
+
+  class BaseRecord < ::Spree::Base
+    self.abstract_class = true
+  end
+end

data/app/models/solidus_braintree/configuration.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusBraintree
-  class Configuration < ::Spree::Base
+  class Configuration < BaseRecord
     PAYPAL_BUTTON_PREFERENCES = {
       color: { availables: %w[gold blue silver white black], default: 'white' },
       shape: { availables: %w[pill rect], default: 'rect' },

data/app/models/solidus_braintree/customer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusBraintree
-  class Customer < ApplicationRecord
+  class Customer < BaseRecord
     belongs_to :user, class_name: ::Spree::UserClassHandle.new, optional: true
     has_many :sources, class_name: "SolidusBraintree::Source", inverse_of: :customer, dependent: :destroy
   end

data/app/models/solidus_braintree/gateway.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'braintree'
 require 'solidus_braintree/request_protection'
 
 module SolidusBraintree

data/app/models/solidus_braintree/source.rb

@@ -6,16 +6,18 @@ module SolidusBraintree
   class Source < ::Spree::PaymentSource
     include RequestProtection
 
+    self.table_name = "solidus_paypal_braintree_sources"
+
     PAYPAL = "PayPalAccount"
     APPLE_PAY = "ApplePayCard"
     VENMO = "VenmoAccount"
     CREDIT_CARD = "CreditCard"
 
-    enum paypal_funding_source: {
+    enum :paypal_funding_source, {
       applepay: 0, bancontact: 1, blik: 2, boleto: 3, card: 4, credit: 5, eps: 6, giropay: 7, ideal: 8,
       itau: 9, maxima: 10, mercadopago: 11, mybank: 12, oxxo: 13, p24: 14, paylater: 15, paypal: 16, payu: 17,
       sepa: 18, sofort: 19, trustly: 20, venmo: 21, verkkopankki: 22, wechatpay: 23, zimpler: 24
-    }, _suffix: :funding
+    }, suffix: :funding
 
     belongs_to :user, class_name: ::Spree::UserClassHandle.new, optional: true
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'

data/bin/dummy-app

@@ -14,7 +14,8 @@ function unbundled {
 test "$DB" = "sqlite" && export DB="sqlite3"
 
 rm -rf ./dummy-app
-rails new dummy-app \
+rails_version=`bundle exec ruby -e'require "rails"; puts Rails.version'`
+rails _${rails_version}_ new dummy-app \
   --database=${DB:-sqlite3} \
   --skip-git \
   --skip-keeps \

data/lib/solidus_braintree/version.rb

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

data/lib/solidus_braintree.rb

@@ -2,6 +2,7 @@
 
 require 'solidus_core'
 require 'solidus_support'
+require 'braintree'
 
 require 'solidus_braintree/country_mapper'
 require 'solidus_braintree/request_protection'
@@ -10,7 +11,4 @@ require 'solidus_braintree/version'
 require 'solidus_braintree/engine'
 
 module SolidusBraintree
-  def self.table_name_prefix
-    'solidus_paypal_braintree_'
-  end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solidus_braintree
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Stembolt
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-28 00:00:00.000000000 Z
+date: 2025-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -159,6 +158,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- '7.2'
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -173,13 +173,12 @@ files:
 - app/assets/javascripts/spree/backend/solidus_braintree/promise.js
 - 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/helpers/solidus_braintree/braintree_admin_helper.rb
-- app/models/application_record.rb
 - app/models/solidus_braintree/address.rb
 - app/models/solidus_braintree/avs_result.rb
+- app/models/solidus_braintree/base_record.rb
 - app/models/solidus_braintree/configuration.rb
 - app/models/solidus_braintree/customer.rb
 - app/models/solidus_braintree/gateway.rb
@@ -215,6 +214,7 @@ files:
 - db/migrate/20220104150301_add_venmo_to_braintree_configuration.rb
 - db/migrate/20230109080950_rename_solidus_paypal_braintree_source_type.rb
 - db/migrate/20230210104310_add_device_data_to_braintree_sources.rb
+- lib/controllers/api/solidus_braintree/client_tokens_controller.rb
 - lib/controllers/backend/solidus_braintree/configurations_controller.rb
 - lib/generators/solidus_braintree/install/install_generator.rb
 - lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_active_blue_button_280x48.svg
@@ -345,7 +345,6 @@ metadata:
   homepage_uri: https://github.com/solidusio/solidus_braintree
   source_code_uri: https://github.com/solidusio/solidus_braintree
   changelog_uri: https://github.com/solidusio/solidus_braintree/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -363,8 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Officially supported Braintree extension
 test_files:

data/app/models/application_record.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class ApplicationRecord < ActiveRecord::Base
-  self.abstract_class = true
-end