payola-payments 1.2.0 → 1.2.1

data/app/models/concerns/payola/plan.rb

@@ -7,7 +7,6 @@ module Payola
     included do
       validates_presence_of :amount
       validates_presence_of :interval
-      validates_presence_of :interval_count
       validates_presence_of :stripe_id
       validates_presence_of :name
 

data/app/models/payola/sale.rb

@@ -2,6 +2,8 @@ require 'aasm'
 
 module Payola
   class Sale < ActiveRecord::Base
+    include Payola::GuidBehavior
+
     has_paper_trail if respond_to? :has_paper_trail
 
     validates_presence_of :email
@@ -10,10 +12,6 @@ module Payola
     validates_presence_of :stripe_token
     validates_presence_of :currency
 
-    validates_uniqueness_of :guid
-
-    before_save :populate_guid
-
     belongs_to :product, polymorphic: true
     belongs_to :owner, polymorphic: true
     belongs_to :coupon
@@ -74,6 +72,10 @@ module Payola
       end      
     end
 
+    def redirector
+      product
+    end
+
     private
 
     def charge_card
@@ -107,13 +109,5 @@ module Payola
       end
     end
 
-    def populate_guid
-      if new_record?
-        while !valid? || self.guid.nil?
-          self.guid = SecureRandom.random_number(1_000_000_000).to_s(32)
-        end
-      end
-    end
-
   end
 end

data/app/models/payola/subscription.rb

@@ -2,6 +2,9 @@ require 'aasm'
 
 module Payola
   class Subscription < ActiveRecord::Base
+    include Payola::GuidBehavior
+
+    has_paper_trail if respond_to? :has_paper_trail
 
     validates_presence_of :email
     validates_presence_of :plan_id
@@ -9,10 +12,6 @@ module Payola
     validates_presence_of :stripe_token
     validates_presence_of :currency
 
-    validates_uniqueness_of :guid
-
-    before_save :populate_guid
-
     belongs_to :plan,  polymorphic: true
     belongs_to :owner, polymorphic: true
     belongs_to :affiliate
@@ -98,8 +97,10 @@ module Payola
       self.ended_at             = Time.at(stripe_sub.ended_at) if stripe_sub.ended_at
       self.trial_start          = Time.at(stripe_sub.trial_start) if stripe_sub.trial_start
       self.trial_end            = Time.at(stripe_sub.trial_end) if stripe_sub.trial_end
+      self.canceled_at          = Time.at(stripe_sub.canceled_at) if stripe_sub.canceled_at
       self.quantity             = stripe_sub.quantity
       self.stripe_status        = stripe_sub.status
+      self.cancel_at_period_end = stripe_sub.cancel_at_period_end
 
       self.save!
       self
@@ -115,6 +116,10 @@ module Payola
       Payola.instrument(instrument_key('plan_changed', false), self)
     end
 
+    def redirector
+      plan
+    end
+
     private
 
     def start_subscription
@@ -149,13 +154,5 @@ module Payola
       end
     end
 
-    def populate_guid
-      if new_record?
-        while !valid? || self.guid.nil?
-          self.guid = SecureRandom.random_number(1_000_000_000).to_s(32)
-        end
-      end
-    end
-
   end
 end

data/app/services/payola/charge_card.rb

@@ -7,40 +7,13 @@ module Payola
       begin
         sale.verify_charge!
 
-        customer = Stripe::Customer.create({
-          card: sale.stripe_token,
-          email: sale.email
-        }, secret_key)
-
-        charge_attributes = {
-          amount: sale.amount,
-          currency: sale.currency,
-          customer: customer.id,
-          description: sale.guid,
-        }.merge(Payola.additional_charge_attributes.call(sale, customer))
-
-        charge = Stripe::Charge.create(charge_attributes, secret_key)
-
-        if charge.respond_to?(:fee)
-          fee = charge.fee
-        else
-          balance = Stripe::BalanceTransaction.retrieve(charge.balance_transaction, secret_key)
-          fee = balance.fee
-        end
-
-        sale.update_attributes(
-          stripe_id:          charge.id,
-          stripe_customer_id: customer.id,
-          card_last4:         charge.card.last4,
-          card_expiration:    Date.new(charge.card.exp_year, charge.card.exp_month, 1),
-          card_type:          charge.card.respond_to?(:brand) ? charge.card.brand : charge.card.type,
-          fee_amount:         fee
-        )
+        customer = create_customer(sale, secret_key)
+        charge = create_charge(sale, customer, secret_key)
+
+        update_sale(sale, customer, charge, secret_key)
+
         sale.finish!
-      rescue Stripe::StripeError => e
-        sale.update_attributes(error: e.message)
-        sale.fail!
-      rescue RuntimeError => e
+      rescue Stripe::StripeError, RuntimeError => e
         sale.update_attributes(error: e.message)
         sale.fail!
       end
@@ -48,5 +21,41 @@ module Payola
       sale
     end
 
+    def self.create_customer(sale, secret_key)
+      Stripe::Customer.create({
+        card: sale.stripe_token,
+        email: sale.email
+      }, secret_key)
+    end
+
+    def self.create_charge(sale, customer, secret_key)
+      charge_attributes = {
+        amount: sale.amount,
+        currency: sale.currency,
+        customer: customer.id,
+        description: sale.guid,
+      }.merge(Payola.additional_charge_attributes.call(sale, customer))
+
+      Stripe::Charge.create(charge_attributes, secret_key)
+    end
+
+    def self.update_sale(sale, customer, charge, secret_key)
+      if charge.respond_to?(:fee)
+        fee = charge.fee
+      else
+        balance = Stripe::BalanceTransaction.retrieve(charge.balance_transaction, secret_key)
+        fee = balance.fee
+      end
+
+      sale.update_attributes(
+        stripe_id:          charge.id,
+        stripe_customer_id: customer.id,
+        card_last4:         charge.card.last4,
+        card_expiration:    Date.new(charge.card.exp_year, charge.card.exp_month, 1),
+        card_type:          charge.card.respond_to?(:brand) ? charge.card.brand : charge.card.type,
+        fee_amount:         fee
+      )
+    end
+
   end
 end

data/app/services/payola/create_plan.rb

@@ -7,9 +7,9 @@ module Payola
         id:                plan.stripe_id,
         amount:            plan.amount,
         interval:          plan.interval,
-        interval_count:    plan.interval_count,
-        currency:          plan.respond_to?(:currency) ? plan.currency : Payola.default_currency,
         name:              plan.name,
+        interval_count:    plan.respond_to?(:interval_count) ? plan.interval_count : nil,
+        currency:          plan.respond_to?(:currency) ? plan.currency : Payola.default_currency,
         trial_period_days: plan.respond_to?(:trial_period_days) ? plan.trial_period_days : nil
       }, secret_key)
     end

data/app/services/payola/invoice_behavior.rb

@@ -0,0 +1,55 @@
+require 'active_support/concern'
+
+module Payola
+  module InvoiceBehavior
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def create_sale_from_event(event)
+        invoice = event.data.object
+
+        return unless invoice.charge
+
+        subscription = Payola::Subscription.find_by!(stripe_id: invoice.subscription)
+        secret_key = Payola.secret_key_for_sale(subscription)
+
+        stripe_sub = Stripe::Customer.retrieve(subscription.stripe_customer_id, secret_key).subscriptions.retrieve(invoice.subscription, secret_key)
+        subscription.sync_with!(stripe_sub)
+
+        sale = create_sale(subscription, invoice)
+
+        charge = Stripe::Charge.retrieve(invoice.charge, secret_key)
+
+        update_sale_with_charge(sale, charge)
+
+        return sale, charge
+      end
+
+      def create_sale(subscription, invoice)
+        Payola::Sale.new do |s|
+          s.email = subscription.email
+          s.state = 'processing'
+          s.owner = subscription
+          s.product = subscription.plan
+          s.stripe_token = 'invoice'
+          s.amount = invoice.total
+          s.currency = invoice.currency
+        end
+      end
+
+      def update_sale_with_charge(sale, charge)
+        sale.stripe_id  = charge.id
+        sale.card_type  = charge.card.respond_to?(:brand) ? charge.card.brand : charge.card.type
+        sale.card_last4 = charge.card.last4
+
+        if charge.respond_to?(:fee)
+          sale.fee_amount = charge.fee
+        else
+          balance = Stripe::BalanceTransaction.retrieve(charge.balance_transaction, secret_key)
+          sale.fee_amount = balance.fee
+        end
+      end
+    end
+
+  end
+end

data/app/services/payola/invoice_failed.rb

@@ -1,36 +1,11 @@
 module Payola
   class InvoiceFailed
-    def self.call(event)
-      invoice = event.data.object
-
-      subscription = Payola::Subscription.find_by!(stripe_id: invoice.subscription)
-      secret_key = Payola.secret_key_for_sale(subscription)
-
-      stripe_sub = Stripe::Customer.retrieve(subscription.stripe_customer_id, secret_key).subscriptions.retrieve(invoice.subscription, secret_key)
-      subscription.sync_with!(stripe_sub)
+    include Payola::InvoiceBehavior
 
-      sale = Payola::Sale.new do |s|
-        s.email = subscription.email
-        s.state = 'processing'
-        s.owner = subscription
-        s.product = subscription.plan
-        s.stripe_token = 'invoice'
-        s.amount = invoice.total
-        s.currency = invoice.currency
-      end
-
-      charge = Stripe::Charge.retrieve(invoice.charge, secret_key)
-
-      sale.stripe_id  = charge.id
-      sale.card_type  = charge.card.respond_to?(:brand) ? charge.card.brand : charge.card.type
-      sale.card_last4 = charge.card.last4
+    def self.call(event)
+      sale, charge = create_sale_from_event(event)
 
-      if charge.respond_to?(:fee)
-        sale.fee_amount = charge.fee
-      else
-        balance = Stripe::BalanceTransaction.retrieve(charge.balance_transaction, secret_key)
-        sale.fee_amount = balance.fee
-      end
+      return unless sale
 
       sale.error = charge.failure_message
       sale.save!

data/app/services/payola/invoice_paid.rb

@@ -1,38 +1,11 @@
 module Payola
   class InvoicePaid
-    def self.call(event)
-      invoice = event.data.object
-
-      return unless invoice.charge
-
-      subscription = Payola::Subscription.find_by!(stripe_id: invoice.subscription)
-
-      secret_key = Payola.secret_key_for_sale(subscription)
-      stripe_sub = Stripe::Customer.retrieve(subscription.stripe_customer_id, secret_key).subscriptions.retrieve(invoice.subscription, secret_key)
-      subscription.sync_with!(stripe_sub)
+    include Payola::InvoiceBehavior
 
-      sale = Payola::Sale.new do |s|
-        s.email = subscription.email
-        s.state = 'processing'
-        s.owner = subscription
-        s.product = subscription.plan
-        s.stripe_token = 'invoice'
-        s.amount = invoice.total
-        s.currency = invoice.currency
-      end
-
-      charge = Stripe::Charge.retrieve(invoice.charge, secret_key)
-
-      sale.stripe_id  = charge.id
-      sale.card_type  = charge.card.respond_to?(:brand) ? charge.card.brand : charge.card.type
-      sale.card_last4 = charge.card.last4
+    def self.call(event)
+      sale, charge = create_sale_from_event(event)
 
-      if charge.respond_to?(:fee)
-        sale.fee_amount = charge.fee
-      else
-        balance = Stripe::BalanceTransaction.retrieve(charge.balance_transaction, secret_key)
-        sale.fee_amount = balance.fee
-      end
+      return unless sale
 
       sale.save!
       sale.finish!

data/lib/payola.rb

@@ -4,6 +4,16 @@ require 'stripe_event'
 require 'jquery-rails'
 
 module Payola
+
+  DEFAULT_EMAILS = {
+    receipt:       [ 'payola.sale.finished', 'Payola::ReceiptMailer', :receipt ],
+    refund:        [ 'charge.refunded',      'Payola::ReceiptMailer', :refund  ],
+    admin_receipt: [ 'payola.sale.finished', 'Payola::AdminMailer',   :receipt ],
+    admin_dispute: [ 'dispute.created',      'Payola::AdminMailer',   :dispute ],
+    admin_refund:  [ 'payola.sale.refunded', 'Payola::AdminMailer',   :refund  ],
+    admin_failure: [ 'payola.sale.failed',   'Payola::AdminMailer',   :failure ],
+  }
+
   class << self
     attr_accessor :publishable_key,
       :publishable_key_retriever,
@@ -17,6 +27,7 @@ module Payola
       :charge_verifier,
       :default_currency,
       :additional_charge_attributes,
+      :guid_generator,
       :pdf_receipt
 
     def configure(&block)
@@ -74,6 +85,7 @@ module Payola
       self.subscribables = {}
       self.additional_charge_attributes = lambda { |sale, customer| { } }
       self.pdf_receipt = false
+      self.guid_generator = lambda { SecureRandom.random_number(1_000_000_000).to_s(32) }
     end
 
     def register_sellable(klass)
@@ -85,20 +97,10 @@ module Payola
     end
 
     def send_email_for(*emails)
-      possible_emails = {
-        receipt:       [ 'payola.sale.finished', Payola::ReceiptMailer, :receipt ],
-        refund:        [ 'charge.refunded',      Payola::ReceiptMailer, :refund  ],
-        admin_receipt: [ 'payola.sale.finished', Payola::AdminMailer,   :receipt ],
-        admin_dispute: [ 'dispute.created',      Payola::AdminMailer,   :dispute ],
-        admin_refund:  [ 'payola.sale.refunded', Payola::AdminMailer,   :refund  ],
-        admin_failure: [ 'payola.sale.failed',   Payola::AdminMailer,   :failure ],
-      }
-
       emails.each do |email|
-        spec = possible_emails[email].dup
+        spec = DEFAULT_EMAILS[email].dup
         if spec
           Payola.subscribe(spec.shift) do |sale|
-
             if sale.is_a?(Stripe::Event)
               sale = Payola::Sale.find_by!(stripe_id: sale.data.object.id)
             end

data/lib/payola/version.rb

@@ -1,3 +1,3 @@
 module Payola
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/concerns/plan_spec.rb

@@ -18,11 +18,6 @@ module Payola
       expect(subscription_plan.valid?).to be false
     end
 
-    it "should validate interval_count" do
-      subscription_plan = build(:subscription_plan, interval_count: nil)
-      expect(subscription_plan.valid?).to be false
-    end
-
     it "should validate stripe_id" do
       subscription_plan = build(:subscription_plan, stripe_id: nil)
       expect(subscription_plan.valid?).to be false

data/spec/controllers/payola/subscriptions_controller_spec.rb

@@ -13,7 +13,16 @@ module Payola
         subscription.should_receive(:save).and_return(true)
         subscription.should_receive(:guid).at_least(1).times.and_return(1)
 
-        CreateSubscription.should_receive(:call).and_return(subscription)
+        CreateSubscription.should_receive(:call).with(
+          'plan_class' => 'subscription_plan',
+          'plan_id' => @plan.id.to_s,
+          'controller' => 'payola/subscriptions',
+          'action' => 'create',
+          'plan' => @plan,
+          'coupon' => nil,
+          'affiliate' => nil          
+        ).and_return(subscription)
+
         Payola.should_receive(:queue!)
         post :create, plan_class: @plan.plan_class, plan_id: @plan.id, use_route: :payola
 

data/spec/controllers/payola/transactions_controller_spec.rb

@@ -13,7 +13,16 @@ module Payola
         sale.should_receive(:save).and_return(true)
         sale.should_receive(:guid).at_least(1).times.and_return('blah')
 
-        CreateSale.should_receive(:call).and_return(sale)
+        CreateSale.should_receive(:call).with(
+          'product_class' => 'product',
+          'permalink' => @product.permalink,
+          'controller' => 'payola/transactions',
+          'action' => 'create',
+          'product' => @product,
+          'coupon' => nil,
+          'affiliate' => nil
+        ).and_return(sale)
+
         Payola.should_receive(:queue!)
         post :create, product_class: @product.product_class, permalink: @product.permalink, use_route: :payola