solidus_gateway 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd33b23cda5bbd89e43146000d9393ffd2db9b59
-  data.tar.gz: 9039e6562b3a34e97c41b546ccb6ea17fdfaf5e3
+  metadata.gz: 710620ffc527dde72710f4bee67aefa23197bf3c
+  data.tar.gz: 4b205cfed6e5833e42997b51bd8d7a3244c74092
 SHA512:
-  metadata.gz: 90b077f4c9d281848b72b723cad8a310319b1e240a0a17c41ccda37638e45c5ad884744ee11b2dd6834f545cc0ca840fb28a75042f5f2915acd62e3f1504a924
-  data.tar.gz: e40dcbcc4874aed3ae7b632a2f472c7dcda833910399fbc265dba3a76e488f522defce8b1e79cec5fa6b455c3d4f713a9b082e63808b02211390c5d0b95aaec4
+  metadata.gz: 135237707cb007280b3da732cfb4bccdfba4eeb75b1e62d1ff84c3f727338e597fea4729ab63cfdbecbf79419a1b8d35aab24c80663380bf47ba25e61b7587bb
+  data.tar.gz: 31bad0b8cde415df66ebc11ab00cc664a47495013ceda06336683b76f10bb32f44ad18c34b920cdbc03be9fa16728abd352d26c8c4eedc87318755a8e1718d03

data/.gitignore

@@ -8,3 +8,4 @@ Gemfile.lock
 .rvmrc
 coverage
 .ruby-version
+pkg

data/.travis.yml

@@ -1,23 +1,14 @@
+sudo: false
+cache: bundler
 language: ruby
-before_script:
-  - sh -e /etc/init.d/xvfb start
-  - export DISPLAY=:99.0
-  - bundle exec rake test_app
 env:
-  - DB=sqlite
-  - DB=mysql
-  - DB=postgres
-script:
-  - bundle exec rspec spec
-notifications:
-  email:
-    - ryan@spreecommerce.com
-  irc:
-    use_notice: true
-    skip_join: true
-    channels:
-      - "irc.freenode.org#spree"
+  - SOLIDUS_BRANCH=v1.1   DB=mysql
+  - SOLIDUS_BRANCH=v1.2   DB=mysql
+  - SOLIDUS_BRANCH=v1.3   DB=mysql
+  - SOLIDUS_BRANCH=master DB=mysql
+  - SOLIDUS_BRANCH=v1.1   DB=postgres
+  - SOLIDUS_BRANCH=v1.2   DB=postgres
+  - SOLIDUS_BRANCH=v1.3   DB=postgres
+  - SOLIDUS_BRANCH=master DB=postgres
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 2.1.8

data/Gemfile

@@ -1,9 +1,13 @@
 source "https://rubygems.org"
 
-gem "solidus", github: "solidusio/solidus", branch: "master"
+branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
+gem "solidus", github: "solidusio/solidus", branch: branch
 
 group :development, :test do
   gem "pry-rails"
 end
 
+gem 'pg'
+gem 'mysql2'
+
 gemspec

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

@@ -22,7 +22,7 @@ module Spree
 
     def provider
       provider_instance = super
-      Braintree::Configuration.custom_user_agent = "Spree #{Spree.version}"
+      Braintree::Configuration.custom_user_agent = "solidus_gateway #{SolidusGateway::VERSION}"
       Braintree::Configuration.environment = preferred_environment.to_sym
       Braintree::Configuration.merchant_id = preferred_merchant_id
       Braintree::Configuration.public_key = preferred_public_key

data/circle.yml

@@ -1,6 +1,8 @@
 machine:
   ruby:
     version: 2.1.5
+  pre:
+    - sudo curl --output /usr/local/bin/phantomjs https://s3.amazonaws.com/circle-downloads/phantomjs-2.1.1
 test:
   pre:
     - bundle exec rake test_app

data/config/locales/it.yml

@@ -0,0 +1,30 @@
+---
+it:
+  spree:
+    payment_has_been_cancelled: Il pagamento è stato cancellato.
+    complete_skrill_checkout: Ti preghiamo di completate il checkout Skrill prima di continuare
+    skrill: Skrill
+    skrill_transaction: Transazione
+    skrill_customer_id: ID cliente
+    skrill_transaction_id: ID Transazione
+    skrill_payment_type: Tipo di pagamento
+    skrill_payment_currency: Valuta pagamento
+    log_entry:
+      braintree:
+        message: Message
+        status: Status
+        cc_token: Token carta di credito Braintree
+        customer_id: ID cliente Braintree
+        cvv_result: Risultato CVV
+        avs_result_title: Risultato AVS
+        avs_result:
+          message: Messaggio
+          street_match: Match indirizzo
+          postal_match: Match CAP
+      stripe:
+        message: Message
+        charge_id: ID addebito Stripe
+        card_id: ID carta Stripe
+        cvv_result: Risultato CVV
+        cvc_check: Controllo CVC
+        address_zip_check: Controllo CAP

data/config/routes.rb

@@ -1,4 +1,4 @@
-Spree::Core::Engine.add_routes do
+Spree::Core::Engine.routes.draw do
   resources :orders, only: [] do
     resource :checkout, controller: 'checkout' do
       member do

data/lib/solidus_gateway.rb

@@ -1,4 +1,5 @@
 require "spree_core"
 require "spree_gateway/engine"
+require "solidus_gateway/version"
 require "sass/rails"
 require "coffee_script"

data/lib/solidus_gateway/version.rb

@@ -0,0 +1,3 @@
+module SolidusGateway
+  VERSION = "1.1.0"
+end

data/lib/spree_gateway/engine.rb

@@ -33,6 +33,19 @@ module SpreeGateway
         app.config.spree.payment_methods << Spree::Gateway::SpreedlyCoreGateway
     end
 
+    # The application_id is a class attribute on all gateways and is used to
+    # identify the "source" of the transaction. Braintree has asked us to
+    # provide this value to attribute transactions to Solidus; we do not set
+    # it on all gateways or the base gateway as other gateways' behavior with
+    # the value may differ.
+    initializer "spree.gateway.braintree_gateway.application_id" do |app|
+      # NOTE: if the braintree gem is not loaded, calling ActiveMerchant::Billing::BraintreeBlueGateway crashes
+      # therefore, check here to see if Braintree exists before trying to call it
+      if defined?(Braintree) 
+        ActiveMerchant::Billing::BraintreeBlueGateway.application_id = "Solidus"
+      end
+    end
+
     def self.activate
       if SpreeGateway::Engine.frontend_available?
         Rails.application.config.assets.precompile += [

data/solidus_gateway.gemspec

@@ -1,9 +1,14 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'solidus_gateway/version'
+
 # encoding: UTF-8
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = "solidus_gateway"
-  s.version     = "1.0.1"
+  s.version     = SolidusGateway::VERSION
   s.summary     = "Additional Payment Gateways for Solidus"
   s.description = s.summary
   s.required_ruby_version = ">= 2.1"
@@ -20,6 +25,12 @@ Gem::Specification.new do |s|
 
   s.add_dependency "solidus_core", "~> 1.1"
 
+  # ActiveMerchant v1.58 through v1.59 introduced a breaking change
+  # to the stripe gateway.
+  #
+  # This was resolved in v1.60, but we still need to skip 1.58 & 1.59.
+  s.add_dependency "activemerchant", "~> 1.48", "!= 1.58.0", "!= 1.59.0"
+
   s.add_development_dependency "braintree", "~> 2.0"
   s.add_development_dependency "rspec-rails", "~> 3.2"
   s.add_development_dependency "simplecov"
@@ -28,6 +39,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "coffee-rails"
   s.add_development_dependency "factory_girl", "~> 4.4"
   s.add_development_dependency "capybara"
-  s.add_development_dependency "poltergeist", "~> 1.5.0"
+  s.add_development_dependency "poltergeist", "~> 1.9"
   s.add_development_dependency "database_cleaner", "1.2.0"
 end

data/spec/features/stripe_checkout_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 RSpec.describe "Stripe checkout", type: :feature do
   before do
+    FactoryGirl.create(:store)
     # Set up a zone
     zone = FactoryGirl.create(:zone)
     country = FactoryGirl.create(:country)
@@ -55,9 +56,23 @@ RSpec.describe "Stripe checkout", type: :feature do
     expect(page).to have_content("Your order has been processed successfully")
   end
 
+  it "shows an error with a missing credit card number", js: true do
+    fill_in "Expiration", with: "01 / #{Time.now.year + 1}"
+    click_button "Save and Continue"
+    expect(page).to have_content("Could not find payment information")
+  end
+
+  it "shows an error with a missing expiration date", js: true do
+    fill_in "Card Number", with: "4242 4242 4242 4242"
+    click_button "Save and Continue"
+    expect(page).to have_content("Your card's expiration year is invalid.")
+  end
+
   it "shows an error with an invalid credit card number", js: true do
+    fill_in "Card Number", with: "1111 1111 1111 1111"
+    fill_in "Expiration", with: "01 / #{Time.now.year + 1}"
     click_button "Save and Continue"
-    expect(page).to have_content("This card number looks invalid")
+    expect(page).to have_content("Your card number is incorrect.")
   end
 
   it "shows an error with invalid security fields", js: true do

data/spec/models/gateway/braintree_gateway_spec.rb

@@ -212,7 +212,7 @@ describe Spree::Gateway::BraintreeGateway do
       result = @gateway.authorize(500, @credit_card)
 
       expect(result.success?).to be true
-      expect(result.authorization).to match /\A\w{6}\z/
+      expect(result.authorization).to be_present
       expect(Braintree::Transaction::Status::Authorized).to eq Braintree::Transaction.find(result.authorization).status
     end
 
@@ -223,7 +223,7 @@ describe Spree::Gateway::BraintreeGateway do
 
         @payment.process!
         expect(@payment.log_entries.size).to eq(1)
-        expect(@payment.response_code).to match /\A\w{6}\z/
+        expect(@payment.response_code).to be_present
         expect(@payment.state).to eq 'pending'
 
         transaction = ::Braintree::Transaction.find(@payment.response_code)
@@ -293,7 +293,7 @@ describe Spree::Gateway::BraintreeGateway do
     it 'do capture a previous authorization' do
       @payment.process!
       expect(@payment.log_entries.size).to eq(1)
-      expect(@payment.response_code).to match /\A\w{6}\z/
+      expect(@payment.response_code).to be_present
 
       transaction = ::Braintree::Transaction.find(@payment.response_code)
       expect(transaction.status).to eq Braintree::Transaction::Status::Authorized
@@ -326,7 +326,7 @@ describe Spree::Gateway::BraintreeGateway do
     it 'return a success response with an authorization code' do
       result =  @gateway.purchase(500, @credit_card)
       expect(result.success?).to be true
-      expect(result.authorization).to match /\A\w{6}\z/
+      expect(result.authorization).to be_present
       expect(Braintree::Transaction::Status::SubmittedForSettlement).to eq Braintree::Transaction.find(result.authorization).status
     end
 
@@ -364,7 +364,7 @@ describe Spree::Gateway::BraintreeGateway do
       @payment.process!
 
       expect(@payment.log_entries.size).to eq(1)
-      expect(@payment.response_code).to match /\A\w{6}\z/
+      expect(@payment.response_code).to be_present
 
       transaction = Braintree::Transaction.find(@payment.response_code)
       expect(transaction.status).to eq Braintree::Transaction::Status::SubmittedForSettlement
@@ -390,7 +390,7 @@ describe Spree::Gateway::BraintreeGateway do
 
     # Let's get the payment record associated with the credit
     @payment = @order.payments.last
-    expect(@payment.response_code).to match /\A\w{6}\z/
+    expect(@payment.response_code).to be_present
 
     transaction = ::Braintree::Transaction.find(@payment.response_code)
     expect(transaction.type).to eq Braintree::Transaction::Type::Credit
@@ -407,7 +407,7 @@ describe Spree::Gateway::BraintreeGateway do
     @payment.log_entries.size == 0
     @payment.process! # as done in PaymentsController#create
     @payment.log_entries.size == 1
-    expect(@payment.response_code).to match /\A\w{6}\z/
+    expect(@payment.response_code).to be_present
     expect(@payment.state).to eq 'completed'
 
     transaction = ::Braintree::Transaction.find(@payment.response_code)

data/spec/models/gateway/stripe_gateway_spec.rb

@@ -161,7 +161,8 @@ describe Spree::Gateway::StripeGateway do
       gateway
     end
 
-    let(:order) { Spree::Order.create }
+    let!(:store) { FactoryGirl.create(:store) }
+    let(:order) { Spree::Order.create! }
 
     let(:card) do
       FactoryGirl.create(

data/spec/spec_helper.rb

@@ -9,6 +9,10 @@ require "rspec/rails"
 
 require "capybara/rspec"
 require 'capybara/poltergeist'
+Capybara.register_driver(:poltergeist) do |app|
+  Capybara::Poltergeist::Driver.new app, timeout: 90
+end
+Capybara.javascript_driver = :poltergeist
 
 require "database_cleaner"
 require "braintree"
@@ -45,6 +49,5 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
-  Capybara.javascript_driver = :poltergeist
   FactoryGirl.find_definitions
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_gateway
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -24,6 +24,32 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: activemerchant
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.48'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.58.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.59.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.48'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.58.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.59.0
 - !ruby/object:Gem::Dependency
   name: braintree
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +168,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -208,6 +234,7 @@ files:
 - config/locales/bg.yml
 - config/locales/de.yml
 - config/locales/en.yml
+- config/locales/it.yml
 - config/locales/sv.yml
 - config/routes.rb
 - db/migrate/20111118164631_create_skrill_transactions.rb
@@ -223,6 +250,7 @@ files:
 - lib/controllers/frontend/spree/skrill_status_controller.rb
 - lib/generators/solidus_gateway/install/install_generator.rb
 - lib/solidus_gateway.rb
+- lib/solidus_gateway/version.rb
 - lib/spree_gateway/engine.rb
 - lib/views/backend/spree/admin/log_entries/_braintree.html.erb
 - lib/views/backend/spree/admin/log_entries/_stripe.html.erb