solidus_braintree 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28f5f6d8e3a10296a22d9b5d9bf9f96f7146b5bb
-  data.tar.gz: f4718eedf1bcc717672fc6b97ff5cf9542f48566
+  metadata.gz: 2dc626000669163124de96bf97bf6a20aa28078c
+  data.tar.gz: 7a81acc31f411af559dfbe0fb9a023d962d3491d
 SHA512:
-  metadata.gz: 54b07c41d17e102b686ff466b4361b07bc6b0b051c53953ee229ea163e05b0dc19f8841e9f866c5ac9bc169b8098f816ae7e3e39fd0d6dff12fc773343c7e4fc
-  data.tar.gz: 7875589e8a6034511cbeed423e44f83cd9adb66de4bea5f94fe5b5d45bbd7ced33c7f58f1f4dce6a339e36979a11afd8224f6582f4c0d55adf8768ec0a119ffa
+  metadata.gz: 79b5a87a130c7389d9900af4a51840e87dab35a7026ac74a6f11a52a2164356e8fcb4457bba78fce3974c3ae879d00045b9b26c58fab8c6f756d783d7e33e898
+  data.tar.gz: 794e78130c00e985767a2c4d136fbc2ef831d9808ff1d45aa13fd7ada5f977323673f065e5d0007d9c9ff1da869829de187aa54cfeb479850b4f981d19a3679e

data/.travis.yml

@@ -1,20 +1,18 @@
 sudo: false
-cache: bundler
 language: ruby
-addons:
-  postgresql: "9.3"
+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.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.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
-script:
-  - bundle exec rake test_app
-  - bundle exec rspec
-rvm:
-  - 2.1.8

data/Gemfile

@@ -1,10 +1,17 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in solidus_braintree.gemspec
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem "solidus", github: "solidusio/solidus", branch: branch
 
+if branch == 'master' || branch >= "v2.0"
+  gem "rails-controller-testing", group: :test
+end
+
 gem 'pg'
 gem 'mysql2'
 
+group :development, :test do
+  gem "pry-rails"
+end
+
 gemspec

data/Rakefile

@@ -1,12 +1,18 @@
-require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require 'spree/testing_support/extension_rake'
 
 RSpec::Core::RakeTask.new(:spec)
 
+require 'bundler'
 Bundler::GemHelper.install_tasks
 
-task default: :spec
+task :default do
+  if Dir["spec/dummy"].empty?
+    Rake::Task[:test_app].invoke
+    Dir.chdir("../../")
+  end
+  Rake::Task[:spec].invoke
+end
 
 desc "Generates a dummy app for testing"
 task :test_app do

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

@@ -7,6 +7,7 @@ module Solidus
     preference :public_key, :string
     preference :private_key, :string
     preference :always_send_bill_address, :boolean, default: false
+    preference :transmit_shipping_address, :boolean, default: true
 
     CARD_TYPE_MAPPING = {
       'American Express' => 'american_express',
@@ -165,6 +166,16 @@ module Solidus
       '123'
     end
 
+    def cancel(response)
+      if voidable?(response)
+        void(response)
+      else
+        handle_result(
+          braintree_gateway.transaction.refund(response)
+        )
+      end
+    end
+
     private
     def message_from_result(result)
       if result.success?
@@ -244,7 +255,9 @@ module Solidus
       params[:options] ||= {}
       params[:amount] = amount(cents)
       params[:channel] ||= "Solidus"
-      params[:shipping] = map_address(options[:shipping_address]) if options[:shipping_address]
+      if (options[:shipping_address] && preferred_transmit_shipping_address)
+        params[:shipping] = map_address(options[:shipping_address])
+      end
 
       if options[:payment_method_nonce]
         params[:payment_method_nonce] = options[:payment_method_nonce]
@@ -254,8 +267,10 @@ module Solidus
 
       # Send the bill address if we're using a nonce (i.e. doing a one-time
       # payment) or if we're configured to always send the bill address
-      if options[:payment_method_nonce] || preferred_always_send_bill_address
-        params[:billing] = map_address(options[:billing_address]) if options[:billing_address]
+      if (
+          options[:payment_method_nonce] || preferred_always_send_bill_address
+        ) && options[:billing_address]
+        params[:billing] = map_address(options[:billing_address])
       end
 
       # if has profile, set the customer_id to the profile_id and delete the customer key

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

@@ -4,8 +4,8 @@
       <% previous_cards.each do |card| %>
         <label><%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_number %><br /></label>
       <% end %>
-      <label><%= radio_button_tag :card, 'new', false, { id: "card_new#{payment_method.id}" } %> <%= Spree.t(:use_new_cc) %></label>
     <% end %>
+    <label><%= radio_button_tag :card, 'new', false, { id: "card_new#{payment_method.id}" } %> <%= Spree.t(:use_new_cc) %></label>
   </div>
 
   <div id="card_form<%= payment_method.id %>" data-hook>

data/lib/solidus_braintree/version.rb

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

data/solidus_braintree.gemspec

@@ -19,8 +19,8 @@ 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", "< 2"]
-  spec.add_dependency "solidus_core", [">= 1.0.0", "< 2"]
+  spec.add_dependency "solidus_api", [">= 1.0.0", "< 3"]
+  spec.add_dependency "solidus_core", [">= 1.0.0", "< 3"]
   spec.add_dependency "braintree", "~> 2.46"
 
   spec.add_development_dependency "bundler", "~> 1.10"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_braintree
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-09-22 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: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !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: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: braintree
   requirement: !ruby/object:Gem::Requirement
@@ -357,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Adds Solidus support for Braintree v.zero Gateway.