shoppe-stripe 1.0.2 → 1.1.0

data/lib/shoppe/stripe.rb

@@ -7,19 +7,17 @@ module Shoppe
     class << self
       
       def api_key
-        Shoppe.config['stripe']['api_key']
+        Shoppe.settings.stripe_api_key
       end
       
       def publishable_key
-        Shoppe.config['stripe']['publishable_key']
+        Shoppe.settings.stripe_publishable_key
       end
       
       def setup
-        # Validate the configuration file to ensure stripe has been configured.
-        Shoppe.validate_live_config({'stripe' => ['api_key', 'publishable_key', 'currency']})
+        Shoppe.add_settings_group :stripe, [:stripe_api_key, :stripe_publishable_key, :stripe_currency]
         
         require 'stripe'
-        ::Stripe.api_key = self.api_key
 
         require 'shoppe/stripe/order_extensions'
         Shoppe::Order.send :include, Shoppe::Stripe::OrderExtensions
@@ -28,7 +26,7 @@ module Shoppe
         Shoppe::Order.before_confirmation do
           if self.properties['stripe_customer_token']
             begin
-              charge = ::Stripe::Charge.create(:customer => self.properties['stripe_customer_token'], :amount => self.total_in_pence, :currency => Shoppe.config['stripe']['currency'], :capture => false)
+              charge = ::Stripe::Charge.create({:customer => self.properties['stripe_customer_token'], :amount => self.total_in_pence, :currency => Shoppe.settings.stripe_currency, :capture => false}, Shoppe.settings.stripe_api_key)
               self.paid_at = Time.now
               self.payment_method = 'Stripe'
               self.payment_reference = charge.id

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)
+          customer = ::Stripe::Customer.create({:description => "Customer for order #{number}", :card => token}, Shoppe.settings.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'])
+        @stripe_customer ||= ::Stripe::Customer.retrieve(self.properties['stripe_customer_token'], Shoppe.settings.stripe_api_key)
       end
       
       def stripe_card
@@ -29,7 +29,7 @@ module Shoppe
       
       def stripe_charge
         return false unless self.paid? && self.payment_method == 'Stripe'
-        @stripe_charge ||= ::Stripe::Charge.retrieve(self.payment_reference)
+        @stripe_charge ||= ::Stripe::Charge.retrieve(self.payment_reference, Shoppe.settings.stripe_api_key)
       end
       
     end

data/lib/shoppe/stripe/version.rb

@@ -1,5 +1,5 @@
 module Shoppe
   module Stripe
-    VERSION = '1.0.2'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoppe-stripe
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoppe