tang 0.2.2 → 0.2.4

data/app/models/tang/invoice_item.rb

@@ -13,17 +13,15 @@ module Tang
     validates :currency, presence: true
 
     def self.from_stripe(stripe_invoice_item, invoice)
-      if stripe_invoice_item.plan.present?
-        plan = Plan.find_by(stripe_id: stripe_invoice_item.plan.id)
-      end
+      plan = Plan.find_by(stripe_id: stripe_invoice_item.plan.id) if stripe_invoice_item.plan.present?
 
-      if stripe_invoice_item.type == 'subscription'
-        subscription = Subscription.find_by(stripe_id: stripe_invoice_item.id)
-      else
-        subscription = Subscription.find_by(stripe_id: stripe_invoice_item.subscription)
-      end
-      
-      invoice_item = InvoiceItem.find_or_create_by(stripe_id: stripe_invoice_item.id, invoice: invoice) do |ii|
+      subscription = if stripe_invoice_item.type == 'subscription'
+                       Subscription.find_by(stripe_id: stripe_invoice_item.id)
+                     else
+                       Subscription.find_by(stripe_id: stripe_invoice_item.subscription)
+                     end
+
+      InvoiceItem.find_or_create_by(stripe_id: stripe_invoice_item.id, invoice: invoice) do |ii|
         ii.amount = stripe_invoice_item.amount
         ii.currency = stripe_invoice_item.currency
 
@@ -36,8 +34,6 @@ module Tang
         ii.subscription = subscription
         ii.description = stripe_invoice_item.description
       end
-
-      return invoice_item
     end
 
     def self.search(query)
@@ -45,13 +41,15 @@ module Tang
       if query.present?
         q = "%#{query.downcase}%"
         customer_table = connection.quote_table_name(Customer.table_name)
-        invoice_items = InvoiceItem.joins(:customer, :subscription).
-            where.not(description: nil).
-            where("lower(tang_invoice_items.description) like ? or lower(#{customer_table}.stripe_id) like ? or lower(tang_subscriptions.stripe_id) like ?",
-                q, q, q).
-            distinct
+        invoice_items = InvoiceItem.joins(:customer, :subscription)
+                                   .where.not(description: nil)
+                                   .where(
+                                     "lower(tang_invoice_items.description) like ? or lower(#{customer_table}.stripe_id) like ? or lower(tang_subscriptions.stripe_id) like ?",
+                                     q, q, q
+                                   )
+                                   .distinct
       end
-      return invoice_items
+      invoice_items
     end
   end
 end

data/app/models/tang/plan.rb

@@ -10,11 +10,27 @@ module Tang
     validates :name, presence: true
     validates :amount, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
     validates :currency, length: { is: 3 }
-    validates :interval, inclusion: { in: %w(day week month year) }
-    validates :interval_count, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 1 }, allow_nil: true, if: -> { interval == 'year' }
-    validates :interval_count, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 12 }, allow_nil: true, if: -> { interval == 'month' }
-    validates :interval_count, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 52 }, allow_nil: true, if: -> { interval == 'week' }
-    validates :interval_count, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 365 }, allow_nil: true, if: -> { interval == 'day' }
+    validates :interval, inclusion: { in: %w[day week month year] }
+    validates :interval_count, numericality: {
+      only_integer: true,
+      greater_than: 0,
+      less_than_or_equal_to: 1
+    }, allow_nil: true, if: -> { interval == 'year' }
+    validates :interval_count, numericality: {
+      only_integer: true,
+      greater_than: 0,
+      less_than_or_equal_to: 12
+    }, allow_nil: true, if: -> { interval == 'month' }
+    validates :interval_count, numericality: {
+      only_integer: true,
+      greater_than: 0,
+      less_than_or_equal_to: 52
+    }, allow_nil: true, if: -> { interval == 'week' }
+    validates :interval_count, numericality: {
+      only_integer: true,
+      greater_than: 0,
+      less_than_or_equal_to: 365
+    }, allow_nil: true, if: -> { interval == 'day' }
     validates :trial_period_days, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
     validates :statement_descriptor, length: { maximum: 22 }, format: { without: /[<>"']/ }, allow_nil: true
 
@@ -23,17 +39,16 @@ module Tang
     before_update :update_stripe_plan
     before_destroy :delete_stripe_plan # should be soft delete
 
-    INTERVALS = ['day', 'week', 'month', 'year']
+    INTERVALS = %w[day week month year].freeze
 
     def period_days_from(date)
-      if interval == 'week'
-        return date + interval_count.weeks
-      elsif interval == 'month'
-        return date + interval_count.months
-      elsif interval == 'year'
-        return date + interval_count.years
-      end
-      return date + interval_count.days
+      return date + interval_count.weeks if interval == 'week'
+
+      return date + interval_count.months if interval == 'month'
+
+      return date + interval_count.years if interval == 'year'
+
+      date + interval_count.days
     end
 
     def interval_count
@@ -43,8 +58,8 @@ module Tang
     private
 
     def default_values
-      self.currency = Tang.default_currency if self.currency.nil?
-      self.order = 0 if self.order.nil?
+      self.currency = Tang.default_currency if currency.nil?
+      self.order = 0 if order.nil?
     end
 
     def create_stripe_plan

data/app/models/tang/subscription.rb

@@ -46,7 +46,9 @@ module Tang
     before_save :check_for_upgrade
     after_save :handle_upgrade
 
-    STATUSES = ['trialing', 'active', 'past_due', 'canceled', 'unpaid']
+    attr_writer :end_trial_now, :upgraded
+
+    STATUSES = %w[trialing active past_due canceled unpaid].freeze
 
     def self.from_stripe(stripe_subscription)
       customer = Tang.customer_class.find_by(stripe_id: stripe_subscription.customer)
@@ -56,38 +58,35 @@ module Tang
         subscription.update(coupon: nil, coupon_start: nil) if stripe_subscription.discount.nil?
         return subscription
       end
-      return nil
+      nil
     end
 
     def self.build(stripe_subscription, customer, plan)
-      subscription = Subscription.find_or_create_by(stripe_id: stripe_subscription.id) do |s|
+      Subscription.find_or_create_by(stripe_id: stripe_subscription.id) do |s|
         s.customer = customer
         s.plan = plan
         s.application_fee_percent = stripe_subscription.application_fee_percent
         s.quantity = stripe_subscription.quantity
         # s.tax_percent = stripe_subscription.tax_percent # removed from api in favor of tax rates
-        s.trial_end = DateTime.strptime(stripe_subscription.trial_end.to_s, '%s') if stripe_subscription.trial_end.present?
-        s.coupon = Coupon.find_by(stripe_id: stripe_subscription.discount.coupon.id) if stripe_subscription.discount.present?
+        if stripe_subscription.trial_end.present?
+          s.trial_end = DateTime.strptime(stripe_subscription.trial_end.to_s, '%s')
+        end
+        if stripe_subscription.discount.present?
+          s.coupon = Coupon.find_by(stripe_id: stripe_subscription.discount.coupon.id)
+        end
         s.status = stripe_subscription.status
       end
-      return subscription
     end
 
     def period_start
       invoice = invoices.order(:date).last
-      if invoice.present?
-        # return invoice.period_start
-        return invoice.date
-      end
-      return created_at
+      return invoice.date if invoice.present?
+
+      created_at
     end
 
     def period_end
-      # invoice = invoices.order(:period_start).last
-      # if invoice.present?
-      #   return invoice.period_end
-      # end
-      return plan.period_days_from(period_start)
+      plan.period_days_from(period_start)
     end
 
     def quantity
@@ -95,35 +94,28 @@ module Tang
     end
 
     def stripe_trial_end
-      return 'now' if self.end_trial_now
-      return self.trial_end.to_i if self.trial_end.present?
-      return nil
+      return 'now' if end_trial_now
+      return trial_end.to_i if trial_end.present?
+
+      nil
     end
 
     def end_trial_now
       @end_trial_now || false
     end
 
-    def end_trial_now=(val)
-      @end_trial_now = val
-    end
-
     def upgraded
       @upgraded || false
     end
 
-    def upgraded=(val)
-      @upgraded = val
-    end
-
     def discount_for_plan(plan)
       amount_off = 0
-      if self.coupon.percent_off.present?
-        amount_off = (self.coupon.percent_off.to_f / 100.0) * plan.amount.to_f
-      elsif self.coupon.amount_off.present?
-        amount_off = self.coupon.amount_off
+      if coupon.percent_off.present?
+        amount_off = (coupon.percent_off.to_f / 100.0) * plan.amount.to_f
+      elsif coupon.amount_off.present?
+        amount_off = coupon.amount_off
       end
-      return amount_off
+      amount_off
     end
 
     private
@@ -133,19 +125,19 @@ module Tang
     # end
 
     def check_for_upgrade
-      if plan_id_changed?
-        old_plan = Plan.find(plan_id_was) if plan_id_was.present?
-        self.upgraded = true if old_plan.nil? || old_plan.order < plan.order
-      end
+      return unless plan_id_changed?
+
+      old_plan = Plan.find(plan_id_was) if plan_id_was.present?
+      self.upgraded = true if old_plan.nil? || old_plan.order < plan.order
     end
 
     def handle_upgrade
-      if self.upgraded
-        if Tang.delayed_email
-          SubscriptionMailer.upgraded(self).deliver_later
-        else
-          SubscriptionMailer.upgraded(self).deliver_now
-        end
+      return unless upgraded
+
+      if Tang.delayed_email
+        SubscriptionMailer.upgraded(self).deliver_later
+      else
+        SubscriptionMailer.upgraded(self).deliver_now
       end
     end
 

data/app/services/tang/apply_customer_discount.rb

@@ -15,7 +15,7 @@ module Tang
         end
       end
 
-      return customer
+      customer
     end
   end
-end
+end

data/app/services/tang/apply_subscription_discount.rb

@@ -17,7 +17,7 @@ module Tang
         subscription.errors.add(:base, :invalid, message: e.message)
       end
 
-      return subscription
+      subscription
     end
   end
-end
+end

data/app/services/tang/cancel_subscription.rb

@@ -7,7 +7,7 @@ module Tang
       rescue Stripe::StripeError => e
         subscription.errors.add(:base, :invalid, message: e.message)
       end
-      return subscription
+      subscription
     end
   end
-end
+end

data/app/services/tang/change_subscription.rb

@@ -1,8 +1,8 @@
 module Tang
   class ChangeSubscription
     def self.call(subscription, plan)
-      return subscription if !subscription.valid?
-        
+      return subscription unless subscription.valid?
+
       begin
         stripe_sub = Stripe::Subscription.retrieve(subscription.stripe_id)
         stripe_sub.plan = plan.stripe_id
@@ -13,7 +13,7 @@ module Tang
         subscription.errors.add(:base, :invalid, message: e.message)
       end
 
-      return subscription
+      subscription
     end
   end
-end
+end

data/app/services/tang/create_coupon.rb

@@ -1,9 +1,7 @@
 module Tang
   class CreateCoupon
     def self.call(coupon)
-      if !coupon.valid?
-        return coupon
-      end
+      return coupon unless coupon.valid?
 
       begin
         Stripe::Coupon.create(
@@ -21,7 +19,7 @@ module Tang
         return coupon
       end
 
-      return coupon
+      coupon
     end
   end
-end
+end

data/app/services/tang/create_invoice.rb

@@ -11,7 +11,7 @@ module Tang
         end
       end
 
-      return invoice
+      invoice
     end
   end
-end
+end

data/app/services/tang/create_plan.rb

@@ -1,27 +1,28 @@
 module Tang
   class CreatePlan
     def self.call(plan)
-      if !plan.valid?
-        return plan
-      end
+      return plan unless plan.valid?
 
       begin
+        stripe_product = Stripe::Product.create({ name: plan.name, type: 'service' })
+
         Stripe::Plan.create(
           id: plan.stripe_id,
-          name: plan.name,
+          # name: plan.name,
+          product: stripe_product.id,
           currency: plan.currency,
           amount: plan.amount,
           interval: plan.interval,
           interval_count: plan.interval_count,
-          trial_period_days: plan.trial_period_days,
-          statement_descriptor: plan.statement_descriptor,
+          trial_period_days: plan.trial_period_days
+          # statement_descriptor: plan.statement_descriptor
         )
       rescue Stripe::StripeError => e
         plan.errors.add(:base, :invalid, message: e.message)
         return plan
       end
 
-      return plan
+      plan
     end
   end
-end
+end

data/app/services/tang/create_subscription.rb

@@ -1,16 +1,18 @@
 module Tang
   class CreateSubscription
     def self.call(plan, customer, token)
+      puts "CreateSubscription.call(#{plan}, #{customer}, #{token})"
       subscription = Subscription.new(
-        plan: plan, 
-        customer: customer, 
+        plan: plan,
+        customer: customer,
         coupon: customer.subscription_coupon
       )
       return subscription if plan.nil? || customer.nil?
 
-      # TODO: Check for token presence. 
-      # A nil token will throw an error when calling create_stripe_subscription 
+      # Check for token presence.
+      # A nil token will throw an error when calling create_stripe_subscription
       # because the customer does not have a payment method.
+      return subscription if token.nil? && customer.stripe_id.blank?
 
       begin
         if customer.stripe_id.blank?
@@ -33,61 +35,62 @@ module Tang
         # Save the payment method
         stripe_card = Stripe::Customer.retrieve_source(
           stripe_customer.id,
-          stripe_customer.default_source,
+          stripe_customer.default_source
         )
 
         # Finalize customer with subscription and payment method
         finalize_customer(customer, subscription, stripe_card)
-
       rescue Stripe::StripeError => e
         subscription.errors.add(:base, :invalid, message: e.message)
       end
-      return subscription
+      subscription
     end
 
     def self.create_stripe_customer(customer, token)
+      puts "create_stripe_customer(#{customer}, #{token})"
       if customer.coupon.present?
-        stripe_customer = Stripe::Customer.create(
+        Stripe::Customer.create(
           source: token,
           email: customer.email,
           coupon: customer.coupon.stripe_id
         )
       else
-        stripe_customer = Stripe::Customer.create(
+        Stripe::Customer.create(
           source: token,
           email: customer.email
         )
       end
-      return stripe_customer
     end
 
     def self.update_stripe_customer(customer, token)
+      puts "update_stripe_customer(#{customer}, #{token})"
       # Update the payment method
       stripe_customer = Stripe::Customer.retrieve(customer.stripe_id)
       if token.present?
         stripe_customer.source = token
         stripe_customer.save
       end
-      return stripe_customer
+      stripe_customer
     end
 
     def self.create_stripe_subscription(customer, plan)
+      puts "create_stripe_subscription(#{customer}, #{plan})"
       if customer.subscription_coupon.present?
-        stripe_sub = Stripe::Subscription.create(
+        Stripe::Subscription.create(
           customer: customer.stripe_id,
           plan: plan.stripe_id,
           coupon: customer.subscription_coupon.stripe_id
         )
       else
-        stripe_sub = Stripe::Subscription.create(
+        Stripe::Subscription.create(
           customer: customer.stripe_id,
           plan: plan.stripe_id
         )
       end
-      return stripe_sub
     end
 
     def self.finalize_customer(customer, subscription, stripe_card)
+      puts "finalize_customer(#{customer}, #{subscription}, #{stripe_card})"
       # Remove temporary coupon
       customer.subscription_coupon = nil
       # Save subscription data to customer
@@ -96,4 +99,4 @@ module Tang
       customer.update_card_from_stripe(stripe_card)
     end
   end
-end
+end

data/app/services/tang/delete_card.rb

@@ -4,12 +4,12 @@ module Tang
       begin
         Stripe::Customer.delete_source(
           card.customer.stripe_id,
-          card.stripe_id,
+          card.stripe_id
         )
       rescue Stripe::StripeError => e
         card.errors.add(:base, :invalid, message: e.message)
       end
-      return card
+      card
     end
   end
-end
+end

data/app/services/tang/delete_coupon.rb

@@ -3,11 +3,11 @@ module Tang
     def self.call(coupon)
       begin
         c = Stripe::Coupon.retrieve(coupon.stripe_id)
-        c.delete        
+        c.delete
       rescue Stripe::StripeError => e
         coupon.errors.add(:base, :invalid, message: e.message)
       end
-      return coupon
+      coupon
     end
   end
-end
+end

data/app/services/tang/delete_customer.rb

@@ -9,7 +9,7 @@ module Tang
           customer.errors.add(:base, :invalid, message: e.message)
         end
       end
-      return customer
+      customer
     end
   end
-end
+end

data/app/services/tang/delete_plan.rb

@@ -7,7 +7,7 @@ module Tang
       rescue Stripe::StripeError => e
         plan.errors.add(:base, :invalid, message: e.message)
       end
-      return plan
+      plan
     end
   end
-end
+end

data/app/services/tang/fail_invoice.rb

@@ -18,11 +18,10 @@ module Tang
         subscription = Subscription.from_stripe(stripe_subscription)
         invoice.update(subscription: subscription)
       end
-      if subscription.present?
-        subscription.fail! if !subscription.past_due?
-      end
-      
-      return charge
+
+      subscription.fail! if subscription.present? && !subscription.past_due?
+
+      charge
     end
   end
-end
+end

data/app/services/tang/pay_invoice.rb

@@ -1,7 +1,6 @@
 module Tang
   class PayInvoice
     def self.call(stripe_invoice)
-
       # ensure the subscription exists
       stripe_subscription = Stripe::Subscription.retrieve(stripe_invoice.subscription)
       subscription = Subscription.find_by(stripe_id: stripe_invoice.subscription)
@@ -28,7 +27,7 @@ module Tang
         customer.update_subscription_end(subscription)
       end
 
-      return charge
+      charge
     end
   end
-end
+end

data/app/services/tang/refresh_invoice_pdf.rb

@@ -0,0 +1,9 @@
+module Tang
+  class RefreshInvoicePdf
+    def self.call(invoice)
+      stripe_invoice = Stripe::Invoice.retrieve(invoice.stripe_id)
+      invoice.update(invoice_pdf: stripe_invoice.invoice_pdf)
+      invoice
+    end
+  end
+end

data/app/services/tang/remove_customer_discount.rb

@@ -10,7 +10,7 @@ module Tang
 
       customer.update(coupon: nil, coupon_start: nil)
 
-      return customer
+      customer
     end
   end
-end
+end

data/app/services/tang/remove_subscription_discount.rb

@@ -2,14 +2,14 @@ module Tang
   class RemoveSubscriptionDiscount
     def self.call(subscription)
       begin
-        Stripe::Subscription.retrieve(subscription.stripe_id).delete_discount()
+        Stripe::Subscription.retrieve(subscription.stripe_id).delete_discount
       rescue Stripe::StripeError => e
         subscription.errors.add(:base, :invalid, message: e.message)
       end
 
       subscription.update(coupon: nil, coupon_start: nil)
 
-      return subscription
+      subscription
     end
   end
-end
+end

data/app/services/tang/save_card.rb

@@ -1,11 +1,11 @@
 module Tang
   class SaveCard
     def self.call(customer, token)
-      if customer.card.present?
-        card = customer.card
-      else
-        card = Card.new(customer: customer)
-      end
+      card = if customer.card.present?
+               customer.card
+             else
+               Card.new(customer: customer)
+             end
 
       begin
         if customer.stripe_id.present?
@@ -24,14 +24,13 @@ module Tang
         # Save the payment method
         stripe_card = Stripe::Customer.retrieve_source(
           cu.id,
-          cu.default_source,
+          cu.default_source
         )
         card.update_from_stripe(stripe_card)
-
       rescue Stripe::StripeError => e
         card.errors.add(:base, :invalid, message: e.message)
       end
-      return card
+      card
     end
   end
-end
+end