paid_up 0.11.3 → 0.11.4

data/lib/paid_up/mixins/subscriber.rb

@@ -89,7 +89,7 @@ module PaidUp
           end
           send(:define_method, :table_rows) do |table_name|
             model = table_name.classify.constantize
-            model.paid_for_scope.size
+            model.where(user: self).paid_for_scope.size
           end
           send(:define_method, :rolify_rows_unlimited?) do |table_name|
             rolify_rows_allowed(table_name) == PaidUp::Unlimited.to_i

data/paid_up.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: paid_up 0.11.3 ruby lib
+# stub: paid_up 0.11.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "paid_up"
-  s.version = "0.11.3"
+  s.version = "0.11.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -162,6 +162,7 @@ Gem::Specification.new do |s|
     "spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-e395044093757d82afcb138957d06a1ea9361bdcf0b442d06a18a8051af57456.ttf",
     "spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-fe185d11a49676890d47bb783312a0cda5a44c4039214094e7957b4c040ef11c.woff2",
     "spec/dummy/public/favicon.ico",
+    "spec/factories/doodad.rb",
     "spec/factories/group.rb",
     "spec/factories/plan.rb",
     "spec/factories/plan_feature_setting.rb",

data/spec/dummy/db/seeds.rb

@@ -241,9 +241,9 @@ FactoryGirl.create(
   active: true
 )
 
-5.times do
-  FactoryGirl.create(:group, owner: disabling_subscriber, active: true)
-end
+FactoryGirl.create_list(:group, 5, owner: disabling_subscriber, active: true)
+FactoryGirl.create_list(:doodad, 10, user: disabling_subscriber)
+FactoryGirl.create_list(:post, 10, user: disabling_subscriber, active: true)
 
 FactoryGirl.create(
   :group,

data/spec/factories/doodad.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :doodad do
+    name 'Test Name'
+    user { User.order('RANDOM()').first }
+  end
+end

data/spec/models/user_spec.rb

@@ -340,33 +340,88 @@ describe User do
       it { should_not be_able_to(:create, Doodad) }
     end
     context 'when on group plan' do
-      context 'given no groups are owned' do
-        let(:group) do
-          FactoryGirl.create(:group, owner: group_leader_subscriber)
-        end
+      describe 'misc abilities' do
         let(:user) { group_leader_subscriber }
         subject(:ability) { Ability.new(user) }
-        it { should be_able_to(:index, group) }
-        it { should be_able_to(:show, group) }
-        it { should be_able_to(:manage, group) }
-        it { should be_able_to(:own, Group) }
-        it { should be_able_to(:create, Group) }
         it { should be_able_to(:use, :ad_free) }
-        it { should be_able_to(:create, Doodad) }
       end
-      context 'given all allowed groups are owned' do
-        let(:group) do
-          FactoryGirl.create(:group, owner: disabling_subscriber)
+      describe 'using groups' do
+        context 'given no groups are owned' do
+          let(:group) do
+            FactoryGirl.create(:group, owner: group_leader_subscriber)
+          end
+          let(:user) { group_leader_subscriber }
+          subject(:ability) { Ability.new(user) }
+          it { should be_able_to(:index, group) }
+          it { should be_able_to(:show, group) }
+          it { should be_able_to(:manage, group) }
+          it { should be_able_to(:own, Group) }
+          it { should be_able_to(:create, Group) }
+        end
+        context 'given all allowed groups are owned' do
+          let(:group) do
+            FactoryGirl.create(:group, owner: disabling_subscriber)
+          end
+          let(:user) { disabling_subscriber }
+          subject(:ability) { Ability.new(user) }
+          it { should be_able_to(:index, group) }
+          it { should be_able_to(:show, group) }
+          it { should be_able_to(:manage, group) }
+          it { should be_able_to(:own, Group) }
+          it { should_not be_able_to(:create, Group) }
+        end
+      end
+      describe 'using doodads' do
+        context 'given no doodads are owned' do
+          let(:doodad) do
+            FactoryGirl.create(:doodad, user: group_leader_subscriber)
+          end
+          let(:user) { group_leader_subscriber }
+          subject(:ability) { Ability.new(user) }
+          it { should be_able_to(:index, doodad) }
+          it { should be_able_to(:show, doodad) }
+          it { should be_able_to(:manage, doodad) }
+          it { should be_able_to(:own, Doodad) }
+          it { should be_able_to(:create, Doodad) }
+        end
+        context 'given all allowed doodads are owned' do
+          let(:doodad) do
+            FactoryGirl.create(:doodad, user: disabling_subscriber)
+          end
+          let(:user) { disabling_subscriber }
+          subject(:ability) { Ability.new(user) }
+          it { should be_able_to(:index, doodad) }
+          it { should be_able_to(:show, doodad) }
+          it { should be_able_to(:manage, doodad) }
+          it { should be_able_to(:own, Doodad) }
+          it { should_not be_able_to(:create, Doodad) }
+        end
+      end
+      describe 'using posts' do
+        context 'given no posts are owned' do
+          let(:post) do
+            FactoryGirl.create(:post, user: group_leader_subscriber)
+          end
+          let(:user) { group_leader_subscriber }
+          subject(:ability) { Ability.new(user) }
+          it { should be_able_to(:index, post) }
+          it { should be_able_to(:show, post) }
+          it { should be_able_to(:manage, post) }
+          it { should be_able_to(:own, Post) }
+          it { should be_able_to(:create, Post) }
+        end
+        context 'given all allowed posts are owned' do
+          let(:post) do
+            FactoryGirl.create(:post, user: disabling_subscriber)
+          end
+          let(:user) { disabling_subscriber }
+          subject(:ability) { Ability.new(user) }
+          it { should be_able_to(:index, post) }
+          it { should be_able_to(:show, post) }
+          it { should be_able_to(:manage, post) }
+          it { should be_able_to(:own, Post) }
+          it { should_not be_able_to(:create, Post) }
         end
-        let(:user) { disabling_subscriber }
-        subject(:ability) { Ability.new(user) }
-        it { should be_able_to(:index, group) }
-        it { should be_able_to(:show, group) }
-        it { should be_able_to(:manage, group) }
-        it { should be_able_to(:own, Group) }
-        it { should_not be_able_to(:create, Group) }
-        it { should be_able_to(:use, :ad_free) }
-        it { should be_able_to(:create, Doodad) }
       end
     end
     context 'when on professional plan' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paid_up
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Karen Lundgren
@@ -526,6 +526,7 @@ files:
 - spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-e395044093757d82afcb138957d06a1ea9361bdcf0b442d06a18a8051af57456.ttf
 - spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-fe185d11a49676890d47bb783312a0cda5a44c4039214094e7957b4c040ef11c.woff2
 - spec/dummy/public/favicon.ico
+- spec/factories/doodad.rb
 - spec/factories/group.rb
 - spec/factories/plan.rb
 - spec/factories/plan_feature_setting.rb