paid_up 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6080785b9ee54b7ecbc86a067e35bae25750073c
-  data.tar.gz: 61919277d6f90ed481e2015f28e76e4798bbe51b
+  metadata.gz: 4bf978e51d7d4fdba2c09b1410722a56342e63af
+  data.tar.gz: 0164070ba66ee76293a1f7fefa579170671775e3
 SHA512:
-  metadata.gz: 205b4f1b6ff58e139d175886736b046ba14a853af4f5e8501bd74944d2386c34d08441e073c60417b0055075b9de73199c1f99e9c828e0c945a512fdad056547
-  data.tar.gz: 4ccbe62cfdafa7240e0ab68952c7de20e79a0ecb904ac59db916e54c6bdb99003f74e1d4365a322d72fbc7e3520a18b662172b72aa3e06acdb99fcb44514320f
+  metadata.gz: a07f651feba3290f6d59ee81d8585ced8afba55f117fe05b543e87a2d5d72445a5ef59b705b8f80988c1cc4e2e1cbdc7090d0c1e15ac4cda2513c1380c167a57
+  data.tar.gz: 8c4a8e15bc2a6daed2cf286b2dfb705d059efeae6d1c0ac389fa4bfa3cd14ed00515922fc6fe735484b25345b744addfef7579f859c486b2b10c7b67357e5540

data/.rubocop.yml

@@ -0,0 +1,20 @@
+AllCops:
+  Exclude:
+    - paid_up.gemspec
+    - db/migrate/*
+    - spec/dummy/db/schema.rb
+    - spec/dummy/db/migrate/*
+Style/ClassVars:
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/ModuleLength:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false

data/Gemfile

@@ -20,6 +20,10 @@ group :development do
   gem 'jeweler', '~> 2'
   gem 'bundler', '~> 1'
   gem 'web-console', '~> 3.0'
+  gem 'pre-commit', '~> 0.27'
+  gem 'rubocop', '~> 0.37'
+  gem 'coffeelint', '~> 1.14'
+  gem 'scss_lint', '~> 0.47.0', require: false
 end
 
 group :test, :development do
@@ -39,4 +43,4 @@ group :test do
   gem 'shoulda-matchers', '~> 2.8'
   gem 'launchy', '~> 2.4', require: false
   gem 'coveralls', '~> 0.8', require: false
-end
+end

data/Rakefile

@@ -6,14 +6,17 @@ end
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "paid_up"
-  gem.homepage = "http://www.gemvein.com/museum/cases/paid_up"
-  gem.license = "MIT"
-  gem.summary = %Q{Allows a model of your choosing to subscribe to a plan, which enables features.}
-  gem.description = %Q{Allows a model of your choosing (such as users) to subscribe to a plan, which enables features.}
-  gem.email = "karen.e.lundgren@gmail.com"
-  gem.authors = ["Karen Lundgren"]
+  # gem is a Gem::Specification...
+  # see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = 'paid_up'
+  gem.homepage = 'http://www.gemvein.com/museum/cases/paid_up'
+  gem.license = 'MIT'
+  gem.summary = 'Allows a model of your choosing to subscribe to a plan, which'\
+                  ' enables features.'
+  gem.description = 'Allows a model of your choosing (such as users) to '\
+                      'subscribe to a plan, which enables features.'
+  gem.email = 'karen.e.lundgren@gmail.com'
+  gem.authors = ['Karen Lundgren']
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
@@ -24,5 +27,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
-
+task default: :spec

data/VERSION

@@ -1 +1 @@
-0.9.13
+0.9.14

data/app/controllers/paid_up/paid_up_controller.rb

@@ -1,11 +1,13 @@
 module PaidUp
+  # PaidUp Controller
   class PaidUpController < ApplicationController
     helper :all
 
     before_action :set_locale
     before_filter :warn_if_delinquent
 
-  private
+    private
+
     def set_locale
       I18n.locale = params[:locale] || I18n.default_locale
     end
@@ -13,9 +15,12 @@ module PaidUp
     def warn_if_delinquent
       if user_signed_in? && params[:controller] != 'paid_up/subscriptions'
         if current_user.plan.nil? || current_user.stripe_data.delinquent
-          flash[:error] = :account_is_delinquent.l + :to_disable_this_message_subscribe.l(subscribe_link: paid_up.plans_path)
+          flash[:error] = :account_is_delinquent.l +
+                          :to_disable_this_message_subscribe.l(
+                            subscribe_link: paid_up.plans_path
+                          )
         end
       end
     end
   end
-end
+end

data/app/controllers/paid_up/plans_controller.rb

@@ -1,7 +1,8 @@
 module PaidUp
+  # PaidUp Plans Controller
   class PlansController < PaidUpController
     def index
       @plans = PaidUp::Plan.subscribable
     end
   end
-end
+end

data/app/controllers/paid_up/subscriptions_controller.rb

@@ -1,4 +1,5 @@
 module PaidUp
+  # Subscriptions Controller
   class SubscriptionsController < PaidUpController
     before_filter :authenticate_user!
     before_filter :set_plan, only: [:new, :create]
@@ -9,18 +10,29 @@ module PaidUp
 
     def new
       # nothing to do, @plan set by #set_plan
-      if current_user.can_downgrade_to?(@plan) || @plan.amount == 0
-        create
-      end
+      (current_user.can_downgrade_to?(@plan) || @plan.amount == 0) && create
     end
 
     def create
       # @plan set by #set_plan
       current_user.update_attribute(:coupon_code, params[:coupon_code])
       if current_user.subscribe_to_plan(@plan, params[:stripeToken])
-        redirect_to subscriptions_path, flash: { notice: :you_are_now_subscribed_to_the_plan.l(plan_name: current_user.plan.title) }
+        redirect_to(
+          subscriptions_path,
+          flash: {
+            notice: :you_are_now_subscribed_to_the_plan.l(
+              plan_name: current_user.plan.title
+            )
+          }
+        )
       else
-        redirect_to new_plan_subscription_path @plan, flash: { error: current_user.errors.full_messages || :could_not_subscribe_to_plan.l(plan: @plan.title) }
+        redirect_to(
+          new_plan_subscription_path(@plan),
+          flash: {
+            error: current_user.errors.full_messages ||
+                   :could_not_subscribe_to_plan.l(plan: @plan.title)
+          }
+        )
       end
     rescue Stripe::InvalidRequestError => e
       flash[:error] = e.message
@@ -31,8 +43,9 @@ module PaidUp
     end
 
     private
+
     def set_plan
       @plan = PaidUp::Plan.find(params[:plan_id])
     end
   end
-end
+end

data/app/helpers/paid_up/features_helper.rb

@@ -1,4 +1,5 @@
 module PaidUp
+  # PaidUp Features Helper
   module FeaturesHelper
     include PaidUp::PaidUpHelper
 
@@ -6,7 +7,7 @@ module PaidUp
       data = {}
       features = PaidUp::Feature.all
 
-      for feature in features
+      features.each do |feature|
         data[feature.title] = feature_display feature, plan
       end
 
@@ -39,11 +40,11 @@ module PaidUp
 
       plans = PaidUp::Plan.subscribable
       if options[:only].present?
-        plans = plans.where('id IN (?)', options[:only])
+        plans = plans.where(id: options[:only])
         options.delete(:only)
       end
       if options[:except].present?
-        plans = plans.where('NOT ( id IN (?) )', options[:except])
+        plans = plans.where.not(id: options[:except])
         options.delete(:except)
       end
 
@@ -54,12 +55,24 @@ module PaidUp
         highlight_plan = nil
       end
 
-      render(partial: 'paid_up/features/table', locals: { should_add_buttons: should_add_buttons, plans: plans, features: features, highlight_plan: highlight_plan, html_options: options})
+      render(
+        partial: 'paid_up/features/table',
+        locals: {
+          should_add_buttons: should_add_buttons,
+          plans: plans,
+          features: features,
+          highlight_plan: highlight_plan,
+          html_options: options
+        }
+      )
     end
 
     def feature_abilities_table(options = {})
       features = PaidUp::Feature.all
-      render(partial: 'paid_up/features/abilities_table', locals: { features: features, html_options: options})
+      render(
+        partial: 'paid_up/features/abilities_table',
+        locals: { features: features, html_options: options }
+      )
     end
   end
-end
+end

data/app/helpers/paid_up/paid_up_helper.rb

@@ -1,14 +1,17 @@
 module PaidUp
+  # PaidUp PaidUp Helper
   module PaidUpHelper
     def date_range(start_date, end_date)
       dates = []
-      if start_date.present? && (start_date.is_a?(Date) || start_date.is_a?(Integer))
+      if start_date.present? &&
+         (start_date.is_a?(Date) || start_date.is_a?(Integer))
         dates << start_date.to_date
       end
-      if end_date.present? && (end_date.is_a?(Date) || end_date.is_a?(Integer))
+      if end_date.present? &&
+         (end_date.is_a?(Date) || end_date.is_a?(Integer))
         dates << end_date.to_date
       end
       dates.join('&mdash;').html_safe
     end
   end
-end
+end

data/app/helpers/paid_up/plans_helper.rb

@@ -1,9 +1,10 @@
 module PaidUp
+  # PaidUp Plans Helper
   module PlansHelper
     include ::ActionView::Helpers::NumberHelper
 
     def plan_charge_human(plan, discount)
-      if !discount.nil? and !discount.coupon.nil? && plan.amount != 0
+      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
@@ -13,9 +14,16 @@ module PaidUp
         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 = content_tag(
+          :s,
+          (orig_money.format + '/' + plan_period_phrase(plan))
+        )
         html << ' '
-        html << content_tag(:span, (money.format + '/' + plan_period_phrase(plan)), class: 'text-danger')
+        html << content_tag(
+          :span,
+          (money.format + '/' + plan_period_phrase(plan)),
+          class: 'text-danger'
+        )
       else
         html = plan.money.format + '/' + plan_period_phrase(plan)
       end
@@ -67,6 +75,5 @@ module PaidUp
       html_options[:disabled] ||= disabled_state
       icon_button_to css_class, icon_class, text, link, html_options
     end
-
   end
-end
+end

data/app/helpers/paid_up/subscriptions_helper.rb

@@ -1,4 +1,5 @@
 module PaidUp
+  # PaidUp Subscriptions Helper
   module SubscriptionsHelper
     include PaidUp::PaidUpHelper
 
@@ -8,14 +9,20 @@ 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)
+        data[:paid_thru.l] = date_range(
+          subscription.current_period_start,
+          subscription.current_period_end
+        )
       end
 
       if subscription.trial_start || subscription.trial_end
-        data[:trial_period.l]= date_range(subscription.trial_start, subscription.trial_end)
+        data[:trial_period.l] = date_range(
+          subscription.trial_start,
+          subscription.trial_end
+        )
       end
 
       dl data
     end
   end
-end
+end

data/app/models/paid_up/ability.rb

@@ -1,55 +1,54 @@
 module PaidUp
+  # PaidUp Ability model
   module Ability
     include CanCan::Ability
 
     def initialize_paid_up(user)
       features = PaidUp::Feature.all
-      for feature in features
+      features.each do |feature|
         case feature.setting_type
-          when 'table_rows'
-            can :index, feature.feature_model
-            can :show, feature.feature_model do |item|
-              item.enabled
-            end
-            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
-              if user.table_rows_remaining(feature.slug) > 0
-                can [:create, :new], feature.feature_model
-              else
-                cannot :create, feature.feature_model
-              end
-            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 do |item|
-              item.enabled
-            end
-            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).pluck(:id)
-              can :own, feature.feature_model
-              if user.rolify_rows_remaining(feature.slug) > 0
-                can [:create, :new], feature.feature_model
-              else
-                cannot :create, feature.feature_model
-              end
-            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
+        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
-            raise(:unknown_feature_type.l)
+            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
       end
     end

data/app/models/paid_up/plan.rb

@@ -1,29 +1,39 @@
-class PaidUp::Plan < ActiveRecord::Base
-  has_many :plan_feature_settings, class_name: 'PaidUp::PlanFeatureSetting', foreign_key: 'paid_up_plan_id', inverse_of: :plan
-  accepts_nested_attributes_for :plan_feature_settings
-
-  after_initialize :load_stripe_data
-  after_save :expire_stripe_data
-
-  attr_accessor :stripe_data
-
-  validates_presence_of :title, :stripe_id
-  validates_uniqueness_of :title
-
-  default_scope { order('sort_order ASC') }
-  scope :subscribable, -> { where('sort_order >=  ?', 0) }
-  scope :free, -> { find_by_stripe_id(PaidUp.configuration.free_plan_stripe_id) }
-
-  def reload(*args, &blk)
-    super *args, &blk
-    load_stripe_data
-    self
-  end
+module PaidUp
+  # PaidUp Plan model
+  class Plan < ActiveRecord::Base
+    has_many(
+      :plan_feature_settings,
+      class_name: 'PaidUp::PlanFeatureSetting',
+      foreign_key: 'paid_up_plan_id',
+      inverse_of: :plan
+    )
+    accepts_nested_attributes_for :plan_feature_settings
+
+    after_initialize :load_stripe_data
+    after_save :expire_stripe_data
+
+    attr_accessor :stripe_data
+
+    validates_presence_of :title, :stripe_id
+    validates_uniqueness_of :title
+
+    default_scope { order('sort_order ASC') }
+    scope :subscribable, -> { where('sort_order >=  ?', 0) }
+    scope :free, (lambda do
+      find_by_stripe_id(PaidUp.configuration.free_plan_stripe_id)
+    end)
+
+    def reload(*args, &blk)
+      super(*args, &blk)
+      load_stripe_data
+      self
+    end
 
-  def feature_setting(feature_name)
-    feature = PaidUp::Feature.find_by_slug(feature_name) || raise(:feature_not_found.l)
-    raw = plan_feature_settings.where(feature: feature_name)
-    case feature.setting_type
+    def feature_setting(feature_name)
+      feature = PaidUp::Feature.find_by_slug(feature_name) ||
+                raise(:feature_not_found.l)
+      raw = plan_feature_settings.where(feature: feature_name)
+      case feature.setting_type
       when 'boolean'
         if raw.empty?
           false
@@ -38,65 +48,67 @@ class PaidUp::Plan < ActiveRecord::Base
         end
       else
         raise :error_handling_feature_setting.l feature: feature
+      end
     end
-  end
 
-  def feature_unlimited?(feature_name)
-    feature_setting(feature_name) == PaidUp::Unlimited.to_i
-  end
+    def feature_unlimited?(feature_name)
+      feature_setting(feature_name) == PaidUp::Unlimited.to_i
+    end
 
-  def interval
-    if stripe_data.present?
-      stripe_data.interval
-    else
-      :default_interval.l
+    def interval
+      if stripe_data.present?
+        stripe_data.interval
+      else
+        :default_interval.l
+      end
     end
-  end
 
-  def interval_count
-    if stripe_data.present?
-      stripe_data.interval_count
-    else
-      1
+    def interval_count
+      if stripe_data.present?
+        stripe_data.interval_count
+      else
+        1
+      end
     end
-  end
 
-  def amount
-    if stripe_data.present?
-      stripe_data.amount
-    else
-      0
+    def amount
+      if stripe_data.present?
+        stripe_data.amount
+      else
+        0
+      end
     end
-  end
 
-  def money
-    Money.new(amount, currency)
-  end
+    def money
+      Money.new(amount, currency)
+    end
 
-  def charge
-    money.amount
-  end
+    def charge
+      money.amount
+    end
 
-  def currency
-    if stripe_data.present?
-      stripe_data.currency.upcase
-    else
-      :default_currency.l.upcase
+    def currency
+      if stripe_data.present?
+        stripe_data.currency.upcase
+      else
+        :default_currency.l.upcase
+      end
     end
-  end
 
-  private
+    private
 
-  def load_stripe_data
-    if stripe_id.present?
-      self.stripe_data = Rails.cache.fetch("#{stripe_id}/stripe_data", expires_in: 12.hours) do
-        Stripe::Plan.retrieve stripe_id
+    def load_stripe_data
+      if stripe_id.present?
+        self.stripe_data = Rails.cache.fetch(
+          "#{stripe_id}/stripe_data", expires_in: 12.hours
+        ) do
+          Stripe::Plan.retrieve stripe_id
+        end
       end
     end
-  end
 
-  def expire_stripe_data
-    Rails.cache.delete("#{stripe_id}/stripe_data")
+    def expire_stripe_data
+      Rails.cache.delete("#{stripe_id}/stripe_data")
+    end
   end
-
-end
+end

data/app/models/paid_up/plan_feature_setting.rb

@@ -1,13 +1,21 @@
-class PaidUp::PlanFeatureSetting < ActiveRecord::Base
-  belongs_to :plan, class_name: 'PaidUp::Plan', foreign_key: 'paid_up_plan_id', inverse_of: :plan_feature_settings
-  validates_presence_of :setting, :plan, :feature
+module PaidUp
+  # Plan-FeatureSetting Relationship
+  class PlanFeatureSetting < ActiveRecord::Base
+    belongs_to(
+      :plan,
+      class_name: 'PaidUp::Plan',
+      foreign_key: 'paid_up_plan_id',
+      inverse_of: :plan_feature_settings
+    )
+    validates_presence_of :setting, :plan, :feature
 
-  after_initialize :catch_unlimited_in_setting
+    after_initialize :catch_unlimited_in_setting
+
+    private
 
-  private
     def catch_unlimited_in_setting
-      if setting == PaidUp::Unlimited.to_i(:db)
-        self.setting = PaidUp::Unlimited
-      end
+      setting == PaidUp::Unlimited.to_i(:db) &&
+        (self.setting = PaidUp::Unlimited)
     end
-end
+  end
+end

data/app/models/paid_up/unlimited.rb

@@ -1,15 +1,17 @@
-module PaidUp::Unlimited
-  def self.initialize
-    999999999
-  end
-  def self.to_i(format = :default)
-    if format == :db
-      -1
-    else
-      999999999
+module PaidUp
+  # Unlimited class: designed to output as 'Unlimited' for string, -1 for db,
+  # or 999999999 for number.
+  module Unlimited
+    def self.initialize
+      999_999_999
+    end
+
+    def self.to_i(format = :default)
+      format == :db ? -1 : 999_999_999
+    end
+
+    def self.to_s
+      :unlimited.l
     end
   end
-  def self.to_s
-    :unlimited.l
-  end
-end
+end