solidus_paypal_braintree 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63e1ccf774638a7a86d78396a9faf2ded82d2ac849bd197c9f554b52d2257d23
-  data.tar.gz: 7aad39ea3e0eb572558213b51093e3fab40fed516a39802e2dafa6ae62914432
+  metadata.gz: c020d3e16f7e113ad45cde24ae56a9df9df4eef47bc0698baf745648cd9f279b
+  data.tar.gz: 94214d4a10a14e6a894d32e859d674bb26476f8159e6b6549eb9b8c849d72f8b
 SHA512:
-  metadata.gz: 3bffb9a52eacfa27ed6633a7f7c01eacc8aec2f0f2b2e25ca5cb1e7ef66556f2486f320260b0544186516a7f87663d3b10ef52c267343089ab822612fb0ca4c2
-  data.tar.gz: 3e4827feb921fc1e2d324408333ef34c89dfb01837bf1973fc998529323cfe2112970ff1d33b8f4d8792ad37df3c474516c9c2d35e5ed0fb03ee6408f969cd85
+  metadata.gz: 9f8f74dfa20c79a7c5b2df844260fd57887b4ccf35aa29724e605661d294ff5584eadc236c1d7a4cfc56b2cfff64913b727b9c029765600734c6874a4574fb79
+  data.tar.gz: 6876a643638762d3f6c6d8a915ea1651eea2f928f5ca3f92a59cbc0fcd81ce59d7ee6a688d9587a362bc9e0460efea6e312cd471c81f96fc7e4a797faab3c967

data/.rubocop.yml

@@ -3,7 +3,7 @@ require:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
 
 Layout/FirstArgumentIndentation:
   EnforcedStyle: consistent

data/Gemfile

@@ -4,7 +4,13 @@ source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
+solidus_git, solidus_frontend_git = if (branch == 'master') || (branch >= 'v3.2')
+                                      %w[solidusio/solidus solidusio/solidus_frontend]
+                                    else
+                                      %w[solidusio/solidus] * 2
+                                    end
+gem 'solidus', github: solidus_git, branch: branch
+gem 'solidus_frontend', github: solidus_frontend_git, branch: branch
 
 gem 'rails', ENV.fetch('RAILS_VERSION', nil)
 

data/app/models/solidus_paypal_braintree/gateway.rb

@@ -11,9 +11,9 @@ module SolidusPaypalBraintree
     # Error message from Braintree that gets returned by a non voidable transaction
     NON_VOIDABLE_STATUS_ERROR_REGEXP = /can only be voided if status is authorized/.freeze
 
-    TOKEN_GENERATION_DISABLED_MESSAGE = 'Token generation is disabled.' \
-                                        ' To re-enable set the `token_generation_enabled` preference on the' \
-                                        ' gateway to `true`.'
+    TOKEN_GENERATION_DISABLED_MESSAGE = 'Token generation is disabled. ' \
+                                        'To re-enable set the `token_generation_enabled` preference on the ' \
+                                        'gateway to `true`.'
 
     ALLOWED_BRAINTREE_OPTIONS = [
       :device_data,

data/lib/solidus_paypal_braintree/factories.rb

@@ -8,8 +8,8 @@ FactoryBot.define do
   # require 'solidus_paypal_braintree/factories'
 
   factory :solidus_paypal_braintree_payment_method, class: SolidusPaypalBraintree::Gateway do
-    name 'Solidus PayPal Braintree Gateway'
-    active true
+    name { 'Solidus PayPal Braintree Gateway' }
+    active { true }
   end
 
   factory :solidus_paypal_braintree_source, class: SolidusPaypalBraintree::Source do
@@ -17,15 +17,15 @@ FactoryBot.define do
     user
 
     trait :credit_card do
-      payment_type SolidusPaypalBraintree::Source::CREDIT_CARD
+      payment_type { SolidusPaypalBraintree::Source::CREDIT_CARD }
     end
 
     trait :paypal do
-      payment_type SolidusPaypalBraintree::Source::PAYPAL
+      payment_type { SolidusPaypalBraintree::Source::PAYPAL }
     end
 
     trait :apple_pay do
-      payment_type SolidusPaypalBraintree::Source::APPLE_PAY
+      payment_type { SolidusPaypalBraintree::Source::APPLE_PAY }
     end
   end
 end

data/lib/solidus_paypal_braintree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusPaypalBraintree
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/lib/views/frontend/solidus_paypal_braintree/payments/_payment.html.erb

@@ -1,12 +1,12 @@
 <br />
-<%= payment.source.display_payment_type %>
+<%= payment.source.try(:display_payment_type) %>
 
-<% if payment.source.paypal? %>
+<% if payment.source.try(:paypal?) %>
   <% if payment.source.respond_to?(:paypal_funding_source) && payment.source.paypal_funding_source.present? %>
     <br />
     <%= t('spree.paypal_funding', funding: payment.source.display_paypal_funding_source) %>
   <% end %>
-<% elsif payment.source.venmo? %>
+<% elsif payment.source.try(:venmo?) %>
   <br />
   <%= payment.source.source_description %>
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_paypal_braintree
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Stembolt
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -276,7 +276,7 @@ metadata:
   homepage_uri: https://github.com/solidusio/solidus_paypal_braintree
   source_code_uri: https://github.com/solidusio/solidus_paypal_braintree
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -291,8 +291,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Officially supported Paypal/Braintree extension
 test_files: []