paid_up 0.11.7 → 0.12.3

data/app/helpers/paid_up/plans_helper.rb

@@ -1,33 +1,34 @@
+# frozen_string_literal: true
+
 module PaidUp
   # PaidUp Plans Helper
   module PlansHelper
     include ::ActionView::Helpers::NumberHelper
 
     def plan_charge_human(plan, discount)
-      if !discount.nil? && !discount.coupon.nil? && plan.amount != 0
-        orig_amount = plan.amount
-        amount = orig_amount
-        amount -= (discount.coupon.percent_off || 0) * 0.01 * amount
-        amount -= (discount.coupon.amount_off || 0)
-        amount = amount > 0 ? amount : 0
-
-        orig_money = Money.new(orig_amount, plan.currency)
-        money = Money.new(amount, plan.currency)
-
-        html = content_tag(
-          :s,
-          (orig_money.format + '/' + plan_period_phrase(plan))
-        )
-        html << ' '
-        html << content_tag(
-          :span,
-          (money.format + '/' + plan_period_phrase(plan)),
-          class: 'text-danger'
-        )
-      else
-        html = plan.money.format + '/' + plan_period_phrase(plan)
+      interval = plan_period_phrase(plan)
+      if plan.adjust?(discount)
+        return amount_per_interval(plan.money.format, interval)
       end
-      html
+      plan_charge_reduced(
+        plan.money.format,
+        plan.adjusted_money(discount).format,
+        interval
+      )
+    end
+
+    def plan_button(plan, text = nil, html_options = {})
+      atts = plan_button_atts(plan)
+      atts[:text] = text if text.present?
+      atts[:link] ||= paid_up.new_plan_subscription_path(plan)
+
+      html_options[:method] ||= :get
+      html_options[:data] = atts.delete(:data)
+
+      icon_button_to(
+        atts[:css_class], atts[:icon_class], atts[:text], atts[:link],
+        html_options
+      )
     end
 
     def plan_period_phrase(plan)
@@ -39,38 +40,57 @@ module PaidUp
       period_phrase + plan.interval.capitalize
     end
 
-    def plan_button(plan, text = nil, html_options = {})
-      data = {}
-      css_class = ''
-      link = paid_up.new_plan_subscription_path(plan)
-      if user_signed_in?
-        text ||= :subscribe.l
-        if current_user.stripe_data.delinquent
-          icon_class = 'arrow-right'
-          css_class += 'info'
-        elsif current_user.can_upgrade_to? plan
-          icon_class = 'arrow-up'
-          css_class += 'success'
-        elsif current_user.can_downgrade_to? plan
-          icon_class = 'arrow-down'
-          css_class += 'danger'
-          data[:confirm] = :are_you_sure.l
-        elsif current_user.is_subscribed_to? plan
-          icon_class = 'ok'
-          css_class += 'disabled disabled'
-          link = '#'
-          text = :already_subscribed.l
-        else # Plans are equal in sort_order
-          icon_class = 'arrow-right'
-          css_class += 'info'
-        end
-      else
-        text ||= :sign_up.l
-        icon_class = 'arrow-right'
-        css_class += 'success'
-      end
-      html_options[:method] ||= :get
-      icon_button_to css_class, icon_class, text, link, html_options
+    private
+
+    def amount_per_interval(amount, interval)
+      "#{amount}/#{interval}"
+    end
+
+    def plan_charge_reduced(old_money, new_money, interval)
+      html = []
+      html << content_tag(:s, amount_per_interval(old_money, interval))
+      html << content_tag(
+        :span, amount_per_interval(new_money, interval), class: 'text-danger'
+      )
+      html.join(' ')
+    end
+
+    # rubocop:disable Metrics/AbcSize
+    # This is just this complex.
+    def plan_button_atts(plan)
+      return anonymous_atts unless user_signed_in?
+      return delinquent_atts if current_user.stripe_data.delinquent
+      return same_plan_atts if current_user.subscribed_to? plan
+      return upgrade_atts if current_user.can_upgrade_to? plan
+      return downgrade_atts if current_user.can_downgrade_to? plan
+      sidegrade_atts
+    end
+    # rubocop:enable Metrics/AbcSize
+
+    def anonymous_atts
+      { text: :sign_up.l, icon_class: 'arrow-right', css_class: 'success' }
+    end
+
+    def delinquent_atts
+      { text: :subscribe.l, icon_class: 'arrow-right', css_class: 'info' }
+    end
+
+    def upgrade_atts
+      { text: :subscribe.l, icon_class: 'arrow-up', css_class: 'success' }
+    end
+
+    def downgrade_atts
+      { text: :subscribe.l, icon_class: 'arrow-down', css_class: 'danger',
+        data: { confirm: :are_you_sure.l } }
+    end
+
+    def same_plan_atts
+      { text: :already_subscribed.l, icon_class: 'ok', css_class: 'disabled',
+        link: '#' }
+    end
+
+    def sidegrade_atts
+      { text: :subscribe.l, icon_class: 'arrow-right', css_class: 'info' }
     end
   end
 end

data/app/helpers/paid_up/subscriptions_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PaidUp
   # PaidUp Subscriptions Helper
   module SubscriptionsHelper
@@ -8,21 +10,23 @@ module PaidUp
 
       data[:status.l] = subscription.status
 
-      if subscription.current_period_start || subscription.current_period_end
-        data[:paid_thru.l] = date_range(
-          subscription.current_period_start,
-          subscription.current_period_end
-        )
-      end
+      data = add_date_if_set(
+        data, :paid_thru, subscription.current_period_start,
+        subscription.current_period_end
+      )
+      data = add_date_if_set(
+        data, :trial_period, subscription.trial_start, subscription.trial_end
+      )
+      dl data
+    end
 
-      if subscription.trial_start || subscription.trial_end
-        data[:trial_period.l] = date_range(
-          subscription.trial_start,
-          subscription.trial_end
-        )
-      end
+    private
 
-      dl data
+    def add_date_if_set(data, text_sym, date_start, date_end)
+      if date_start || date_end
+        data[text_sym.l] = date_range(date_start, date_end)
+      end
+      data
     end
   end
 end

data/app/models/paid_up/ability.rb

@@ -1,56 +1,63 @@
+# frozen_string_literal: true
+
 module PaidUp
   # PaidUp Ability model
   module Ability
     include CanCan::Ability
 
     def initialize_paid_up(user)
-      features = PaidUp::Feature.all
-      features.each do |feature|
-        case feature.setting_type
-        when 'table_rows'
-          can :index, feature.feature_model
-          can :show, feature.feature_model, &:enabled
-          if user.table_rows_allowed(feature.slug) > 0 ||
-             user.table_rows_unlimited?(feature.slug)
-            can :manage, feature.feature_model, user: user
-            can :own, feature.feature_model
-            cannot :create, feature.feature_model
-            user.table_rows_remaining(feature.slug) > 0 &&
-              can([:create, :new], feature.feature_model)
-          else
-            cannot :delete, feature.feature_model
-            cannot :update, feature.feature_model
-            cannot :own, feature.feature_model
-            cannot :create, feature.feature_model
-          end
-        when 'rolify_rows'
-          can :index, feature.feature_model
-          can :show, feature.feature_model, &:enabled
-          if user.rolify_rows_allowed(feature.slug) > 0 ||
-             user.rolify_rows_unlimited?(feature.slug)
-            can(
-              :manage,
-              feature.feature_model,
-              id: feature.feature_model.with_role(:owner, user).ids
-            )
-            can :own, feature.feature_model
-            cannot :create, feature.feature_model
-            user.rolify_rows_remaining(feature.slug) > 0 &&
-              can([:create, :new], feature.feature_model)
-          else
-            cannot :delete, feature.feature_model
-            cannot :update, feature.feature_model
-            cannot :own, feature.feature_model
-            cannot :create, feature.feature_model
-          end
-        when 'boolean'
-          if user.plan.feature_setting feature.slug
-            can :use, feature.slug.to_sym
-          end
-        else
-          raise(:unknown_feature_type.l)
-        end
+      PaidUp::Feature.all.each do |feature|
+        method = "enable_#{feature.setting_type}".to_sym
+        send(method, user, feature)
+      end
+    end
+
+    private
+
+    def enable_read(model)
+      can :index, model
+      can :show, model, &:enabled?
+    end
+
+    def enable_rows(model, allowed, remaining)
+      if allowed.positive?
+        can :own, model
+        cannot :create, model
+        can(%i(create new), model) if remaining.positive?
+      else
+        cannot %i(delete update own create), model
       end
     end
+
+    def enable_table_rows(user, feature)
+      model = feature.feature_model
+      enable_read(model)
+      return if user.new_record?
+      slug = feature.slug
+      table_setting = user.table_setting(slug)
+      allowed = table_setting.rows_allowed
+      remaining = table_setting.rows_remaining
+      can :manage, model, user: user if allowed.positive?
+      enable_rows(model, allowed, remaining)
+    end
+
+    def enable_rolify_rows(user, feature)
+      model = feature.feature_model
+      enable_read(model)
+      return if user.new_record?
+      slug = feature.slug
+      rolify_setting = user.rolify_setting(slug)
+      allowed = rolify_setting.rows_allowed
+      remaining = rolify_setting.rows_remaining
+      if allowed.positive?
+        can :manage, model, id: model.with_role(:owner, user).ids
+      end
+      enable_rows(model, allowed, remaining)
+    end
+
+    def enable_boolean(user, feature)
+      slug = feature.slug
+      can :use, slug.to_sym if user.plan.feature_setting slug
+    end
   end
 end

data/app/models/paid_up/plan.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PaidUp
   # PaidUp Plan model
   class Plan < ActiveRecord::Base
@@ -19,9 +21,17 @@ module PaidUp
 
     default_scope { order('sort_order ASC') }
     scope :subscribable, -> { where('sort_order >=  ?', 0) }
+    scope :within, ->(ids) { where(id: ids) }
+    scope :without, ->(ids) { where.not(id: ids) }
     scope :free, (lambda do
       find_by_stripe_id(PaidUp.configuration.free_plan_stripe_id)
     end)
+    scope :display, (lambda do |within, without|
+      plans = subscribable
+      plans = plans.within(within) if within.present?
+      plans = plans.without(without) if without.present?
+      plans
+    end)
 
     def reload(*args, &blk)
       super(*args, &blk)
@@ -30,22 +40,13 @@ module PaidUp
     end
 
     def feature_setting(feature_name)
-      feature = PaidUp::Feature.find_by_slug(feature_name) ||
-                raise(:feature_not_found.l)
+      feature = PaidUp::Feature.find_by_slug!(feature_name)
       raw = plan_feature_settings.where(feature: feature_name)
       case feature.setting_type
       when 'boolean'
-        if raw.empty?
-          false
-        else
-          raw.first.setting != 0
-        end
+        raw&.first&.setting == 1
       when 'table_rows', 'rolify_rows'
-        if raw.empty?
-          0
-        else
-          raw.first.setting
-        end
+        raw&.first&.setting || 0
       else
         raise :error_handling_feature_setting.l feature: feature
       end
@@ -56,33 +57,37 @@ module PaidUp
     end
 
     def interval
-      if stripe_data.present?
-        stripe_data.interval
-      else
-        :default_interval.l
-      end
+      stripe_data&.interval || :default_interval.l
     end
 
     def interval_count
-      if stripe_data.present?
-        stripe_data.interval_count
-      else
-        1
-      end
+      stripe_data&.interval_count || 1
     end
 
     def amount
-      if stripe_data.present?
-        stripe_data.amount
-      else
-        0
-      end
+      stripe_data&.amount || 0
+    end
+
+    def adjusted_amount(discount)
+      return amount unless adjust?(discount)
+      adjusted = amount
+      adjusted -= (discount.coupon.percent_off || 0) * 0.01 * adjusted
+      adjusted -= (discount.coupon.amount_off || 0)
+      [adjusted, 0].max
     end
 
     def money
       Money.new(amount, currency)
     end
 
+    def adjusted_money(discount)
+      Money.new(adjusted_amount(discount), currency)
+    end
+
+    def adjust?(discount)
+      discount.present? && discount.coupon.present? && !amount.zero?
+    end
+
     def charge
       money.amount
     end
@@ -98,13 +103,10 @@ module PaidUp
     private
 
     def load_stripe_data
-      if stripe_id.present?
-        self.stripe_data = Rails.cache.fetch(
-          "#{stripe_id}/stripe_data", expires_in: 1.second
-        ) do
-          Stripe::Plan.retrieve stripe_id
-        end
-      end
+      return unless stripe_id.present?
+      self.stripe_data = Rails.cache.fetch(
+        "#{stripe_id}/stripe_data", expires_in: 1.minute
+      ) { Stripe::Plan.retrieve stripe_id }
     end
 
     def expire_stripe_data

data/app/models/paid_up/plan_feature_setting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PaidUp
   # Plan-FeatureSetting Relationship
   class PlanFeatureSetting < ActiveRecord::Base

data/app/models/paid_up/unlimited.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PaidUp
   # Unlimited class: designed to output as 'Unlimited' for string, -1 for db,
   # or 999999999 for number.

data/app/views/paid_up/features/_abilities_table.html.haml

@@ -2,48 +2,4 @@
   - for feature in features
     %tr{ id: feature.slug + '_ability'}
       %th= feature.title
-      %td
-        - case feature.setting_type
-          - when 'boolean'
-            - if can? :use, feature.slug.to_sym
-              = icon 'ok'
-              = :allowed.l
-            - else
-              = icon 'remove'
-              = :not_allowed.l
-          - when 'table_rows'
-            - if can? :own, feature.feature_model
-              = icon 'ok'
-            - else
-              = icon 'remove'
-            - if current_user.table_rows_unlimited?(feature.slug)
-              = :unlimited.l
-            - else
-              - remaining = current_user.table_rows_remaining(feature.slug)
-              - allowed = current_user.table_rows_allowed(feature.slug)
-              - used = current_user.table_rows(feature.slug)
-              - if remaining < 0
-                = :x_used_y_allowed.l x: used, y: allowed
-              - elsif allowed == 0
-                = :not_allowed.l
-              - else
-                = :x_of_y_remaining.l x: remaining, y: allowed
-          - when 'rolify_rows'
-            - if can? :own, feature.feature_model
-              = icon 'ok'
-            - else
-              = icon 'remove'
-            - if current_user.rolify_rows_unlimited?(feature.slug)
-              = :unlimited.l
-            - else
-              - remaining = current_user.rolify_rows_remaining(feature.slug)
-              - allowed = current_user.rolify_rows_allowed(feature.slug)
-              - used = current_user.rolify_rows(feature.slug)
-              - if remaining < 0
-                = :x_used_y_allowed.l x: used, y: allowed
-              - elsif allowed == 0
-                = :not_allowed.l
-              - else
-                = :x_of_y_remaining.l x: remaining, y: allowed
-          - else
-            = :error.l
+      %td= feature_state(feature)

data/app/views/paid_up/features/_boolean_state.html.haml

@@ -0,0 +1,6 @@
+- if can? :use, feature.slug.to_sym
+  = icon 'ok'
+  = :allowed.l
+- else
+  = icon 'remove'
+  = :not_allowed.l

data/app/views/paid_up/features/_setting_state.html.haml

@@ -0,0 +1,13 @@
+- if can? :own, model
+  = icon 'ok'
+- else
+  = icon 'remove'
+
+- if unlimited
+  = :unlimited.l
+- if remaining.negative?
+  = :x_used_y_allowed.l x: used, y: allowed
+- elsif allowed.zero?
+  = :not_allowed.l
+- else
+  = :x_of_y_remaining.l x: remaining, y: allowed

data/app/views/paid_up/subscriptions/index.html.haml

@@ -10,8 +10,8 @@
   %h2
     = current_user.plan.title
     .small= plan_charge_human current_user.plan, current_user.stripe_data.discount
-  = subscription_dl current_user.subscription
-  - if current_user.subscription.cancel_at_period_end
+  = subscription_dl current_user.paid_up_subscription
+  - if current_user.paid_up_subscription.cancel_at_period_end
     %h3= :canceled.l
   %h3= :abilities.l
   = feature_abilities_table

data/config/initializers/stripe.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.configuration.stripe = {
   publishable_key: ENV['STRIPE_PUBLISHABLE_KEY'],
   secret_key: ENV['STRIPE_SECRET_KEY']

data/config/locales/en.yml

@@ -38,7 +38,10 @@ en:
   could_not_associate_subscription: 'Could not associate subscription'
   could_not_create_subscription: 'Could not create subscription'
   could_not_subscribe_to_plan: "Could not subscribe to %{plan}"
-  could_not_update_subscription: 'Could not update subscription'
+  could_not_update_cancel: 'Could not update to reflect cancel'
+  could_not_update_card: 'Could not update card'
+  could_not_update_coupon: 'Could not update coupon'
+  could_not_update_subscription: 'Could not update plan'
   coupon_code: 'Coupon Code'
   currently_awaiting_confirmation_for_resource: "Currently awaiting confirmation for %{resource}"
   cvc: 'CVC/CVV'

data/config/routes.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 PaidUp::Engine.routes.draw do
   resources :plans, only: :index do
-    resources :subscriptions, only: [:new, :create]
+    resources :subscriptions, only: %i(new create)
   end
 
   resources :subscriptions, only: [:index]

data/lib/generators/paid_up/install/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PaidUp
   # PaidUp Install Generator
   class InstallGenerator < Rails::Generators::Base
@@ -16,7 +18,8 @@ module PaidUp
     def install_devise
       output(
         'To start with, Devise is used to authenticate users. No need to '\
-          "install it separately, I'll do that now.", :magenta)
+          "install it separately, I'll do that now.", :magenta
+      )
       generate('devise:install')
       generate('devise User')
     end

data/lib/generators/paid_up/install/templates/ability.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # CanCanCan Ability class
 class Ability
   include CanCan::Ability

data/lib/generators/paid_up/install/templates/initializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 PaidUp.configure do |config|
   config.anonymous_customer_stripe_id = 'anonymous-customer'
   config.anonymous_plan_stripe_id = 'anonymous-plan'

data/lib/generators/paid_up/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PaidUp
   module Generators
     # Generator Utilities

data/lib/paid_up/configuration.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 # PaidUp Module
 module PaidUp
   def self.configure(configuration = PaidUp::Configuration.new)
     block_given? && yield(configuration)
-    @@configuration = configuration
+    @configuration = configuration
   end
 
   def self.configuration
-    @@configuration ||= PaidUp::Configuration.new
+    @configuration ||= PaidUp::Configuration.new
   end
 
   # PaidUp Configuration

data/lib/paid_up/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PaidUp
   # PaidUp Engine
   class Engine < Rails::Engine

data/lib/paid_up/extensions/integer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PaidUp
   module Extensions
     # Integer extensions

data/lib/paid_up/extensions/stripe.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PaidUp
   module Extensions
     # Stripe Extensions