paid_up 0.11.7 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15d045e897fa830551be519557e9ea72bc586d86
-  data.tar.gz: 2fc056d3ef1cf75b97759506b30359dc58236768
+  metadata.gz: 7c1ccc499e297cd644e9ccc070f7f6119fb5a2b1
+  data.tar.gz: 6034b27662459169830dc94407dea76f8041df25
 SHA512:
-  metadata.gz: a4380cb08afb3191361ae4c6eb69361f26a6886858b50b0f55194933ddf5637f0c79281093f37660e21776ce7477cf13f6e4d81771b89f33d631a5bef4c6fff6
-  data.tar.gz: 9e054bbb52211b2f8a3409304c97798fd7f48f09c0d3b38eb553696fdcf69750ef1f5a2fad690abbd4b19a81ae4ec187882b3f68e9d6d7e991953eb7b801809f
+  metadata.gz: 8f8d9e47d52c69a1592fba66075862f2b4e670b19dab0110bed23e398e77f6f18f1aef33c36dc16813fee79a82ba8375f2d3d0e8413378aa01acc0bd13db2aca
+  data.tar.gz: 4f77687abf07baf11e5db79e1d1af7b9d9e0fff697ab0138787938b3349f4bcd39de07ceae18f6ed9cb90e1ad98ec00b8d4f94e5d7d7294fb5be4841e15fa9c7

data/.rubocop.yml

@@ -1,20 +1,24 @@
+inherit_from: .rubocop_todo.yml
+
 AllCops:
+  TargetRubyVersion: 2.3
+  DisplayCopNames: true
   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/BlockLength:
+  Exclude:
+    - spec/*
+    - spec/*/*
+    - spec/*/*/*
+    - spec/dummy/db/seeds/*
+
 Metrics/ModuleLength:
-  Enabled: false
-Metrics/PerceivedComplexity:
-  Enabled: false
+  Exclude:
+    - spec/*
+    - spec/*/*
+    - spec/*/*/*
+

data/.rubocop_todo.yml

@@ -0,0 +1,7 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-03-29 15:07:04 -0600 using RuboCop version 0.48.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.2
-  - 2.2.3
-  - 2.3.0
+  - 2.3.0
+  - 2.3.1
+  - 2.4.0
+  - 2.4.1

data/Gemfile

@@ -1,48 +1,53 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-gem 'dotenv-rails', '~> 2.2', require: 'dotenv/rails-now', groups: [:development, :test]
+group :test, :development do
+  gem 'dotenv-rails', '~> 2.2', require: 'dotenv/rails-now'
+end
 
-gem 'rails', '~> 4.2'
-gem 'rails-i18n', '~> 4'
 gem 'haml-rails', '~> 0.9'
 gem 'jquery-rails', '~> 4'
-gem 'uglifier', '~> 2.7'
+gem 'rails', '>= 4', '< 6'
+gem 'rails-i18n', '>= 4', '< 6'
+gem 'uglifier', '>= 2.7', '< 4'
 
-gem 'bootstrap_leather', '~> 0.5'
+gem 'bootstrap_leather', '~> 0.9'
 
 gem 'chronic', '~> 0.10'
 gem 'money', '~> 6.5'
 
-gem 'devise', '~> 3.4'
-gem 'cancancan', '~> 1.10'
+gem 'cancancan', '~> 1'
+gem 'devise', '>= 3.4', '< 5'
 gem 'rolify', '~> 5'
-gem 'stripe', '~> 1.36'
+gem 'stripe', '>= 1.36', '< 3'
 
 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
+  gem 'juwelier', '~> 2'
+  gem 'nokogiri', '>= 1.7'
+  gem 'pre-commit', '~> 0.32'
+  gem 'rubocop', git: 'https://github.com/bbatsov/rubocop.git' # Wait for 0.49
+  gem 'scss_lint', '~> 0.52.0', require: false
+  gem 'web-console', '~> 3'
 end
 
 group :test, :development do
-  gem 'sqlite3', '~> 1.3'
-  gem 'forgery', '~> 0.6'
-  gem 'bootstrap-sass', '~> 3.3'
-  gem 'sass-rails', '~> 5.0'
-  gem 'high_voltage', '~> 2.3'
-  gem 'rspec-rails', '~> 3.2'
+  gem 'bootstrap-sass', '~> 3'
   gem 'factory_girl_rails', '~> 4.5'
+  gem 'forgery', '~> 0.6'
+  gem 'rails-controller-testing', '~> 1'
+  gem 'rspec-rails', '~> 3'
+  gem 'sass-rails', '~> 5'
+  gem 'sqlite3', '~> 1.3'
 end
 
 group :test do
-  gem 'capybara', '~> 2.4'
-  gem 'database_cleaner', '~> 1.4'
-  gem 'rspec-collection_matchers', '~> 1.1'
-  gem 'shoulda-matchers', '~> 2.8'
+  gem 'capybara', '~> 2'
+  gem 'coveralls', '>= 0.8', '< 2', require: false
+  gem 'database_cleaner', '~> 1'
   gem 'launchy', '~> 2.4', require: false
-  gem 'coveralls', '~> 0.8', require: false
+  gem 'rspec-collection_matchers', '~> 1.1'
+  gem 'shoulda-matchers', '>=2', '< 4'
 end

data/README.md

@@ -6,7 +6,7 @@
 
 Paid Up is a start-to-finish Stripe subscription engine. You set up the plans and coupons you want on Stripe, and the gem gives you a way to tie those plans and coupons to authenticated users, granting them abilities based on the features outlined for their plan.
 
-* Ruby 2, Rails 4
+* Ruby 2, Rails 4 and 5
 * Authentication by Devise
 * Authorization by CanCanCan
 * Subscription by Stripe
@@ -14,6 +14,12 @@ Paid Up is a start-to-finish Stripe subscription engine. You set up the plans an
 * Uses Google Tag Manager for Google Analytics `dataLayer` object to provide e-commerce analytics.
 * Assumes you will be using some variety of Bootstrap, and designed to be quite responsive out of the box. Included views can be overridden with custom views.
 
+### Plans Index Page
+![Plans Index Page Screenshot](http://gemvein.com/assets/screenshots/paid_up-plans-index.png)
+
+### New Subscription Page
+![New Subscription Page Screenshot](http://gemvein.com/assets/screenshots/paid_up-subscriptions-new.png)
+
 ## Installation
 
 First, add paid_up to your `Gemfile`:
@@ -128,6 +134,21 @@ Doing this will populate the e-commerce data in Google Analytics, but you must a
 
 ### Upgrading
 
+#### Version 0.12.1
+Renamed `subscription` to `paid_up_subscription` and `subscriptions` to `paid_up_subscriptions` to avoid naming conflicts with other gems.
+
+#### Version 0.12.0
+
+Version 0.12.0 requires Ruby 2.3 or higher because of the use of the `&.` operator.
+
+##### paid_for Mixin
+
+The methods `table_rows` and `rolify_rows` were renamed to `table_setting(table_name).rows_count` and `rolify_setting(table_name).rows_count`, replaced by methods that fetch the rows themselves.
+
+All previous methods beginning with `table_rows_` and `rolify_rows_` have also been moved into `table_setting()` and `rolify_setting()`
+
+The method `enabled` was renamed to `enabled?`.
+
 #### Version 0.9.0
 
 Version 0.9.0 enabled coupon codes, which are saved on the user's record. Be sure to run `rake paid_up:install:migrations` and migrate your database after upgrading.

data/Rakefile

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification...
-  # see http://docs.rubygems.org/read/chapter/20 for more options
+  # see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = 'paid_up'
   gem.homepage = 'http://www.gemvein.com/museum/cases/paid_up'
   gem.license = 'MIT'
@@ -17,9 +19,8 @@ Jeweler::Tasks.new do |gem|
                       '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
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/VERSION

@@ -1 +1 @@
-0.11.7
+0.12.3

data/app/controllers/paid_up/paid_up_controller.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module PaidUp
   # PaidUp Controller
   class PaidUpController < ApplicationController
     helper :all
 
     before_action :set_locale
-    before_filter :warn_if_delinquent
+    before_action :warn_if_delinquent
 
     private
 
@@ -13,14 +15,19 @@ module PaidUp
     end
 
     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
-                          )
-        end
-      end
+      return unless delinquent? &&
+                    params[:controller] != 'paid_up/subscriptions'
+      flash[:error] = :account_is_delinquent.l +
+                      :to_disable_this_message_subscribe.l(
+                        subscribe_link: paid_up.plans_path
+                      )
+    end
+
+    def delinquent?
+      user_signed_in? && (
+        current_user.plan.nil? ||
+        current_user.stripe_data.delinquent
+      )
     end
   end
 end

data/app/controllers/paid_up/plans_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PaidUp
   # PaidUp Plans Controller
   class PlansController < PaidUpController

data/app/controllers/paid_up/subscriptions_controller.rb

@@ -1,73 +1,82 @@
+# frozen_string_literal: true
+
 module PaidUp
   # Subscriptions Controller
   class SubscriptionsController < PaidUpController
-    before_filter :authenticate_user!
-    before_filter :set_plan, only: [:new, :create]
+    before_action :authenticate_user!
+    before_action :load_plan, only: %i(new create)
+
+    rescue_from Stripe::InvalidRequestError do |error|
+      invalid_request_error(error)
+    end
+    rescue_from Stripe::CardError do |error|
+      invalid_card_error(error)
+    end
 
     def index
       # nothing to do, everything we need is in current_user
     end
 
     def new
-      # nothing to do, @plan set by #set_plan
-      (current_user.can_downgrade_to?(@plan) || @plan.amount == 0) && create
+      # nothing to do, @plan load by #load_plan
+      (current_user.can_downgrade_to?(@plan) || @plan.amount.zero?) && 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])
-        subscription_id = current_user.stripe_data.subscriptions.first.id
-        discount = current_user.stripe_data.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
-          money = Money.new(amount, @plan.currency)
-        else
-          money = @plan.money
-        end
-        flash[:paid_up_google_analytics_data] = {
-          transactionId: subscription_id,
-          transactionTotal: money.dollars,
-          transactionProducts: [
-            sku: @plan.stripe_id,
-            name: @plan.title,
-            price: @plan.money.dollars,
-            quantity: '1'
-          ]
-        }
-        redirect_to(
-          subscriptions_path,
-          flash: {
-            notice: :you_are_now_subscribed_to_the_plan.l(
-              plan_name: current_user.plan.title
-            )
-          }
-        )
+      # @plan load by #load_plan
+      result = current_user.subscribe_to_plan(
+        @plan,
+        params[:stripeToken],
+        params[:coupon_code]
+      )
+      if result
+        create_success
       else
-        redirect_to(
-          new_plan_subscription_path(@plan),
-          flash: {
-            error: current_user.errors.full_messages ||
-                   :could_not_subscribe_to_plan.l(plan: @plan.title)
-          }
-        )
+        create_error
       end
-    rescue Stripe::InvalidRequestError => e
+    end
+
+    private
+
+    def create_success
+      google_analytics_flash
+      flash[:notice] = :you_are_now_subscribed_to_the_plan.l(
+        plan_name: current_user.plan.title
+      )
+      redirect_to subscriptions_url
+    end
+
+    def create_error
+      flash[:error] = current_user.errors.full_messages ||
+                      :could_not_subscribe_to_plan.l(plan: @plan.title)
+      redirect_to new_plan_subscription_url(@plan)
+    end
+
+    def invalid_request_error(e)
       flash[:error] = e.message
       redirect_to subscriptions_path
-    rescue Stripe::CardError => e
+    end
+
+    def invalid_card_error(e)
       flash[:error] = e.message
       redirect_to new_plan_subscription_path
     end
 
-    private
-
-    def set_plan
+    def load_plan
       @plan = PaidUp::Plan.find(params[:plan_id])
     end
+
+    def google_analytics_flash
+      stripe_data = current_user.stripe_data
+      discount = stripe_data.discount
+      flash[:paid_up_google_analytics_data] = {
+        transactionId: stripe_data.subscriptions.first.id,
+        transactionTotal: @plan.adjusted_money(discount).dollars,
+        transactionProducts: [
+          sku: @plan.stripe_id, name: @plan.title, price: @plan.money.dollars,
+          quantity: '1'
+        ]
+      }
+    end
   end
 end

data/app/helpers/paid_up/features_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PaidUp
   # PaidUp Features Helper
   module FeaturesHelper
@@ -16,11 +18,7 @@ module PaidUp
 
     def feature_display(feature, plan)
       if feature.setting_type == 'boolean'
-        if plan.feature_setting(feature.slug)
-          icon 'ok'
-        else
-          icon 'remove'
-        end
+        icon plan.feature_setting(feature.slug) ? 'ok' : 'remove'
       elsif plan.feature_unlimited?(feature.slug)
         :unlimited.l
       else
@@ -28,41 +26,28 @@ module PaidUp
       end
     end
 
-    def features_table(options = {})
-      features = PaidUp::Feature.all
-
-      if !options[:should_add_buttons].nil?
-        should_add_buttons = options[:should_add_buttons]
-        options.delete(:should_add_buttons)
+    def feature_state(feature)
+      case feature.setting_type
+      when 'boolean'
+        boolean_state(feature)
+      when 'table_rows'
+        setting_state feature, current_user.table_setting(feature.slug)
+      when 'rolify_rows'
+        setting_state feature, current_user.rolify_setting(feature.slug)
       else
-        should_add_buttons = true
-      end
-
-      plans = PaidUp::Plan.subscribable
-      if options[:only].present?
-        plans = plans.where(id: options[:only])
-        options.delete(:only)
-      end
-      if options[:except].present?
-        plans = plans.where.not(id: options[:except])
-        options.delete(:except)
-      end
-
-      if options[:highlight].present?
-        highlight_plan = options[:highlight]
-        options.delete(:highlight)
-      else
-        highlight_plan = nil
+        :error.l
       end
+    end
 
+    def features_table(options = {})
+      plans = PaidUp::Plan.display options.delete(:only),
+                                   options.delete(:except)
       render(
         partial: 'paid_up/features/table',
         locals: {
-          should_add_buttons: should_add_buttons,
-          plans: plans,
-          features: features,
-          highlight_plan: highlight_plan,
-          html_options: options
+          highlight_plan: options.delete(:highlight), plans: plans,
+          should_add_buttons: options.delete(:should_add_buttons) || true,
+          features: PaidUp::Feature.all, html_options: options
         }
       )
     end
@@ -74,5 +59,21 @@ module PaidUp
         locals: { features: features, html_options: options }
       )
     end
+
+    private
+
+    def boolean_state(feature)
+      render partial: 'paid_up/features/boolean_state', locals: {
+        feature: feature
+      }
+    end
+
+    def setting_state(feature, setting)
+      render partial: 'paid_up/features/setting_state', locals: {
+        remaining: setting.rows_remaining, used: setting.rows_count,
+        allowed: setting.rows_allowed, model: feature.feature_model,
+        unlimited: setting.rows_unlimited?
+      }
+    end
   end
 end

data/app/helpers/paid_up/paid_up_helper.rb

@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
 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))
-        dates << start_date.to_date
-      end
-      if end_date.present? &&
-         (end_date.is_a?(Date) || end_date.is_a?(Integer))
-        dates << end_date.to_date
-      end
+      dates << start_date.to_date if date_valid?(start_date)
+      dates << end_date.to_date if date_valid?(end_date)
       dates.join('&mdash;').html_safe
     end
 
     def paid_up_google_analytics_data_layer
       render partial: 'paid_up/layouts/google_analytics_data_layer'
     end
+
+    private
+
+    def date_valid?(date)
+      date.present? && (date.is_a?(Date) || date.is_a?(Integer))
+    end
   end
 end