spree_gateway 3.2.0.beta → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de80caa4522285cd27f1a301ef97b5c8a55b97ac
-  data.tar.gz: b845e06202782fa21dc24ee638037dfc8dab433d
+  metadata.gz: 59d06c29878a6203de1b5ca3c4cd97b88f7ed257
+  data.tar.gz: 7a20a8c0667e50b87bac1cc29781a265b1eba85a
 SHA512:
-  metadata.gz: 48adbc9c754c4ee9bf87577fc7f7ececb41c0bf04e4a938b24b4ff2876fba318f9b6fbf07974e1cdafc01316cc15d3668dd4aa909899dac2646520bc12cee1ba
-  data.tar.gz: 899026855249b287e02426298925d293d03f375d60155543c076560d88b506160107857a7f5e5df79e0cb2cc245d4b15e1f6f8ab5a5ab8db784ef6abe0f84751
+  metadata.gz: 3674f7cc0061a2428959eff085930bca279454526d537df7dfd5d3667e5394d8c2aedcc881333bef6c5a8d5fb37c22c03f936affa9229a3b2f4bddc2a57a3d0b
+  data.tar.gz: 98b84448539919606b6149100def41019f17690fc11b92caf54122d43cf2e6b40c72be7bf27638c7fa187443434ded19a3c445a310a53835224ccf3a781c73a1

data/.gitignore

@@ -2,8 +2,20 @@
 *~
 .#*
 .DS_Store
+.idea
+.localeapp/locales
+.project
+coverage
+default
+Gemfile.lock
 tmp
+nbproject
+pkg
+*.sw?
 spec/dummy
-Gemfile.lock
 .rvmrc
-coverage
+.sass-cache
+public/spree
+.ruby-version
+.ruby-gemset
+gemfiles/*.gemfile.lock

data/.rspec

@@ -1 +1,3 @@
---colour
+--color
+-r spec_helper
+-f documentation

data/.travis.yml

@@ -1,11 +1,28 @@
-before_script:
-  - bundle exec rake test_app
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+sudo: required
+dist: trusty
+
+language: ruby
+
 env:
-  - DB=mysql
   - DB=postgres
-language: ruby
+  - DB=mysql
+
+gemfile:
+  - gemfiles/spree_3_1.gemfile
+  - gemfiles/spree_3_2.gemfile
+  - gemfiles/spree_master.gemfile
+
+script:
+  - bundle exec rake test_app
+  - bundle exec rake spec
+
 rvm:
-  - 2.2.5
-sudo: false
+  - 2.3.1
+  - 2.2.7
+
+addons:
+  apt:
+    packages:
+    - mysql-server-5.6
+    - mysql-client-core-5.6
+    - mysql-client-5.6

data/Appraisals

@@ -0,0 +1,13 @@
+appraise 'spree-3-1' do
+  gem 'spree', '~> 3.1.0'
+end
+
+appraise 'spree-3-2' do
+  gem 'spree', '~> 3.2.0'
+  gem 'rails-controller-testing'
+end
+
+appraise 'spree-master' do
+  gem 'spree', github: 'spree/spree', branch: 'master'
+  gem 'rails-controller-testing'
+end

data/README.md

@@ -1,7 +1,7 @@
 # Spree Gateway
 
-[![Build Status](https://api.travis-ci.org/spree/spree_gateway.png?branch=master)](https://travis-ci.org/spree/spree_gateway)
-[![Code Climate](https://codeclimate.com/github/spree/spree_gateway.png)](https://codeclimate.com/github/spree/spree_gateway)
+[![Build Status](https://api.travis-ci.org/spree/spree_gateway.svg?branch=master)](https://travis-ci.org/spree/spree_gateway)
+[![Code Climate](https://codeclimate.com/github/spree/spree_gateway.svg)](https://codeclimate.com/github/spree/spree_gateway)
 
 Community supported Spree Payment Method Gateways. It works as a wrapper for
 active_merchant gateway. Note that for some gateways you might still need to
@@ -9,32 +9,34 @@ add another gem to your Gemfile to make it work. For example active_merchant
 require `braintree` but it doesn't include that gem on its gemspec. So you
 need to manually add it to your rails app Gemfile.
 
-These can be used with Spree >= 1.0.x (but see note below for necessary changes)
-
-http://guides.spreecommerce.com/developer/payments.html
-
 ## Installation
 
-In your Gemfile:
+1. Add this extension to your Gemfile with this line:
+
+  #### Spree >= 3.1
 
-**Spree edge**
+  ```ruby
+  gem 'spree_gateway', github: 'spree/spree_gateway'
+  ```
 
-```ruby
-gem 'spree'
-gem 'spree_gateway', github: 'spree/spree_gateway', branch: 'master'
-```
+  #### Spree 3.0 and Spree 2.x
 
-**Spree 1.3**
+  ```ruby
+  gem 'spree_gateway', github: 'spree/spree_gateway', branch: 'X-X-stable'
+  ```
 
-```ruby
-gem 'spree', '~> 1.3'
-gem 'spree_gateway', github: 'spree/spree_gateway', branch: '1-3-stable'
-```
+  The `branch` option is important: it must match the version of Spree you're using.
+  For example, use `3-0-stable` if you're using Spree `3-0-stable` or any `3.0.x` version.
 
-Then run from the command line:
+2. Install the gem using Bundler:
+  ```ruby
+  bundle install
+  ```
 
-    $ bundle install
-    $ rails g spree_gateway:install
+3. Copy & run migrations
+  ```ruby
+  bundle exec rails g spree_gateway:install
+  ```
 
 Finally, make sure to **restart your app**. Navigate to *Configuration > Payment Methods > New Payment Method* in the admin panel and you should see that a bunch of additional gateways have been added to the list.
 

data/app/models/spree/gateway/authorize_net.rb

@@ -8,11 +8,11 @@ module Spree
       ActiveMerchant::Billing::AuthorizeNetGateway
     end
 
-    def options_with_test_preference
+    def options
       if !['live','test'].include?(self.preferred_server)
         raise "You must set the 'server' preference in your payment method (Gateway::AuthorizeNet) to either 'live' or 'test'"
       end
-      options_without_test_preference.merge(test: (self.preferred_server != "live") )
+      super().merge(test: (self.preferred_server != "live"))
     end
 
     def cancel(response_code)
@@ -25,7 +25,6 @@ module Spree
 
       response
     end
-    alias_method_chain :options, :test_preference
 
     def credit(amount, response_code, refund, gateway_options = {})
       gateway_options[:card_number] = refund[:originator].payment.source.last_digits

data/app/models/spree/gateway/balanced_gateway.rb

@@ -32,10 +32,9 @@ module Spree
       payment.send(:gateway_error, ex.message)
     end
 
-    def options_with_test_preference
-      options_without_test_preference.merge(:test => self.preferred_test_mode)
+    def options
+      super().merge(:test => self.preferred_test_mode)
     end
-    alias_method_chain :options, :test_preference
 
     def payment_profiles_supported?
       true

data/app/models/spree/gateway/eway.rb

@@ -11,10 +11,8 @@ module Spree
       ActiveMerchant::Billing::EwayGateway
     end
 
-    def options_with_test_preference
-      options_without_test_preference.merge(:test => self.preferred_test_mode)
+    def options
+      super().merge(:test => self.preferred_test_mode)
     end
-
-    alias_method_chain :options, :test_preference
   end
 end

data/app/models/spree/gateway/pay_junction.rb

@@ -7,10 +7,8 @@ module Spree
       ActiveMerchant::Billing::PayJunctionGateway
     end
 
-    def options_with_test_preference
-      options_without_test_preference.merge(:test => self.preferred_test_mode)
+    def options
+      super().merge(:test => self.preferred_test_mode)
     end
-
-    alias_method_chain :options, :test_preference
   end
 end

data/app/models/spree/gateway/payflow_pro.rb

@@ -8,11 +8,8 @@ module Spree
       ActiveMerchant::Billing::PayflowGateway
     end
 
-    def options_with_test_preference
-      options_without_test_preference.merge(:test => self.preferred_test_mode)
+    def options
+      super().merge(:test => self.preferred_test_mode)
     end
-
-    alias_method_chain :options, :test_preference
-
   end
 end

data/app/models/spree/gateway/stripe_gateway.rb

@@ -6,6 +6,13 @@ module Spree
     CARD_TYPE_MAPPING = {
       'American Express' => 'american_express',
       'Diners Club' => 'diners_club',
+      'Discover' => 'discover',
+      'JCB' => 'jcb',
+      'Laser' => 'laser',
+      'Maestro' => 'maestro',
+      'MasterCard' => 'master',
+      'Solo' => 'solo',
+      'Switch' => 'switch',
       'Visa' => 'visa'
     }
 
@@ -61,8 +68,12 @@ module Spree
 
       response = provider.store(creditcard, options)
       if response.success?
+        cc_type=payment.source.cc_type
+        response_cc_type = response.params['sources']['data'].first['brand']
+        cc_type = CARD_TYPE_MAPPING[response_cc_type] if CARD_TYPE_MAPPING.include?(response_cc_type)
+
         payment.source.update_attributes!({
-          cc_type: payment.source.cc_type, # side-effect of update_source!
+          cc_type: cc_type, # side-effect of update_source!
           gateway_customer_profile_id: response.params['id'],
           gateway_payment_profile_id: response.params['default_source'] || response.params['default_card']
         })

data/gemfiles/spree_3_1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "spree", "~> 3.1.0"
+
+gemspec :path => "../"

data/gemfiles/spree_3_2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "spree", "~> 3.2.0"
+gem "rails-controller-testing"
+
+gemspec :path => "../"

data/gemfiles/spree_master.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "spree", :github => "spree/spree", :branch => "master"
+gem "rails-controller-testing"
+
+gemspec :path => "../"

data/spec/features/stripe_checkout_spec.rb

@@ -79,6 +79,7 @@ describe "Stripe checkout", type: :feature do
   it "shows an error with invalid security fields", :js => true do
     fill_in "Card Number", :with => "4242 4242 4242 4242"
     fill_in "Expiration", :with => "01 / #{Time.now.year + 1}"
+    fill_in "Card Code", :with => "99"
     click_button "Save and Continue"
     wait_for_stripe
     expect(page).to have_content("Your card's security code is invalid.")

data/spec/models/gateway/braintree_gateway_spec.rb

@@ -69,8 +69,23 @@ describe Spree::Gateway::BraintreeGateway do
 
   describe 'payment profile failure' do
     before do
-      order = create(:order_with_totals, bill_address: address, ship_address: address)
-      order.update_with_updater!
+      country = Spree::Country.default
+      state   = country.states.first
+      address = create(:address,
+        firstname: 'John',
+        lastname:  'Doe',
+        address1:  '1234 My Street',
+        address2:  'Apt 1',
+        city:      'Washington DC',
+        zipcode:   '20123',
+        phone:     '(555)555-5555',
+        state:     state,
+        country:   country
+      )
+      @address = address
+
+      @order = create(:order_with_totals, bill_address: address, ship_address: address)
+      @order.update_with_updater!
 
       @credit_card = create(:credit_card,
         verification_value: '123',
@@ -82,7 +97,7 @@ describe Spree::Gateway::BraintreeGateway do
     end
 
     it 'should fail creation' do
-      expect{ create(:payment, source: @credit_card, order: order, payment_method: @gateway, amount: 10.00) }.to raise_error
+      expect{ create(:payment, source: @credit_card, order: @order, payment_method: @gateway, amount: 10.00) }.to raise_error Spree::Core::GatewayError
     end
 
   end

data/spec/spec_helper.rb

@@ -14,7 +14,6 @@ require 'capybara-screenshot/rspec'
 require 'database_cleaner'
 require 'ffaker'
 require 'rspec/active_model/mocks'
-require 'rails-controller-testing'
 
 Dir[File.join(File.dirname(__FILE__), "support", "**", "*.rb")].each { |f| require f }
 
@@ -54,10 +53,4 @@ RSpec.configure do |config|
   end
 
   Capybara.javascript_driver = :poltergeist
-
-  [:controller, :view, :request].each do |type|
-    config.include ::Rails::Controller::Testing::TestProcess, type: type
-    config.include ::Rails::Controller::Testing::TemplateAssertions, type: type
-    config.include ::Rails::Controller::Testing::Integration, type: type
-  end
 end

data/spree_gateway.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_gateway'
-  s.version     = '3.2.0.beta'
+  s.version     = '3.2.0'
   s.summary     = 'Additional Payment Gateways for Spree Commerce'
   s.description = s.summary
 
@@ -39,5 +39,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rails-controller-testing'
+  s.add_development_dependency 'appraisal'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_gateway
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta
+  version: 3.2.0
 platform: ruby
 authors:
 - Spree Commerce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -311,7 +311,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-controller-testing
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -333,6 +333,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - Guardfile
 - LICENSE.md
@@ -378,6 +379,9 @@ files:
 - db/migrate/20130415222802_update_balanced_payment_method_type.rb
 - db/migrate/20131008221012_update_paypal_payment_method_type.rb
 - db/migrate/20131112133401_migrate_stripe_preferences.rb
+- gemfiles/spree_3_1.gemfile
+- gemfiles/spree_3_2.gemfile
+- gemfiles/spree_master.gemfile
 - lib/active_merchant/billing/skrill.rb
 - lib/assets/javascripts/spree/frontend/spree_gateway.js
 - lib/assets/stylesheets/spree/frontend/spree_gateway.css
@@ -445,13 +449,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Additional Payment Gateways for Spree Commerce