shoppe-stripe 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 799dd0224374522c7ea870976b4208fc51e540b8
-  data.tar.gz: 5c8c4f53d24a2fe44cb7dc5cde0fc62dfbd221b1
+  metadata.gz: 9f7c16c519990fac8b2345678f3f5d1cd417b2b7
+  data.tar.gz: 57731aa07f763950f3e70d02ec2e95b1cc20bc45
 SHA512:
-  metadata.gz: 26c420bf9427401922b43130f3e7b9b91d6dddc4ff816326a74b8ec894b00deef40fec1e12da59e38110fc75aad763191d5b7464b7090075b1c09f1d87f1862a
-  data.tar.gz: 90ff1d0645daa42a1e2bddc7f491d0fca935057f7f26b9d57d7a037c8358cb7d143c91acbe04057e970fc380f64354d9e86a7fc3bd915d16ba7c4cda882563d9
+  metadata.gz: 2b506aa879c0163669c54c4327ebf5fb5eb18967a1ace2aad3b354289b07ece257618720f14436413d8fb354c03737dfe5e99394c6d5800fd86e83febf366648
+  data.tar.gz: 9ef453f237e66317dd9d6888a87c1472ea4893fcebd1450158b4a5acee7345ee1fa4505d3ed7c48991169207610a079e4abba06c220e949cf5037fe4cc690d3a

data/README.md

@@ -15,7 +15,7 @@ Shoppe store. If you have any questions, please just
 To install the Shoppe Stripe module, just add it to your Gemfile and run `bundle`.
 
 ```ruby
-gem 'shoppe-stripe', :require => 'shoppe/stripe'
+gem "shoppe-stripe", require: "shoppe/stripe"
 ```
 
-For the latest up to date documentation, please see the [Shoppe tutorial page](http://tryshoppe.com/docs/tutorials/payment-gateways).
+For the latest up to date documentation, please see the [Shoppe tutorial page](http://tryshoppe.com/docs/payment-gateways/stripe).

data/lib/shoppe/stripe.rb

@@ -10,11 +10,11 @@ module Shoppe
     class << self
       
       def api_key
-        Shoppe.settings.stripe_api_key
+        ENV["STRIPE_API_KEY"] || Shoppe.settings.stripe_api_key
       end
       
       def publishable_key
-        Shoppe.settings.stripe_publishable_key
+        ENV["STRIPE_PUBLISHABLE_KEY"] || Shoppe.settings.stripe_publishable_key
       end
       
       def setup
@@ -26,9 +26,9 @@ module Shoppe
         
         # When an order is confirmed, attempt to authorise the payment
         Shoppe::Order.before_confirmation do
-          if self.properties['stripe_customer_token']
+          if self.properties['stripe_customer_token'] && self.total > 0.0
             begin
-              charge = ::Stripe::Charge.create({:customer => self.properties['stripe_customer_token'], :amount => (self.total * BigDecimal(100)).round, :currency => Shoppe.settings.stripe_currency, :capture => false}, Shoppe.settings.stripe_api_key)
+              charge = ::Stripe::Charge.create({:customer => self.properties['stripe_customer_token'], :amount => (self.total * BigDecimal(100)).round, :currency => Shoppe.settings.stripe_currency, :capture => false}, Shoppe::Stripe.api_key)
               self.payments.create(:amount => self.total, :method => 'Stripe', :reference => charge.id, :refundable => true, :confirmed => false)
             rescue ::Stripe::CardError
               raise Shoppe::Errors::PaymentDeclined, "Payment was declined by the payment processor."

data/lib/shoppe/stripe/order_extensions.rb

@@ -4,7 +4,7 @@ module Shoppe
       
       def accept_stripe_token(token)
         if token =~ /\Atok/
-          customer = ::Stripe::Customer.create({:description => "Customer for order #{number}", :card => token}, Shoppe.settings.stripe_api_key)
+          customer = ::Stripe::Customer.create({:description => "Customer for order #{number}", :card => token}, Shoppe::Stripe.api_key)
           self.properties['stripe_customer_token'] = customer.id
           self.save
         elsif token =~ /\Acus/ && self.properties[:stripe_customer_token] != token
@@ -20,7 +20,7 @@ module Shoppe
       private
       
       def stripe_customer
-        @stripe_customer ||= ::Stripe::Customer.retrieve(self.properties['stripe_customer_token'], Shoppe.settings.stripe_api_key)
+        @stripe_customer ||= ::Stripe::Customer.retrieve(self.properties['stripe_customer_token'], Shoppe::Stripe.api_key)
       end
       
       def stripe_card

data/lib/shoppe/stripe/payment_extensions.rb

@@ -4,7 +4,7 @@ module Shoppe
       
       def stripe_charge
         return false unless self.method == 'Stripe'
-        @stripe_charge ||= ::Stripe::Charge.retrieve(self.reference, Shoppe.settings.stripe_api_key)
+        @stripe_charge ||= ::Stripe::Charge.retrieve(self.reference, Shoppe::Stripe.api_key)
       end
       
       def transaction_url

data/lib/shoppe/stripe/version.rb

@@ -1,5 +1,5 @@
 module Shoppe
   module Stripe
-    VERSION = '1.2.2'
+    VERSION = '1.3.0'
   end
 end

data/vendor/assets/javascripts/shoppe/stripe/form_handler.coffee

@@ -5,7 +5,7 @@ $ ->
     
     # Build a hash of params which will be sent to Stripe
     stripeCardParams = {}
-    $.each ['number', 'exp_month', 'exp_year', 'cvc', 'name', 'address_line1', 'address_line2', 'address_city', 'address_state', 'address_zip', 'address_country'], (i,f)->
+    $.each ['number', 'exp-month', 'exp-year', 'cvc', 'name', 'address_line1', 'address_line2', 'address_city', 'address_state', 'address_zip', 'address_country'], (i,f)->
       stripeCardParams[f] = $("[data-stripe='#{f}']").val()
     
     # Send the data to Stripe and define a method to be executed when the response
@@ -20,4 +20,4 @@ $ ->
         form.get(0).submit()
     
     # Return false to ensure that the form doesn't submit on first click
-    false
+    false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoppe-stripe
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoppe
@@ -78,7 +78,8 @@ files:
 homepage: http://tryshoppe.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message: Since v1.3.0, the params for exp_month & exp_year have changed
+  - https://git.io/vgl3c
 rdoc_options: []
 require_paths:
 - lib
@@ -94,9 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Stripe module for Shoppe.
 test_files: []
-has_rdoc: