paid_up 0.11.7 → 0.12.3

data/spec/dummy/config/initializers/cookies_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.action_dispatch.cookies_serializer = :json

data/spec/dummy/config/initializers/devise.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|

data/spec/dummy/config/initializers/filter_parameter_logging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.

data/spec/dummy/config/initializers/inflections.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

data/spec/dummy/config/initializers/mime_types.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

data/spec/dummy/config/initializers/paid_up.rb

@@ -1,33 +1,27 @@
+# frozen_string_literal: true
+
 PaidUp.configure do |config|
   config.anonymous_customer_stripe_id = 'anonymous-customer'
   config.anonymous_plan_stripe_id = 'anonymous-plan'
   config.free_plan_stripe_id = 'free-plan'
 
   PaidUp.add_feature(
-    slug: 'ad_free',
-    title: 'Ad Free',
-    description: 'Are ads removed from the site with this plan?',
-    setting_type: 'boolean'
+    slug: 'ad_free', title: 'Ad Free', setting_type: 'boolean',
+    description: 'Are ads removed from the site with this plan?'
   )
   PaidUp.add_feature(
-    slug: 'groups',
-    title: 'Groups',
-    description: 'How many groups are allowed with this plan?',
+    slug: 'groups', title: 'Groups', setting_type: 'rolify_rows',
+    description: 'How many groups are allowed with this plan?'
     # Enables table row counting that is enabled by a positive value
     # for the PaidUp::PlanFeatureSetting.setting associated with this
     # PaidUp::Feature
-    setting_type: 'rolify_rows'
   )
   PaidUp.add_feature(
-    slug: 'doodads',
-    title: 'Doodads',
-    description: 'How many doodads included with this plan?',
-    setting_type: 'table_rows'
+    slug: 'doodads', title: 'Doodads', setting_type: 'table_rows',
+    description: 'How many doodads included with this plan?'
   )
   PaidUp.add_feature(
-    slug: 'posts',
-    title: 'Posts',
-    description: 'How many posts included with this plan?',
-    setting_type: 'table_rows'
+    slug: 'posts', title: 'Posts', setting_type: 'table_rows',
+    description: 'How many posts included with this plan?'
   )
 end

data/spec/dummy/config/initializers/rolify.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rolify.configure do |config|
   # By default ORM adapter is ActiveRecord. uncomment to use mongoid
   # config.use_mongoid

data/spec/dummy/config/initializers/session_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.session_store :cookie_store, key: '_dummy_session'

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which

data/spec/dummy/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   devise_for :users
   mount PaidUp::Engine => '/', as: 'paid_up'

data/spec/dummy/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment', __FILE__)

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -17,29 +16,26 @@ ActiveRecord::Schema.define(version: 20170220001913) do
     t.string "user_id"
     t.string "name"
     t.text   "description"
+    t.index ["user_id"], name: "index_doodads_on_user_id"
   end
 
-  add_index "doodads", ["user_id"], name: "index_doodads_on_user_id"
-
   create_table "groups", force: :cascade do |t|
     t.string   "title"
     t.text     "description"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "active",      default: false, null: false
+    t.index ["active"], name: "index_groups_on_active"
   end
 
-  add_index "groups", ["active"], name: "index_groups_on_active"
-
   create_table "paid_up_plan_feature_settings", force: :cascade do |t|
     t.integer "paid_up_plan_id"
     t.string  "feature"
     t.integer "setting"
+    t.index ["feature"], name: "index_paid_up_plan_feature_settings_on_feature"
+    t.index ["paid_up_plan_id"], name: "index_paid_up_plan_feature_settings_on_paid_up_plan_id"
   end
 
-  add_index "paid_up_plan_feature_settings", ["feature"], name: "index_paid_up_plan_feature_settings_on_feature"
-  add_index "paid_up_plan_feature_settings", ["paid_up_plan_id"], name: "index_paid_up_plan_feature_settings_on_paid_up_plan_id"
-
   create_table "paid_up_plans", force: :cascade do |t|
     t.string   "stripe_id"
     t.string   "title"
@@ -47,33 +43,30 @@ ActiveRecord::Schema.define(version: 20170220001913) do
     t.integer  "sort_order"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["stripe_id"], name: "index_paid_up_plans_on_stripe_id", unique: true
+    t.index ["title"], name: "index_paid_up_plans_on_title", unique: true
   end
 
-  add_index "paid_up_plans", ["stripe_id"], name: "index_paid_up_plans_on_stripe_id", unique: true
-  add_index "paid_up_plans", ["title"], name: "index_paid_up_plans_on_title", unique: true
-
   create_table "posts", force: :cascade do |t|
     t.string   "user_id"
     t.string   "title"
     t.boolean  "active",     default: false, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["active"], name: "index_posts_on_active"
+    t.index ["user_id"], name: "index_posts_on_user_id"
   end
 
-  add_index "posts", ["active"], name: "index_posts_on_active"
-  add_index "posts", ["user_id"], name: "index_posts_on_user_id"
-
   create_table "roles", force: :cascade do |t|
     t.string   "name"
-    t.integer  "resource_id"
     t.string   "resource_type"
+    t.integer  "resource_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id"
+    t.index ["name"], name: "index_roles_on_name"
   end
 
-  add_index "roles", ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id"
-  add_index "roles", ["name"], name: "index_roles_on_name"
-
   create_table "users", force: :cascade do |t|
     t.string   "name"
     t.string   "email",                  default: "", null: false
@@ -88,16 +81,14 @@ ActiveRecord::Schema.define(version: 20170220001913) do
     t.string   "last_sign_in_ip"
     t.string   "stripe_id"
     t.string   "coupon_code"
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
-
   create_table "users_roles", id: false, force: :cascade do |t|
     t.integer "user_id"
     t.integer "role_id"
+    t.index ["user_id", "role_id"], name: "index_users_roles_on_user_id_and_role_id"
   end
 
-  add_index "users_roles", ["user_id", "role_id"], name: "index_users_roles_on_user_id_and_role_id"
-
 end

data/spec/dummy/db/seeds.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ###############
 # Plans     #
 ###############
@@ -178,7 +180,7 @@ FactoryGirl.create(
   plan: no_ads_plan
 )
 
-group_leader_subscriber = FactoryGirl.create(
+leader_subscriber = FactoryGirl.create(
   :user,
   name: 'Group Leader Subscriber',
   plan: group_leader_plan
@@ -190,7 +192,7 @@ disabling_subscriber = FactoryGirl.create(
   plan: group_leader_plan
 )
 
-professional_subscriber = FactoryGirl.create(
+prof_subscriber = FactoryGirl.create(
   :user,
   name: 'Professional Subscriber',
   plan: professional_plan
@@ -216,28 +218,28 @@ past_due_subscriber = FactoryGirl.create(
 FactoryGirl.create(
   :group,
   title: 'First Group',
-  owner: group_leader_subscriber,
+  owner: leader_subscriber,
   active: true
 )
 
 FactoryGirl.create(
   :group,
   title: 'Inactive Group',
-  owner: group_leader_subscriber,
+  owner: leader_subscriber,
   active: false
 )
 
 FactoryGirl.create(
   :group,
   title: 'Second Group',
-  owner: professional_subscriber,
+  owner: prof_subscriber,
   active: true
 )
 
 FactoryGirl.create(
   :group,
   title: 'Third Group',
-  owner: professional_subscriber,
+  owner: prof_subscriber,
   active: true
 )
 

data/spec/dummy/lib/tasks/system.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :system do
   desc 'Recreate database from seeds'
   task clean: :environment do

data/spec/factories/doodad.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryGirl.define do
   factory :doodad do
     name 'Test Name'

data/spec/factories/group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryGirl.define do
   factory :group do
     title 'Test Title'

data/spec/factories/plan.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryGirl.define do
   factory :plan, class: 'PaidUp::Plan' do
     title 'Plan Title'

data/spec/factories/plan_feature_setting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryGirl.define do
   factory :plan_feature_setting, class: 'PaidUp::PlanFeatureSetting' do
     feature nil

data/spec/factories/post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryGirl.define do
   factory :post do
     title 'Test Title'

data/spec/factories/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryGirl.define do
   factory :user do
     sequence :email do |n|
@@ -35,7 +37,7 @@ FactoryGirl.define do
         ).id
         trial_end = nil
       end
-      user.subscribe_to_plan(evaluator.plan, token, trial_end)
+      user.subscribe_to_plan(evaluator.plan, token, nil, trial_end)
     end
   end
 end

data/spec/models/group_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 require 'cancan/matchers'
 
@@ -6,18 +8,18 @@ describe Group do
 
   describe '#owners' do
     subject { first_group.owners }
-    it { should include group_leader_subscriber }
-    it { should_not include professional_subscriber }
+    it { should include leader_subscriber }
+    it { should_not include prof_subscriber }
   end
 
   describe '#save_with_owner' do
     let(:new_group) do
       group = Group.new(title: 'Saved Group')
-                   .save_with_owner(professional_subscriber)
+                   .save_with_owner(prof_subscriber)
       group.reload
     end
     subject { new_group.owners }
-    it { should include professional_subscriber }
+    it { should include prof_subscriber }
   end
 
   describe '#owners_enabled_count' do
@@ -42,13 +44,13 @@ describe Group do
     it { should eq 2 }
   end
 
-  describe '#enabled' do
+  describe '#enabled?' do
     describe 'when true' do
-      subject { first_group.enabled }
+      subject { first_group.enabled? }
       it { should eq true }
     end
     describe 'when false' do
-      subject { disabled_group.enabled }
+      subject { disabled_group.enabled? }
       it { should eq false }
     end
   end

data/spec/models/paid_up/feature_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe PaidUp::Feature do

data/spec/models/paid_up/plan_feature_setting_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe PaidUp::PlanFeatureSetting do

data/spec/models/paid_up/plan_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe PaidUp::Plan do

data/spec/models/scope_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 require 'cancan/matchers'
 
@@ -10,24 +12,24 @@ describe 'Scopes' do
     it { should_not include inactive_post }
   end
 
-  describe 'paid_for#enabled' do
+  describe 'paid_for#enabled?' do
     describe 'when it is within the limit' do
-      subject { still_enabled_post.enabled }
+      subject { still_enabled_post.enabled? }
       it { should be true }
     end
     describe 'when it is NOT within the limit' do
-      subject { no_longer_enabled_post.enabled }
+      subject { no_longer_enabled_post.enabled? }
       it { should be false }
     end
   end
 
-  describe 'user#table_rows' do
-    subject { free_subscriber.table_rows('posts') }
+  describe "user#table_setting('posts')#rows_count" do
+    subject { free_subscriber.table_setting('posts').rows_count }
     it { should eq 4 }
   end
 
-  describe 'user#rolify_rows' do
-    subject { group_leader_subscriber.rolify_rows('groups') }
+  describe "user#table_setting('groups')#rows_count" do
+    subject { leader_subscriber.rolify_setting('groups').rows_count }
     it { should eq 1 }
   end
 end