solidus_braintree 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2dc626000669163124de96bf97bf6a20aa28078c
-  data.tar.gz: 7a81acc31f411af559dfbe0fb9a023d962d3491d
+SHA256:
+  metadata.gz: e7b840adbe707ae71a8efa483373f9b7c565334c3a00df523d21f9588b04bfed
+  data.tar.gz: 468630e694e339e7fc6691ff1faa294e5b005e65855dc6d011c69d4d67356467
 SHA512:
-  metadata.gz: 79b5a87a130c7389d9900af4a51840e87dab35a7026ac74a6f11a52a2164356e8fcb4457bba78fce3974c3ae879d00045b9b26c58fab8c6f756d783d7e33e898
-  data.tar.gz: 794e78130c00e985767a2c4d136fbc2ef831d9808ff1d45aa13fd7ada5f977323673f065e5d0007d9c9ff1da869829de187aa54cfeb479850b4f981d19a3679e
+  metadata.gz: b311d8caeff246350118fc88d0ad7a5595f5dbdd547be0cc8efb56e6cb2bfba2bbcd0f339369af6a20014fb614605419cee72d1f1575453541b9435b112a8ded
+  data.tar.gz: caaabe07835af1dae23d94ea9b40f1bb3dd27d3f998c0882d342bfcca4db9042091282e331dbf058ec23f690d01885c8621cbbc5ab6d019d65babac9f96dc069

data/.circleci/config.yml

@@ -0,0 +1,35 @@
+version: 2.1
+
+orbs:
+  # Always take the latest version of the orb, this allows us to
+  # run specs against Solidus supported versions only without the need
+  # to change this configuration every time a Solidus version is released
+  # or goes EOL.
+  solidusio_extensions: solidusio/extensions@volatile
+
+jobs:
+  run-specs-with-postgres:
+    executor: solidusio_extensions/postgres
+    steps:
+      - solidusio_extensions/run-tests
+  run-specs-with-mysql:
+    executor: solidusio_extensions/mysql
+    steps:
+      - solidusio_extensions/run-tests
+
+workflows:
+  "Run specs on supported Solidus versions":
+    jobs:
+      - run-specs-with-postgres
+      - run-specs-with-mysql
+  "Weekly run specs against master":
+    triggers:
+      - schedule:
+          cron: "0 0 * * 4" # every Thursday
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      - run-specs-with-postgres
+      - run-specs-with-mysql

data/.github/stale.yml

@@ -0,0 +1 @@
+_extends: .github

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /spec/dummy
+/spec/examples.txt

data/Gemfile

@@ -1,16 +1,33 @@
 source "https://rubygems.org"
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem "solidus", github: "solidusio/solidus", branch: branch
+branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
+solidus_git, solidus_frontend_git = if (branch == 'main') || (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
 
-if branch == 'master' || branch >= "v2.0"
-  gem "rails-controller-testing", group: :test
+# Needed to help Bundler figure out how to resolve dependencies,
+# otherwise it takes forever to resolve them
+if branch == 'main' || Gem::Version.new(branch[1..-1]) >= Gem::Version.new('2.10.0')
+  gem 'rails', '~> 6.0'
+else
+  gem 'rails', '~> 5.0'
 end
 
-gem 'pg'
-gem 'mysql2'
+case ENV['DB']
+when 'mysql'
+  gem 'mysql2'
+when 'postgres'
+  gem 'pg'
+end
+
+gem "rails-controller-testing", group: :test
 
 group :development, :test do
+  gem 'factory_bot', '> 4.10.0'
   gem "pry-rails"
 end
 

data/README.md

@@ -1,11 +1,17 @@
-# solidus_braintree
+# Solidus Braintree
 
-`solidus_braintree` is a gem that adds [Braintree v.zero](https://www.braintreepayments.com/v.zero) support to the [solidus](http://solidus.io/) E-commerce platform.
+[![CircleCI](https://circleci.com/gh/solidusio/solidus_braintree.svg?style=svg)](https://circleci.com/gh/solidusio/solidus_braintree)
+
+`solidus_braintree` is a gem that adds [Braintree v.zero](https://www.braintreepayments.com/v-zero) support to the [solidus](http://solidus.io/) E-commerce platform.
 
 It provides support for credit card and Paypal payment methods via the `Spree::CreditCard`
 
 It will add the braintree-drop-in form for payment methods in the payment form of spree/backend. Spree front-end is currently unsupported.
 
+## DEPRECATION NOTICE :warning: :construction:
+
+This extension is deprecated in favor of [Solidus Paypal Braintree](https://github.com/solidusio/solidus_paypal_braintree).
+
 ## Installation
 
 Add this line to your solidus application's Gemfile:
@@ -30,7 +36,7 @@ Control Panel.
 
 This gem extends your solidus application by adding a `POST /api/payment_client_token` endpoint to you application to generate Braintree payment client token. This endpoint requires an authentication token in your request header.
 
-It creates a new `PaymentMethod` class called `Solidus::Gateway::BraintreeGateway`. You can configure this payment method in the admin and add your Braintree public/private keys and merchant id. The admin will render a Braintree dropin container when prompting you to create an order payment.
+It creates a new `PaymentMethod` class called `Solidus::Gateway::BraintreeGateway`. You can configure this payment method in the admin and add your Braintree public/private keys, merchant id, and the proper environment. Please ensure that the environment value is included among the values listed [here](https://github.com/braintree/braintree_ruby/blob/7660ae6f6d228acee8eaedd1830afafbaf91820f/lib/braintree/configuration.rb#L235), otherwise you will encounter unexpected errors. The admin will render a Braintree dropin container when prompting you to create an order payment.
 
 It adds a json or text `data` field on `Spree::CreditCard` for storing additional information received from Braintree for addtional payment methods.
 

data/app/decorators/lib/solidus_braintree/spree/permitted_attributes_decorator.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module PermittedAttributesDecorator
+  def self.prepended(base)
+    base.singleton_class.prepend SolidusBraintree::PermittedAttributesConcern
+  end
+
+  Spree::PermittedAttributes.singleton_class.prepend(self)
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module CreditCardDecorator
+  def self.prepended(base)
+    base.include SolidusBraintree::SkipRequireCardNumbersConcern
+    base.include SolidusBraintree::AddNameValidationConcern
+    base.include SolidusBraintree::UseDataFieldConcern
+  end
+
+  Spree::CreditCard.prepend(self)
+end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module PaymentDecorator
+  def self.prepended(base)
+    base.include SolidusBraintree::PaymentBraintreeNonceConcern
+    base.include SolidusBraintree::InjectDeviceDataConcern
+  end
+
+  Spree::Payment.prepend(self)
+end

data/app/models/solidus/gateway/braintree_gateway.rb

@@ -1,7 +1,14 @@
 require "braintree"
 
 module Solidus
-  class Gateway::BraintreeGateway < ::Spree::Gateway
+  gateway_superclass =
+    if SolidusSupport.solidus_gem_version < Gem::Version.new('2.3.x')
+      ::Spree::Gateway
+    else
+      ::Spree::PaymentMethod::CreditCard
+    end
+
+  class Gateway::BraintreeGateway < gateway_superclass
     preference :environment, :string
     preference :merchant_id, :string
     preference :public_key, :string
@@ -22,8 +29,14 @@ module Solidus
       'Visa' => 'visa',
     }
 
-    def method_type
-      'braintree'
+    if SolidusSupport.solidus_gem_version < Gem::Version.new('2.3.x')
+      def method_type
+        'braintree'
+      end
+    else
+      def partial_name
+        'braintree'
+      end
     end
 
     def gateway_options

data/app/views/spree/admin/payments/source_forms/_braintree.html.erb

@@ -5,7 +5,7 @@
         <label><%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_number %><br /></label>
       <% end %>
     <% end %>
-    <label><%= radio_button_tag :card, 'new', false, { id: "card_new#{payment_method.id}" } %> <%= Spree.t(:use_new_cc) %></label>
+    <label><%= radio_button_tag :card, 'new', false, { id: "card_new#{payment_method.id}" } %> <%= t('spree.use_new_cc') %></label>
   </div>
 
   <div id="card_form<%= payment_method.id %>" data-hook>
@@ -27,7 +27,7 @@
 
     <div class="clear"></div>
 
-    <%= label_tag "card_address#{payment_method.id}", Spree.t(:billing_address) %>
+    <%= label_tag "card_address#{payment_method.id}", t('spree.billing_address') %>
     <% address = @order.bill_address || @order.ship_address || Spree::Address.build_default %>
     <%= fields_for "#{param_prefix}[address_attributes]", address do |f| %>
       <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => f, :type => "billing" } %>

data/app/views/spree/admin/payments/source_views/_braintree.html.erb

@@ -4,13 +4,13 @@
   <div class="row">
     <div class="alpha six columns">
       <dl>
-        <dt><%= Spree.t(:identifier) %>:</dt>
+        <dt><%= t('spree.identifier') %>:</dt>
         <dd><%= payment.number %></dd>
 
-        <dt><%= Spree.t(:response_code) %>:</dt>
+        <dt><%= t('spree.response_code') %>:</dt>
         <dd><%= braintree_transaction_link(payment.response_code) %></dd>
 
-        <dt><%= Spree.t(:name_on_card) %>:</dt>
+        <dt><%= t('spree.name_on_card') %>:</dt>
         <dd><%= payment.source.name %></dd>
 
         <dt><%= Spree::CreditCard.human_attribute_name(:cc_type) %>:</dt>

data/app/views/spree/api/payments/source_views/_braintree.json.jbuilder

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+json.call(payment_source, :id, :created_at)

data/app/views/spree/checkout/payment/_braintree.html.erb

@@ -7,7 +7,7 @@
     </div>
     <div id="#braintree_paypal_container"></div>
   </div>
-  
+
   <div class="braintree-cc-input">
     <div class="braintree-cc-header">
       <%= t('solidus_braintree.creditcard_header_html') %>
@@ -16,31 +16,31 @@
     <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
     <p class="field">
-      <%= label_tag "name_on_card_#{payment_method.id}", Spree.t(:name_on_card) %><span class="required">*</span><br />
+      <%= label_tag "name_on_card_#{payment_method.id}", t('spree.name_on_card') %><span class="required">*</span><br />
       <%= text_field_tag "#{param_prefix}[name]", "#{@order.billing_firstname} #{@order.billing_lastname}", { id: "name_on_card_#{payment_method.id}", :autocomplete => "cc-name" } %>
     </p>
 
     <p class="field" data-hook="card_number">
-      <%= label_tag "braintree_card_number", Spree.t(:card_number) %><span class="required">*</span><br />
+      <%= label_tag "braintree_card_number", t('spree.card_number') %><span class="required">*</span><br />
       <label for="braintree_card_number" id="braintree_card_number" class="braintree-hosted-field"></label>
       &nbsp;
       <span id="card_type" style="display:none;">
-        ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
-        <span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
+        ( <span id="looks_like" ><%= t('spree.card_type_is') %> <span id="type"></span></span>
+        <span id="unrecognized"><%= t('spree.unrecognized_card_type') %></span>
         )
       </span>
     </p>
 
     <p class="field" data-hook="card_expiration">
-      <%= label_tag "braintree_card_expiry", Spree.t(:expiration) %><span class="required">*</span><br />
+      <%= label_tag "braintree_card_expiry", t('spree.expiration') %><span class="required">*</span><br />
       <label for="braintree_card_expiry" id="braintree_card_expiry" class="braintree-hosted-field"></label>
     </p>
 
     <p class="field" data-hook="card_code">
-      <%= label_tag "braintree_card_code", Spree.t(:card_code) %><span class="required">*</span><br />
+      <%= label_tag "braintree_card_code", t('spree.card_code') %><span class="required">*</span><br />
 
       <label for="braintree_card_code" id="braintree_card_code" class="braintree-hosted-field card-code"></label>
-      <%= link_to "(#{Spree.t(:what_is_this)})", spree.cvv_path, :target => '_blank', "data-hook" => "cvv_link", :id => "cvv_link" %>
+      <%= link_to "(#{t('spree.what_is_this')})", spree.cvv_path, :target => '_blank', "data-hook" => "cvv_link", :id => "cvv_link" %>
     </p>
   </div>
 

data/db/migrate/20150910170527_add_data_to_credit_card.rb

@@ -1,4 +1,4 @@
-class AddDataToCreditCard < ActiveRecord::Migration
+class AddDataToCreditCard < SolidusSupport::Migration[4.2]
   def change
     add_column :spree_credit_cards, :data, :text
   end

data/db/migrate/20160426221931_add_braintree_device_data_to_order.rb

@@ -1,4 +1,4 @@
-class AddBraintreeDeviceDataToOrder < ActiveRecord::Migration
+class AddBraintreeDeviceDataToOrder < SolidusSupport::Migration[4.2]
   def change
     add_column :spree_orders, :braintree_device_data, :text
   end

data/lib/assets/javascripts/spree/backend/braintree/solidus_braintree.js

@@ -1,6 +1,6 @@
 //= require "vendor/braintree"
 
-Spree.routes.payment_client_token_api = Spree.pathFor("api/payment_client_token")
+Spree.pathFor.payment_client_token_api = Spree.pathFor("api/payment_client_token")
 
 var braintreeDropinIntegration;
 var paymentForm = "#new_payment";
@@ -8,7 +8,7 @@ var cardSelector = "#new_payment [name=card]";
 
 var getClientToken = function(onSuccess) {
   return Spree.ajax({
-    url: Spree.routes.payment_client_token_api,
+    url: Spree.pathFor.payment_client_token_api,
     type: "POST",
     data: {
       payment_method_id: $('form input[type=radio]:checked').val()

data/lib/solidus_braintree/version.rb

@@ -1,3 +1,3 @@
 module SolidusBraintree
-  VERSION = "1.1.0"
+  VERSION = "1.3.0"
 end

data/lib/solidus_braintree.rb

@@ -1,3 +1,4 @@
 require "solidus_core"
+require 'solidus_support'
 require "solidus_braintree/version"
 require 'solidus_braintree/engine'

data/solidus_braintree.gemspec

@@ -19,17 +19,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "solidus_api", [">= 1.0.0", "< 3"]
-  spec.add_dependency "solidus_core", [">= 1.0.0", "< 3"]
+  spec.add_dependency "solidus_api", [">= 1.0.0", "< 4"]
+  spec.add_dependency "solidus_core", [">= 1.0.0", "< 4"]
+  spec.add_dependency "solidus_support"
   spec.add_dependency "braintree", "~> 2.46"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'factory_girl', '~> 4.4'
+  spec.add_development_dependency 'factory_bot', '~> 4.4'
   spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'capybara'
+  spec.add_development_dependency 'capybara', '~> 2.18'
   spec.add_development_dependency 'capybara-screenshot'
-  spec.add_development_dependency 'poltergeist', '~> 1.9'
+  spec.add_development_dependency 'webdrivers'
   spec.add_development_dependency 'ffaker'
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_braintree
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -19,7 +19,7 @@ dependencies:
         version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,21 @@ dependencies:
         version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: solidus_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: braintree
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +107,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -124,16 +138,16 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.18'
 - !ruby/object:Gem::Dependency
   name: capybara-screenshot
   requirement: !ruby/object:Gem::Requirement
@@ -149,19 +163,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -295,15 +309,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".github/stale.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - app/controllers/spree/api/braintree_client_token_controller.rb
+- app/decorators/lib/solidus_braintree/spree/permitted_attributes_decorator.rb
+- app/decorators/models/solidus_braintree/spree/credit_card_decorator.rb
+- app/decorators/models/solidus_braintree/spree/payment_decorator.rb
 - app/helpers/braintree_view_helpers.rb
 - app/models/concerns/solidus_braintree/add_name_validation_concern.rb
 - app/models/concerns/solidus_braintree/inject_device_data_concern.rb
@@ -311,13 +329,11 @@ files:
 - app/models/concerns/solidus_braintree/permitted_attributes_concern.rb
 - app/models/concerns/solidus_braintree/skip_require_card_numbers_concern.rb
 - app/models/concerns/solidus_braintree/use_data_field_concern.rb
-- app/models/credit_card_decorator.rb
-- app/models/payment_decorator.rb
-- app/models/permitted_attributes_decorator.rb
 - app/models/solidus/gateway/braintree_gateway.rb
 - app/overrides/spree/checkout/_confirm/braintree_security.html.erb.deface
 - app/views/spree/admin/payments/source_forms/_braintree.html.erb
 - app/views/spree/admin/payments/source_views/_braintree.html.erb
+- app/views/spree/api/payments/source_views/_braintree.json.jbuilder
 - app/views/spree/checkout/payment/_braintree.html.erb
 - app/views/spree/checkout/payment/_braintree_initialization.html.erb
 - bin/console
@@ -341,7 +357,7 @@ homepage: https://solidus.io
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -356,9 +372,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Adds Solidus support for Braintree v.zero Gateway.
 test_files: []

data/.travis.yml

@@ -1,18 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.1
-env:
-  matrix:
-    - SOLIDUS_BRANCH=v1.1 DB=postgres
-    - SOLIDUS_BRANCH=v1.2 DB=postgres
-    - SOLIDUS_BRANCH=v1.3 DB=postgres
-    - SOLIDUS_BRANCH=v1.4 DB=postgres
-    - SOLIDUS_BRANCH=v2.0 DB=postgres
-    - SOLIDUS_BRANCH=master DB=postgres
-    - SOLIDUS_BRANCH=v1.1 DB=mysql
-    - SOLIDUS_BRANCH=v1.2 DB=mysql
-    - SOLIDUS_BRANCH=v1.3 DB=mysql
-    - SOLIDUS_BRANCH=v1.4 DB=mysql
-    - SOLIDUS_BRANCH=v2.0 DB=mysql
-    - SOLIDUS_BRANCH=master DB=mysql

data/app/models/credit_card_decorator.rb

@@ -1,3 +0,0 @@
-Spree::CreditCard.include SolidusBraintree::SkipRequireCardNumbersConcern
-Spree::CreditCard.include SolidusBraintree::AddNameValidationConcern
-Spree::CreditCard.include SolidusBraintree::UseDataFieldConcern

data/app/models/payment_decorator.rb

@@ -1,2 +0,0 @@
-Spree::Payment.include SolidusBraintree::PaymentBraintreeNonceConcern
-Spree::Payment.include SolidusBraintree::InjectDeviceDataConcern

data/app/models/permitted_attributes_decorator.rb

@@ -1 +0,0 @@
-Spree::PermittedAttributes.singleton_class.prepend SolidusBraintree::PermittedAttributesConcern