paid_up 0.10.4 → 0.11.0

data/lib/paid_up/mixins/paid_for.rb

@@ -8,7 +8,8 @@ module PaidUp
           PaidUp::Feature.find_by_slug(table_name)
         end
 
-        def paid_for
+        def paid_for(options = {})
+          my_scope = options[:scope] || :all
           feature.nil? && raise(
             :feature_not_found_feature.l(feature: table_name)
           )
@@ -20,6 +21,7 @@ module PaidUp
             attr_accessor :owner
           when 'table_rows'
             belongs_to :user
+            User.has_many table_name.to_sym
           else
             raise(
               :value_is_not_a_valid_setting_type.l(
@@ -28,8 +30,19 @@ module PaidUp
             )
           end
 
+          singleton_class.instance_eval do
+            send(:define_method, :paid_for_scope) do
+              send(my_scope)
+            end
+          end
+
           send(:define_method, :owners) do
-            User.with_role(:owner, self)
+            case self.class.feature.setting_type
+            when 'table_rows'
+              [user]
+            when 'rolify_rows'
+              User.with_role(:owner, self)
+            end
           end
 
           send(:define_method, :save_with_owner) do |owner|
@@ -41,6 +54,7 @@ module PaidUp
             end
           end
 
+          # How many records can this user have?
           send(:define_method, :owners_enabled_count) do
             setting = 0
             owners.each do |subscriber|
@@ -54,9 +68,14 @@ module PaidUp
             owners.each do |subscriber|
               case self.class.feature.setting_type
               when 'table_rows'
-                ids += subscriber.send(self.class.table_name).pluck(:id)
+                ids += subscriber.send(self.class.table_name)
+                                 .send(my_scope)
+                                 .pluck(:id)
               when 'rolify_rows'
-                ids += self.class.with_role(:owner, subscriber).pluck(:id)
+                ids += self.class
+                           .with_role(:owner, subscriber)
+                           .send(my_scope)
+                           .pluck(:id)
               else
                 raise(
                   :no_features_associated_with_table.l(

data/lib/paid_up/mixins/subscriber.rb

@@ -88,7 +88,8 @@ module PaidUp
             plan.feature_setting table_name
           end
           send(:define_method, :table_rows) do |table_name|
-            send(table_name).size
+            model = table_name.classify.constantize
+            model.paid_for_scope.size
           end
           send(:define_method, :rolify_rows_unlimited?) do |table_name|
             rolify_rows_allowed(table_name) == PaidUp::Unlimited.to_i
@@ -100,8 +101,8 @@ module PaidUp
             plan.feature_setting table_name
           end
           send(:define_method, :rolify_rows) do |table_name|
-            records = table_name.classify.constantize.with_role(:owner, self)
-            records.size
+            model = table_name.classify.constantize
+            model.with_role(:owner, self).paid_for_scope.size
           end
           send(:define_method, :plan_stripe_id) do
             subscription.nil? && return

data/paid_up.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: paid_up 0.10.4 ruby lib
+# stub: paid_up 0.11.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "paid_up"
-  s.version = "0.10.4"
+  s.version = "0.11.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Karen Lundgren"]
-  s.date = "2016-04-06"
+  s.date = "2017-02-20"
   s.description = "Allows a model of your choosing (such as users) to subscribe to a plan, which enables features."
   s.email = "karen.e.lundgren@gmail.com"
   s.extra_rdoc_files = [
@@ -96,6 +96,7 @@ Gem::Specification.new do |s|
     "spec/dummy/app/models/ability.rb",
     "spec/dummy/app/models/doodad.rb",
     "spec/dummy/app/models/group.rb",
+    "spec/dummy/app/models/post.rb",
     "spec/dummy/app/models/role.rb",
     "spec/dummy/app/models/user.rb",
     "spec/dummy/app/views/layouts/application.html.haml",
@@ -141,6 +142,8 @@ Gem::Specification.new do |s|
     "spec/dummy/db/migrate/20160207184113_add_stripe_id_column_to_users.paid_up.rb",
     "spec/dummy/db/migrate/20160207184114_create_paid_up_plan_feature_settings_table.paid_up.rb",
     "spec/dummy/db/migrate/20160210165341_add_coupon_code_column_to_users.paid_up.rb",
+    "spec/dummy/db/migrate/20170219225950_create_posts_table.rb",
+    "spec/dummy/db/migrate/20170220001913_add_active_column_to_groups.rb",
     "spec/dummy/db/schema.rb",
     "spec/dummy/db/seeds.rb",
     "spec/dummy/db/test.sqlite3",
@@ -162,11 +165,13 @@ Gem::Specification.new do |s|
     "spec/factories/group.rb",
     "spec/factories/plan.rb",
     "spec/factories/plan_feature_setting.rb",
+    "spec/factories/post.rb",
     "spec/factories/user.rb",
     "spec/models/group_spec.rb",
     "spec/models/paid_up/feature_spec.rb",
     "spec/models/paid_up/plan_feature_setting_spec.rb",
     "spec/models/paid_up/plan_spec.rb",
+    "spec/models/scope_spec.rb",
     "spec/models/user_spec.rb",
     "spec/paid_up_spec.rb",
     "spec/rails_helper.rb",
@@ -179,6 +184,7 @@ Gem::Specification.new do |s|
     "spec/support/loaded_site/groups.rb",
     "spec/support/loaded_site/loaded_site.rb",
     "spec/support/loaded_site/plans.rb",
+    "spec/support/loaded_site/posts.rb",
     "spec/support/loaded_site/users.rb",
     "spec/support/stripe.rb",
     "spec/views/paid_up/plans_spec.rb",

data/spec/dummy/app/models/group.rb

@@ -1,3 +1,5 @@
 class Group < ActiveRecord::Base
-  paid_for
+  paid_for scope: :active
+
+  scope :active, -> { where(active: true) }
 end

data/spec/dummy/app/models/post.rb

@@ -0,0 +1,5 @@
+class Post < ActiveRecord::Base
+  paid_for scope: :active
+
+  scope :active, -> { where(active: true) }
+end

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

@@ -24,4 +24,10 @@ PaidUp.configure do |config|
     description: 'How many doodads included with this plan?',
     setting_type: 'table_rows'
   )
+  PaidUp.add_feature(
+    slug: 'posts',
+    title: 'Posts',
+    description: 'How many posts included with this plan?',
+    setting_type: 'table_rows'
+  )
 end

data/spec/dummy/db/migrate/20170219225950_create_posts_table.rb

@@ -0,0 +1,11 @@
+class CreatePostsTable < ActiveRecord::Migration
+  def change
+    create_table :posts do |t|
+      t.string :user_id, index: true
+      t.string :title
+      t.boolean :active, null: false, default: false
+      t.timestamps
+    end
+    add_index :posts, :active
+  end
+end

data/spec/dummy/db/migrate/20170220001913_add_active_column_to_groups.rb

@@ -0,0 +1,6 @@
+class AddActiveColumnToGroups < ActiveRecord::Migration
+  def change
+    add_column :groups, :active, :boolean, null: false, default: false
+    add_index :groups, :active
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,79 +11,93 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160210165341) do
+ActiveRecord::Schema.define(version: 20170220001913) do
 
-  create_table 'doodads', force: :cascade do |t|
-    t.string 'user_id'
-    t.string 'name'
-    t.text   'description'
+  create_table "doodads", force: :cascade do |t|
+    t.string "user_id"
+    t.string "name"
+    t.text   "description"
   end
 
-  add_index "doodads", ['user_id'], name: "index_doodads_on_user_id"
+  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'
+  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
   end
 
-  create_table 'paid_up_plan_feature_settings', force: :cascade do |t|
-    t.integer 'paid_up_plan_id'
-    t.string  'feature'
-    t.integer 'setting'
+  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"
   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"
+  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'
-    t.text     'description'
-    t.integer  'sort_order'
-    t.datetime 'created_at'
-    t.datetime 'updated_at'
+  create_table "paid_up_plans", force: :cascade do |t|
+    t.string   "stripe_id"
+    t.string   "title"
+    t.text     "description"
+    t.integer  "sort_order"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   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
+  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 'roles', force: :cascade do |t|
-    t.string   'name'
-    t.integer  'resource_id'
-    t.string   'resource_type'
-    t.datetime 'created_at'
-    t.datetime 'updated_at'
+  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"
   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
-    t.string   "encrypted_password",     default: '', null: false
-    t.string   'reset_password_token'
-    t.datetime 'reset_password_sent_at'
-    t.datetime 'remember_created_at'
-    t.integer  'sign_in_count',          default: 0,  null: false
-    t.datetime 'current_sign_in_at'
-    t.datetime 'last_sign_in_at'
-    t.string   'current_sign_in_ip'
-    t.string   'last_sign_in_ip'
-    t.string   'stripe_id'
-    t.string   'coupon_code'
+  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.datetime "created_at"
+    t.datetime "updated_at"
+  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
+    t.string   "encrypted_password",     default: "", null: false
+    t.string   "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",          default: 0,  null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.string   "stripe_id"
+    t.string   "coupon_code"
   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
+  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'
+  create_table "users_roles", id: false, force: :cascade do |t|
+    t.integer "user_id"
+    t.integer "role_id"
   end
 
-  add_index "users_roles", ["user_id", 'role_id'], name: "index_users_roles_on_user_id_and_role_id"
+  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

@@ -99,12 +99,24 @@ Stripe::Customer.find_or_create_by_id(
 # PlanFeatureSettings #
 #######################
 
+# Free
+PaidUp::PlanFeatureSetting.create(
+  feature: 'posts',
+  plan: free_plan,
+  setting: 3
+)
+
 # Ad Free
 PaidUp::PlanFeatureSetting.create(
   feature: 'ad_free',
   plan: no_ads_plan,
   setting: 1
 )
+PaidUp::PlanFeatureSetting.create(
+  feature: 'posts',
+  plan: no_ads_plan,
+  setting: 5
+)
 
 # Group Leader
 PaidUp::PlanFeatureSetting.create(
@@ -122,6 +134,11 @@ PaidUp::PlanFeatureSetting.create(
   plan: group_leader_plan,
   setting: 10
 )
+PaidUp::PlanFeatureSetting.create(
+  feature: 'posts',
+  plan: group_leader_plan,
+  setting: 10
+)
 
 # Professional
 PaidUp::PlanFeatureSetting.create(
@@ -139,12 +156,17 @@ PaidUp::PlanFeatureSetting.create(
   plan: professional_plan,
   setting: PaidUp::Unlimited.to_i(:db)
 )
+PaidUp::PlanFeatureSetting.create(
+  feature: 'posts',
+  plan: professional_plan,
+  setting: 25
+)
 
 ###############
 # Users     #
 ###############
 
-FactoryGirl.create(
+free_subscriber = FactoryGirl.create(
   :user,
   name: 'Free Subscriber',
   plan: free_plan
@@ -194,33 +216,84 @@ past_due_subscriber = FactoryGirl.create(
 FactoryGirl.create(
   :group,
   title: 'First Group',
-  owner: group_leader_subscriber
+  owner: group_leader_subscriber,
+  active: true
+)
+
+FactoryGirl.create(
+  :group,
+  title: 'Inactive Group',
+  owner: group_leader_subscriber,
+  active: false
 )
 
 FactoryGirl.create(
   :group,
   title: 'Second Group',
-  owner: professional_subscriber
+  owner: professional_subscriber,
+  active: true
 )
 
 FactoryGirl.create(
   :group,
   title: 'Third Group',
-  owner: professional_subscriber
+  owner: professional_subscriber,
+  active: true
 )
 
 5.times do
-  FactoryGirl.create(:group, owner: disabling_subscriber)
+  FactoryGirl.create(:group, owner: disabling_subscriber, active: true)
 end
 
 FactoryGirl.create(
   :group,
   title: 'Disabled Group',
-  owner: disabling_subscriber
+  owner: disabling_subscriber,
+  active: true
 )
 
 FactoryGirl.create(
   :group,
   title: 'Past Due Group',
-  owner: past_due_subscriber
+  owner: past_due_subscriber,
+  active: true
+)
+
+###############
+# Posts       #
+###############
+
+FactoryGirl.create(
+  :post,
+  title: 'First Post',
+  user: free_subscriber,
+  active: true
+)
+
+FactoryGirl.create(
+  :post,
+  title: 'Active Post',
+  user: free_subscriber,
+  active: true
+)
+
+FactoryGirl.create(
+  :post,
+  title: 'Inactive Post',
+  user: free_subscriber,
+  active: false
+)
+
+FactoryGirl.create(
+  :post,
+  title: 'Still Enabled Post',
+  user: free_subscriber,
+  active: true
+)
+
+FactoryGirl.create(
+  :post,
+  title: 'No Longer Enabled Post',
+  user: free_subscriber,
+  active: true
 )

data/spec/factories/post.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :post do
+    title 'Test Title'
+    user { User.order('RANDOM()').first }
+    active true
+  end
+end

data/spec/models/paid_up/feature_spec.rb

@@ -31,7 +31,8 @@ describe PaidUp::Feature do
         eq(
           ad_free: ad_free_feature,
           groups: groups_feature,
-          doodads: doodads_feature
+          doodads: doodads_feature,
+          posts: posts_feature
         )
       )
     end
@@ -39,7 +40,14 @@ describe PaidUp::Feature do
 
   context '.all' do
     subject { PaidUp::Feature.all }
-    it { should eq [ad_free_feature, groups_feature, doodads_feature] }
+    it do
+      should eq [
+        ad_free_feature,
+        groups_feature,
+        doodads_feature,
+        posts_feature
+      ]
+    end
   end
 
   context '.find_all' do

data/spec/models/scope_spec.rb

@@ -0,0 +1,33 @@
+require 'rails_helper'
+require 'cancan/matchers'
+
+describe 'Scopes' do
+  include_context 'loaded site'
+
+  describe 'paid_for#owners_records' do
+    subject { first_post.owners_records }
+    it { should include active_post }
+    it { should_not include inactive_post }
+  end
+
+  describe 'paid_for#enabled' do
+    describe 'when it is within the limit' do
+      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 }
+      it { should be false }
+    end
+  end
+
+  describe 'user#table_rows' do
+    subject { free_subscriber.table_rows('posts') }
+    it { should eq 4 }
+  end
+
+  describe 'user#rolify_rows' do
+    subject { group_leader_subscriber.rolify_rows('groups') }
+    it { should eq 1 }
+  end
+end

data/spec/models/user_spec.rb

@@ -206,7 +206,8 @@ describe User do
         3.times do
           FactoryGirl.create(
             :group,
-            owner: blank_subscriber
+            owner: blank_subscriber,
+            active: true
           )
         end
       end

data/spec/support/loaded_site/features.rb

@@ -1,5 +1,6 @@
 shared_context 'features' do
   let!(:ad_free_feature) { PaidUp::Feature.find_by_slug('ad_free') }
   let!(:groups_feature) { PaidUp::Feature.find_by_slug('groups') }
-  let!(:doodads_feature) { PaidUp::Feature.find_by_slug('doodads') }\
+  let!(:doodads_feature) { PaidUp::Feature.find_by_slug('doodads') }
+  let!(:posts_feature) { PaidUp::Feature.find_by_slug('posts') }
 end

data/spec/support/loaded_site/loaded_site.rb

@@ -4,4 +4,5 @@ shared_context 'loaded site' do
   include_context 'stripe'
   include_context 'users'
   include_context 'groups'
+  include_context 'posts'
 end

data/spec/support/loaded_site/posts.rb

@@ -0,0 +1,7 @@
+shared_context 'posts' do
+  let(:first_post) { Post.find_by_title('First Post') }
+  let(:active_post) { Post.find_by_title('Active Post') }
+  let(:inactive_post) { Post.find_by_title('Inactive Post') }
+  let(:still_enabled_post) { Post.find_by_title('Still Enabled Post') }
+  let(:no_longer_enabled_post) { Post.find_by_title('No Longer Enabled Post') }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paid_up
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.0
 platform: ruby
 authors:
 - Karen Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -460,6 +460,7 @@ files:
 - spec/dummy/app/models/ability.rb
 - spec/dummy/app/models/doodad.rb
 - spec/dummy/app/models/group.rb
+- spec/dummy/app/models/post.rb
 - spec/dummy/app/models/role.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.haml
@@ -505,6 +506,8 @@ files:
 - spec/dummy/db/migrate/20160207184113_add_stripe_id_column_to_users.paid_up.rb
 - spec/dummy/db/migrate/20160207184114_create_paid_up_plan_feature_settings_table.paid_up.rb
 - spec/dummy/db/migrate/20160210165341_add_coupon_code_column_to_users.paid_up.rb
+- spec/dummy/db/migrate/20170219225950_create_posts_table.rb
+- spec/dummy/db/migrate/20170220001913_add_active_column_to_groups.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/db/test.sqlite3
@@ -526,11 +529,13 @@ files:
 - spec/factories/group.rb
 - spec/factories/plan.rb
 - spec/factories/plan_feature_setting.rb
+- spec/factories/post.rb
 - spec/factories/user.rb
 - spec/models/group_spec.rb
 - spec/models/paid_up/feature_spec.rb
 - spec/models/paid_up/plan_feature_setting_spec.rb
 - spec/models/paid_up/plan_spec.rb
+- spec/models/scope_spec.rb
 - spec/models/user_spec.rb
 - spec/paid_up_spec.rb
 - spec/rails_helper.rb
@@ -543,6 +548,7 @@ files:
 - spec/support/loaded_site/groups.rb
 - spec/support/loaded_site/loaded_site.rb
 - spec/support/loaded_site/plans.rb
+- spec/support/loaded_site/posts.rb
 - spec/support/loaded_site/users.rb
 - spec/support/stripe.rb
 - spec/views/paid_up/plans_spec.rb