tang 0.2.2 → 0.2.4

data/app/jobs/tang/import_charges_job.rb

@@ -6,18 +6,14 @@ module Tang
       # Do something later
       stripe_charges = Stripe::Charge.list(limit: 100, starting_after: starting_after)
       stripe_charges.each do |stripe_charge|
-
         invoice = Invoice.find_by(stripe_id: stripe_charge.invoice)
 
-        if invoice.present?
-          Charge.from_stripe(stripe_charge, invoice)
-        end
-
+        Charge.from_stripe(stripe_charge, invoice) if invoice.present?
       end
 
-      if stripe_charges.has_more
-        Tang::ImportChargesJob.perform_now(stripe_charges.data.last.id)
-      end
+      return unless stripe_charges.has_more
+
+      Tang::ImportChargesJob.perform_now(stripe_charges.data.last.id)
     end
   end
 end

data/app/jobs/tang/import_coupons_job.rb

@@ -9,9 +9,9 @@ module Tang
         Coupon.from_stripe(stripe_coupon)
       end
 
-      if stripe_coupons.has_more
-        Tang::ImportCouponsJob.perform_now(stripe_coupons.data.last.id)
-      end
+      return unless stripe_coupons.has_more
+
+      Tang::ImportCouponsJob.perform_now(stripe_coupons.data.last.id)
     end
   end
 end

data/app/jobs/tang/import_customers_job.rb

@@ -12,25 +12,27 @@ module Tang
 
     def import_customer(stripe_customer)
       customer = Tang.customer_class.find_by(email: stripe_customer.email)
-      if customer.present?
-        customer = update_customer(customer, stripe_customer)
+      return unless customer.present?
 
-        # import card
-        if stripe_customer.default_source.present?
-          stripe_card = Stripe::Customer.retrieve_source(
-            stripe_customer.id,
-            stripe_customer.default_source,
-          )
-          Card.from_stripe(stripe_card, customer)
-        end
-      end
+      customer = update_customer(customer, stripe_customer)
+
+      # import card
+      return unless stripe_customer.default_source.present?
+
+      stripe_card = Stripe::Customer.retrieve_source(
+        stripe_customer.id,
+        stripe_customer.default_source
+      )
+      Card.from_stripe(stripe_card, customer)
     end
 
     def update_customer(customer, stripe_customer)
       customer.stripe_id = stripe_customer.id if customer.stripe_id.nil?
-      customer.coupon = Coupon.find_by(stripe_id: stripe_customer.discount.coupon.id) if stripe_customer.discount.present?
+      if stripe_customer.discount.present?
+        customer.coupon = Coupon.find_by(stripe_id: stripe_customer.discount.coupon.id)
+      end
       customer.save
-      return customer
+      customer
     end
   end
 end

data/app/jobs/tang/import_invoices_job.rb

@@ -7,16 +7,16 @@ module Tang
       stripe_invoices = Stripe::Invoice.list(limit: 100, starting_after: starting_after)
       stripe_invoices.each do |stripe_invoice|
         invoice = Invoice.from_stripe(stripe_invoice)
-        if invoice.present?
-          stripe_invoice.lines.data.each do |stripe_invoice_item|
-            InvoiceItem.from_stripe(stripe_invoice_item, invoice)
-          end
+        next unless invoice.present?
+
+        stripe_invoice.lines.data.each do |stripe_invoice_item|
+          InvoiceItem.from_stripe(stripe_invoice_item, invoice)
         end
       end
 
-      if stripe_invoices.has_more
-        Tang::ImportInvoicesJob.perform_now(stripe_invoices.data.last.id)
-      end
+      return unless stripe_invoices.has_more
+
+      Tang::ImportInvoicesJob.perform_now(stripe_invoices.data.last.id)
     end
   end
 end

data/app/jobs/tang/import_plans_job.rb

@@ -4,22 +4,20 @@ module Tang
 
     def perform(starting_after = nil)
       # Do something later
-      stripe_plans = Stripe::Plan.list(limit: 100, starting_after: starting_after)
+      stripe_plans = Stripe::Plan.list(limit: 100, starting_after: starting_after, expand: ['data.product'])
       stripe_plans.each do |stripe_plan|
         Plan.find_or_create_by(stripe_id: stripe_plan.id) do |p|
           p.amount = stripe_plan.amount
           p.currency = stripe_plan.currency
           p.interval = stripe_plan.interval
           p.interval_count = stripe_plan.interval_count
-          p.name = stripe_plan.name
-          p.statement_descriptor = stripe_plan.statement_descriptor
+          p.name = stripe_plan.product.name
+          # p.statement_descriptor = stripe_plan.statement_descriptor
           p.trial_period_days = stripe_plan.trial_period_days
         end
       end
 
-      if stripe_plans.has_more
-        Tang::ImportPlansJob.perform_now(stripe_plans.data.last.id)
-      end
+      Tang::ImportPlansJob.perform_now(stripe_plans.data.last.id) if stripe_plans.has_more
     end
   end
 end

data/app/jobs/tang/import_subscriptions_job.rb

@@ -20,10 +20,10 @@ module Tang
 
     def import_subscription(stripe_subscription)
       subscription = Subscription.from_stripe(stripe_subscription)
-      if subscription.present?
-        # Handle removed discounts
-        subscription.update(coupon: nil, coupon_start: nil) if stripe_subscription.discount.nil?
-      end
+      return unless subscription.present?
+
+      # Handle removed discounts
+      subscription.update(coupon: nil, coupon_start: nil) if stripe_subscription.discount.nil?
     end
   end
 end

data/app/mailers/application_mailer.rb

@@ -1,4 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: "from@example.com"
+  default from: 'from@example.com'
   layout 'mailer'
 end

data/app/mailers/tang/stripe_mailer.rb

@@ -10,27 +10,26 @@ module Tang
 
     def admin_payment_succeeded(charge)
       @charge = charge
-      mail(to: Tang.admin_email, subject: "Woo! Charge succeeded!")
+      mail(to: Tang.admin_email, subject: 'Woo! Charge succeeded!')
     end
 
     def admin_payment_failed(charge)
       @charge = charge
-      mail(to: Tang.admin_email, subject: "Oh no! Charge failed!")
+      mail(to: Tang.admin_email, subject: 'Oh no! Charge failed!')
     end
 
     def customer_payment_succeeded(charge)
       @receipt = charge
-      if @receipt.customer.present?
-        mail(to: @receipt.customer.email, subject: "Thank you!")
-      end
+      return unless @receipt.customer.present?
+
+      mail(to: @receipt.customer.email, subject: 'Thank you!')
     end
 
     def customer_payment_failed(charge)
       @charge = charge
-      if @charge.customer.present?
-        mail(to: @charge.customer.email, subject: "Oops! Your payment could not be processed.")
-      end
-    end
+      return unless @charge.customer.present?
 
+      mail(to: @charge.customer.email, subject: 'Oops! Your payment could not be processed.')
+    end
   end
 end

data/app/mailers/tang/subscription_mailer.rb

@@ -5,7 +5,10 @@ module Tang
 
     def upgraded(subscription)
       @subscription = subscription
-      mail(to: @subscription.customer.email, subject: "Oh, wow! Excited to have you on our #{@subscription.plan.name} plan!")
+      mail(
+        to: @subscription.customer.email,
+        subject: "Oh, wow! Excited to have you on our #{@subscription.plan.name} plan!"
+      )
     end
   end
 end

data/app/models/concerns/tang/customer.rb

@@ -20,7 +20,7 @@ module Tang
       validates :account_balance, numericality: { only_integer: true }, allow_nil: true
 
       define_method :admin? do
-        self.respond_to?(:role) && self.role == 'admin'
+        respond_to?(:role) && role == 'admin'
       end
 
       define_method :stripe_enabled? do
@@ -29,7 +29,7 @@ module Tang
     end
 
     def self.table_name
-      return Tang.customer_class.to_s.downcase.pluralize
+      Tang.customer_class.to_s.downcase.pluralize
     end
 
     def self.search(query)
@@ -37,22 +37,27 @@ module Tang
       if query.present?
         q = "%#{query.downcase}%"
         customer_table = ActiveRecord::Base.connection.quote_table_name(Customer.table_name)
-        customers = Tang.customer_class.
-            joins(:subscriptions, :coupon).
-            where.not(stripe_id: nil).
-            where("lower(#{customer_table}.stripe_id) like ? or lower(#{customer_table}.email) like ? or lower(tang_subscriptions.stripe_id) like ? or lower(tang_coupons.stripe_id) like ?", 
-                q, q, q, q).
-            distinct
+        customers = Tang.customer_class
+                        .joins(:subscriptions, :coupon)
+                        .where.not(stripe_id: nil)
+                        .where(
+                          "lower(#{customer_table}.stripe_id) like ? or lower(#{customer_table}.email) like ? or lower(tang_subscriptions.stripe_id) like ? or lower(tang_coupons.stripe_id) like ?",
+                          q,
+                          q,
+                          q,
+                          q
+                        )
+                        .distinct
       end
-      return customers
+      customers
     end
 
     def card
-      self.cards.order(:created_at).last
+      cards.order(:created_at).last
     end
 
     def subscription
-      @subscription ||= self.subscriptions.where.not(status: :canceled).order(:created_at).last
+      @subscription ||= subscriptions.where.not(status: :canceled).order(:created_at).last
     end
 
     def generate_password
@@ -60,62 +65,57 @@ module Tang
     end
 
     def update_card_from_stripe(stripe_card)
-      my_card = self.card.present? ? self.card : Card.new(customer: self)
+      my_card = card.present? ? card : Card.new(customer: self)
       my_card.update_from_stripe(stripe_card)
     end
 
     def update_subscription_end(subscription)
       self.active_until = subscription.period_end
-      self.save!
+      save!
     end
 
     # NOTE: May be causing memory bloat
     def subscribed_to?(stripe_id)
-      subscription_plan = self.subscription.plan if self.subscription.present?
+      subscription_plan = subscription.plan if subscription.present?
       if subscription_plan.present?
         return true if subscription_plan.stripe_id == stripe_id
+
         if Tang.plan_inheritance
           other_plan = Plan.find_by(stripe_id: stripe_id)
           return true if other_plan.present? && subscription_plan.order >= other_plan.order
         end
       end
-      return false
+      false
     end
 
     def coupon_end
-      if coupon.present? && coupon.duration != 'forever'
-        
-      end
-      return nil
+      nil
     end
 
     def has_coupon?
-      if self.subscription.present?
-        if self.subscription.coupon.present?
-          return true
-        end
-      end
-      return self.coupon.present?
+      return true if subscription.present? && subscription.coupon.present?
+
+      coupon.present?
     end
 
     def has_subscription_coupon?
-      return self.subscription.present? && self.subscription.coupon.present?
+      subscription.present? && subscription.coupon.present?
     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
 
     def nil_if_blank
-      self.description = nil if self.description.blank?
+      self.description = nil if description.blank?
     end
 
     def update_stripe_customer

data/app/models/tang/card.rb

@@ -8,8 +8,11 @@ module Tang
     validates :last4, numericality: { only_integer: true, greater_than_or_equal_to: 0 },
                       length: { is: 4 }
     validates :exp_month, numericality: { only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 12 }
-    validates :exp_year, numericality: { only_integer: true, greater_than_or_equal_to: Date.today.year - 30.years, less_than_or_equal_to: Date.today.year + 70.years }
-    # validates :address_zip, format: { with: /\A\d{5}(-\d{4})?\z/ }
+    validates :exp_year, numericality: {
+      only_integer: true,
+      greater_than_or_equal_to: Date.today.year - 30.years,
+      less_than_or_equal_to: Date.today.year + 70.years
+    }
     validates :address_zip, presence: true
 
     before_destroy :delete_stripe_card
@@ -27,15 +30,13 @@ module Tang
       self.brand = stripe_card.brand
       self.country = stripe_card.country
       self.cvc_check = stripe_card.cvc_check
-      # self.dynamic_last4 = stripe_card.dynamic_last4
       self.exp_month = stripe_card.exp_month
       self.exp_year = stripe_card.exp_year
       self.fingerprint = stripe_card.fingerprint
       self.funding = stripe_card.funding
       self.last4 = stripe_card.last4
       self.name = stripe_card.name
-      # self.tokenization_method = stripe_card.tokenization_method
-      self.save(validate: false)
+      save(validate: false)
     end
 
     def self.from_stripe(stripe_card, customer)
@@ -52,16 +53,14 @@ module Tang
         c.brand = stripe_card.brand
         c.country = stripe_card.country
         c.cvc_check = stripe_card.cvc_check
-        # c.dynamic_last4 = stripe_card.dynamic_last4
         c.exp_month = stripe_card.exp_month
         c.exp_year = stripe_card.exp_year
         c.funding = stripe_card.funding
         c.last4 = stripe_card.last4
         c.name = stripe_card.name
-        # c.tokenization_method = stripe_card.tokenization_method
       end
       card.save(validate: false) if card.new_record?
-      return card
+      card
     end
 
     private

data/app/models/tang/charge.rb

@@ -40,27 +40,6 @@ module Tang
         # Save payment source directly to charge
         c.set_source(stripe_charge.source)
 
-        # c.card_stripe_id = stripe_charge.source.id
-        # c.card_address_city = stripe_charge.source.address_city
-        # c.card_address_country = stripe_charge.source.address_country
-        # c.card_address_line1 = stripe_charge.source.address_line1
-        # c.card_address_line1_check = stripe_charge.source.address_line1_check
-        # c.card_address_line2 = stripe_charge.source.address_line2
-        # c.card_address_state = stripe_charge.source.address_state
-        # c.card_address_zip = stripe_charge.source.address_zip
-        # c.card_address_zip_check = stripe_charge.source.address_zip_check
-        # c.card_brand = stripe_charge.source.brand
-        # c.card_country = stripe_charge.source.country
-        # c.card_cvc_check = stripe_charge.source.cvc_check
-        # # c.card_dynamic_last4 = stripe_charge.source.dynamic_last4
-        # c.card_exp_month = stripe_charge.source.exp_month
-        # c.card_exp_year = stripe_charge.source.exp_year
-        # c.card_fingerprint = stripe_charge.source.fingerprint
-        # c.card_funding = stripe_charge.source.funding
-        # c.card_last4 = stripe_charge.source.last4
-        # c.card_name = stripe_charge.source.name
-        # # c.card_tokenization_method = stripe_charge.source.tokenization_method
-      
         c.created = DateTime.strptime(stripe_charge.created.to_s, '%s')
         c.status = stripe_charge.status
       end
@@ -71,39 +50,38 @@ module Tang
       if query.present?
         q = "%#{query.downcase}%"
         customer_table = connection.quote_table_name(Customer.table_name)
-        charges = Charge.joins(:customer).
-            where("lower(tang_charges.stripe_id) like ? or lower(#{customer_table}.stripe_id) like ?",
-                q, q).
-            distinct
+        charges = Charge.joins(:customer)
+                        .where(
+                          "lower(tang_charges.stripe_id) like ? or lower(#{customer_table}.stripe_id) like ?",
+                          q,
+                          q
+                        )
+                        .distinct
       end
-      return charges
+      charges
     end
 
     def set_source(source)
-      begin
-        self.card_stripe_id = source.id
-        self.card_address_city = source.address_city if source.has_attribute?()
-        self.card_address_country = source.address_country
-        self.card_address_line1 = source.address_line1
-        self.card_address_line1_check = source.address_line1_check
-        self.card_address_line2 = source.address_line2
-        self.card_address_state = source.address_state
-        self.card_address_zip = source.address_zip
-        self.card_address_zip_check = source.address_zip_check
-        self.card_brand = source.brand
-        self.card_country = source.country
-        self.card_cvc_check = source.cvc_check
-        # self.card_dynamic_last4 = source.dynamic_last4
-        self.card_exp_month = source.exp_month
-        self.card_exp_year = source.exp_year
-        self.card_fingerprint = source.fingerprint
-        self.card_funding = source.funding
-        self.card_last4 = source.last4
-        self.card_name = source.name
-        # self.card_tokenization_method = source.tokenization_method
-      rescue NoMethodError
-        logger.debug "could not save a valid source"
-      end
+      self.card_stripe_id = source.id
+      self.card_address_city = source.address_city if source.has_attribute?
+      self.card_address_country = source.address_country
+      self.card_address_line1 = source.address_line1
+      self.card_address_line1_check = source.address_line1_check
+      self.card_address_line2 = source.address_line2
+      self.card_address_state = source.address_state
+      self.card_address_zip = source.address_zip
+      self.card_address_zip_check = source.address_zip_check
+      self.card_brand = source.brand
+      self.card_country = source.country
+      self.card_cvc_check = source.cvc_check
+      self.card_exp_month = source.exp_month
+      self.card_exp_year = source.exp_year
+      self.card_fingerprint = source.fingerprint
+      self.card_funding = source.funding
+      self.card_last4 = source.last4
+      self.card_name = source.name
+    rescue NoMethodError
+      logger.debug 'could not save a valid source'
     end
   end
 end

data/app/models/tang/coupon.rb

@@ -9,32 +9,36 @@ module Tang
 
     validates :stripe_id, presence: true
     validates :stripe_id, uniqueness: true # , if: "deleted_at.nil?"
-    validates :duration, inclusion: { in: %w(once repeating forever) }
+    validates :duration, inclusion: { in: %w[once repeating forever] }
     validates :amount_off, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
     validates :currency, presence: true, if: -> { amount_off.present? }
-    validates :duration_in_months, presence: true, numericality: { only_integer: true, greater_than: 0 }, if: :repeating?
+    validates :duration_in_months, presence: true, numericality: {
+      only_integer: true,
+      greater_than: 0
+    }, if: :repeating?
     validates :max_redemptions, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
-    validates :percent_off, numericality: { only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 100 },
-                            presence: true, if: -> { amount_off.nil? }
+    validates :percent_off, numericality: {
+      only_integer: true,
+      greater_than_or_equal_to: 1,
+      less_than_or_equal_to: 100
+    }, presence: true, if: -> { amount_off.nil? }
     validates :redeem_by, future: true, if: -> { redeem_by.present? }
 
     before_create :create_stripe_coupon
     before_update :update_stripe_coupon
     before_destroy :delete_stripe_coupon # should be soft delete
 
-    DURATIONS = ['once', 'repeating', 'forever']
+    DURATIONS = %w[once repeating forever].freeze
 
     def coupon_valid?
       # check if expired
-      if self.redeem_by.present?
-        return false if Time.now > self.redeem_by
-      end
+      return false if redeem_by.present? && Time.now > redeem_by
 
-      if self.max_redemptions.present?
+      if max_redemptions.present?
         # check if any discounts created
       end
 
-      return true
+      true
     end
 
     def formatted_duration
@@ -47,29 +51,29 @@ module Tang
 
     def active_redemptions
       customer_table = ActiveRecord::Base.connection.quote_table_name(Customer.table_name)
-      Tang.customer_class.
-           joins(:subscriptions).
-           where("#{customer_table}.coupon_id = ? OR tang_subscriptions.coupon_id = ?", self.id, self.id).
-           where.not(tang_subscriptions: { status: :canceled }).
-           uniq
+      Tang.customer_class
+          .joins(:subscriptions)
+          .where("#{customer_table}.coupon_id = ? OR tang_subscriptions.coupon_id = ?", id, id)
+          .where.not(tang_subscriptions: { status: :canceled })
+          .uniq
     end
 
     def repeating?
-      duration == "repeating"
+      duration == 'repeating'
     end
 
     def discount(amount)
       subtotal = amount
-      if self.percent_off.present?
-        subtotal = amount.to_f * (self.percent_off.to_f / 100.0)
-      elsif self.amount_off.present?
-        subtotal = self.amount_off
+      if percent_off.present?
+        subtotal = amount.to_f * (percent_off.to_f / 100.0)
+      elsif amount_off.present?
+        subtotal = amount_off
       end
-      return -subtotal.to_f
+      -subtotal.to_f
     end
 
-    def self.from_stripe(stripe_coupon)      
-      coupon = Coupon.find_or_create_by(stripe_id: stripe_coupon.id) do |c|
+    def self.from_stripe(stripe_coupon)
+      Coupon.find_or_create_by(stripe_id: stripe_coupon.id) do |c|
         c.percent_off = stripe_coupon.percent_off
         c.currency = stripe_coupon.currency
         c.amount_off = stripe_coupon.amount_off
@@ -78,8 +82,6 @@ module Tang
         c.max_redemptions = stripe_coupon.max_redemptions
         c.redeem_by = DateTime.strptime(stripe_coupon.redeem_by.to_s, '%s') if stripe_coupon.redeem_by.present?
       end
-
-      return coupon
     end
 
     private

data/app/models/tang/invoice.rb

@@ -12,7 +12,7 @@ module Tang
     # scope :paid, -> { joins(:charge) }
 
     def charge
-      self.charges.order(:created_at).last
+      charges.order(:created_at).last
     end
 
     def period_start
@@ -27,7 +27,7 @@ module Tang
       if subscription.present?
         self[:period_end] || subscription.plan.period_days_from(period_start)
       else
-        self.period_start
+        period_start
       end
     end
 
@@ -67,11 +67,8 @@ module Tang
         end
       end
 
-      if invoice.update_from_stripe(stripe_invoice)
-        invoice.save
-      end
-
-      return invoice
+      invoice.save if invoice.update_from_stripe(stripe_invoice)
+      invoice
     end
 
     def update_from_stripe(stripe_invoice)
@@ -90,17 +87,17 @@ module Tang
       end
 
       stripe_created = DateTime.strptime(stripe_invoice.created.to_s, '%s')
-      if self.date != stripe_created
+      if date != stripe_created
         self.date = stripe_created
         changed = true
       end
 
-      if self.invoice_pdf != stripe_invoice.invoice_pdf
+      if invoice_pdf != stripe_invoice.invoice_pdf
         self.invoice_pdf = stripe_invoice.invoice_pdf
         changed = true
       end
 
-      return changed
+      changed
     end
 
     def self.search(query)
@@ -108,14 +105,16 @@ module Tang
       if query.present?
         q = "%#{query.downcase}%"
         customer_table = connection.quote_table_name(Customer.table_name)
-        invoices = Invoice.joins("left join tang_charges on tang_invoices.id = tang_charges.invoice_id").
-            joins("left join tang_subscriptions on tang_subscriptions.id = tang_invoices.subscription_id").
-            joins("left join #{customer_table} on #{customer_table}.id = tang_invoices.customer_id").
-            where("lower(tang_charges.stripe_id) like ? or lower(tang_subscriptions.stripe_id) like ? or lower(#{customer_table}.stripe_id) like ?", 
-                q, q, q).
-            distinct
+        invoices = Invoice.joins('left join tang_charges on tang_invoices.id = tang_charges.invoice_id')
+                          .joins('left join tang_subscriptions on tang_subscriptions.id = tang_invoices.subscription_id')
+                          .joins("left join #{customer_table} on #{customer_table}.id = tang_invoices.customer_id")
+                          .where(
+                            "lower(tang_charges.stripe_id) like ? or lower(tang_subscriptions.stripe_id) like ? or lower(#{customer_table}.stripe_id) like ?",
+                            q, q, q
+                          )
+                          .distinct
       end
-      return invoices
+      invoices
     end
   end
 end