paid_up 0.7.5 → 0.7.6

data/lib/paid_up/engine.rb

@@ -4,10 +4,15 @@ module PaidUp
     engine_name "paid_up"
 
     config.generators do |g|
-      g.test_framework      :rspec,        :fixture => false
-      g.fixture_replacement :factory_girl, :dir => 'spec/factories'
-      g.assets false
-      g.helper false
+      g.hidden_namespaces << 'test_unit' << 'erb'
+      g.orm             :active_record
+      g.template_engine :haml
+      g.test_framework  :rspec, fixture: false
+      g.integration_tool :rspec
+      g.stylesheets     false
+      g.javascripts     false
+      g.view_specs      false
+      g.helper_specs    false
     end
 
     def self.table_name_prefix

data/lib/paid_up/mixins/paid_for.rb

@@ -60,7 +60,7 @@ module PaidUp::Mixins
           owners_records.count
         end
 
-        send(:define_method, :enabled?) do
+        send(:define_method, :enabled) do
           if owners_enabled_count >= owners_records_count
             true
           else

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.7.5 ruby lib
+# stub: paid_up 0.7.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "paid_up"
-  s.version = "0.7.5"
+  s.version = "0.7.6"
 
   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 = "2015-06-21"
+  s.date = "2015-06-24"
   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 = [
@@ -121,6 +121,9 @@ Gem::Specification.new do |s|
     "spec/dummy/config/locales/en.yml",
     "spec/dummy/config/routes.rb",
     "spec/dummy/config/secrets.yml",
+    "spec/dummy/coverage/.last_run.json",
+    "spec/dummy/coverage/.resultset.json",
+    "spec/dummy/coverage/.resultset.json.lock",
     "spec/dummy/db/development.sqlite3",
     "spec/dummy/db/migrate/20150406154440_create_users_table.rb",
     "spec/dummy/db/migrate/20150517175135_create_groups_table.rb",
@@ -164,10 +167,12 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/support/controller_macros.rb",
     "spec/support/factory_girl.rb",
+    "spec/support/features.rb",
     "spec/support/groups.rb",
-    "spec/support/plans_and_features.rb",
+    "spec/support/loaded_site.rb",
+    "spec/support/plans.rb",
     "spec/support/stripe.rb",
-    "spec/support/subscribers.rb",
+    "spec/support/users.rb",
     "spec/views/paid_up/plans_spec.rb",
     "spec/views/paid_up/subscriptions_spec.rb"
   ]
@@ -199,6 +204,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<sass-rails>, ["~> 5.0"])
       s.add_development_dependency(%q<high_voltage>, ["~> 2.3"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 3.2"])
+      s.add_development_dependency(%q<factory_girl_rails>, ["~> 4.5"])
     else
       s.add_dependency(%q<rails>, ["~> 4"])
       s.add_dependency(%q<rails-i18n>, ["~> 4"])
@@ -219,6 +225,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sass-rails>, ["~> 5.0"])
       s.add_dependency(%q<high_voltage>, ["~> 2.3"])
       s.add_dependency(%q<rspec-rails>, ["~> 3.2"])
+      s.add_dependency(%q<factory_girl_rails>, ["~> 4.5"])
     end
   else
     s.add_dependency(%q<rails>, ["~> 4"])
@@ -240,6 +247,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sass-rails>, ["~> 5.0"])
     s.add_dependency(%q<high_voltage>, ["~> 2.3"])
     s.add_dependency(%q<rspec-rails>, ["~> 3.2"])
+    s.add_dependency(%q<factory_girl_rails>, ["~> 4.5"])
   end
 end
 

data/spec/controllers/paid_up/plans_spec.rb

@@ -1,11 +1,11 @@
 require 'rails_helper'
 
 RSpec.describe PaidUp::PlansController do
-  include_context 'plans and features'
+  include_context 'loaded site'
   routes { PaidUp::Engine.routes }
 
   describe "GET #index" do
-    before :each do
+    before do
       get :index
     end
     context "responds successfully with an HTTP 200 status code" do

data/spec/controllers/paid_up/subscriptions_spec.rb

@@ -2,12 +2,12 @@ require 'rails_helper'
 
 
 RSpec.describe PaidUp::SubscriptionsController do
-  include_context 'plans and features'
+  include_context 'loaded site'
   routes { PaidUp::Engine.routes }
 
   describe 'GET #index' do
     context 'when the user is anonymous' do
-      before :each do
+      before do
         access_anonymous
         get :index
       end
@@ -18,8 +18,7 @@ RSpec.describe PaidUp::SubscriptionsController do
       end
     end
     context 'when the user is signed in as a subscriber' do
-      include_context 'subscribers'
-      before :each do
+      before do
         sign_in free_subscriber
         get :index
       end
@@ -37,7 +36,7 @@ RSpec.describe PaidUp::SubscriptionsController do
 
   describe "GET #new" do
     context "when the user is anonymous" do
-      before :each do
+      before do
         access_anonymous
         get :new, plan_id: professional_plan.id
       end
@@ -50,11 +49,13 @@ RSpec.describe PaidUp::SubscriptionsController do
     context "when the user is signed in" do
       context 'when upgrading' do
         context 'with a paid plan' do
-          include_context 'subscribers'
-          before :each do
+          before do
             sign_in free_subscriber
             get :new, plan_id: professional_plan.id
           end
+          after do
+            free_subscriber.subscribe_to_plan free_plan
+          end
           context "responds successfully with an HTTP 200 status code" do
             subject { response }
             it { should be_success }
@@ -70,11 +71,13 @@ RSpec.describe PaidUp::SubscriptionsController do
           end
         end
         context 'with the free plan' do
-          include_context 'subscribers'
-          before :each do
+          before do
             login_subscriber no_ads_subscriber
             get :new, plan_id: free_plan.id
           end
+          after do
+            no_ads_subscriber.subscribe_to_plan no_ads_plan
+          end
           context "redirects to the subscriptions index page" do
             subject { response }
             it { should redirect_to subscriptions_path }
@@ -86,11 +89,13 @@ RSpec.describe PaidUp::SubscriptionsController do
           end
         end
         context 'when downgrading' do
-          include_context 'subscribers'
-          before :each do
+          before do
             sign_in professional_subscriber
             get :new, plan_id: no_ads_plan.id
           end
+          after do
+            professional_subscriber.subscribe_to_plan professional_plan
+          end
           context "redirects to the subscriptions index page" do
             subject { response }
             it { should redirect_to subscriptions_path }
@@ -107,7 +112,7 @@ RSpec.describe PaidUp::SubscriptionsController do
 
   describe "POST #create" do
     context "when the user is anonymous" do
-      before :each do
+      before do
         access_anonymous
         get :index
       end
@@ -119,12 +124,14 @@ RSpec.describe PaidUp::SubscriptionsController do
     end
     context "when the user is signed in" do
       context "upgrading from the free plan" do
-        include_context 'subscribers'
-        before :each do
+        before do
           sign_in free_subscriber
           token = working_stripe_token free_subscriber
           post :create, plan_id: professional_plan.id, stripeToken: token
         end
+        after do
+          free_subscriber.subscribe_to_plan free_plan
+        end
         context "redirects to the subscriptions index page" do
           subject { response }
           it { should redirect_to subscriptions_path }
@@ -137,11 +144,13 @@ RSpec.describe PaidUp::SubscriptionsController do
       end
 
       context "upgrading from the no ads plan" do
-        include_context 'subscribers'
-        before :each do
+        before do
           sign_in no_ads_subscriber
           post :create, plan_id: professional_plan.id
         end
+        after do
+          no_ads_subscriber.subscribe_to_plan no_ads_plan
+        end
         context "redirects to the subscriptions index page" do
           subject { response }
           it { should redirect_to subscriptions_path }
@@ -154,34 +163,4 @@ RSpec.describe PaidUp::SubscriptionsController do
       end
     end
   end
-
-  describe "GET #index" do
-    context "when the user is anonymous" do
-      before :each do
-        access_anonymous
-        get :index
-      end
-      context 'redirects to the user sign up page' do
-        subject { response }
-        it { should redirect_to '/users/sign_in' }
-        it { should have_http_status(302) }
-      end
-    end
-    context "when the user is signed in" do
-      include_context 'subscribers'
-      before :each do
-        sign_in free_subscriber
-        get :index
-      end
-      context "responds successfully with an HTTP 200 status code" do
-        subject { response }
-        it { should be_success }
-        it { should have_http_status(200) }
-      end
-      context "renders the index template" do
-        subject { response }
-        it { should render_template("index") }
-      end
-    end
-  end
 end

data/spec/dummy/config/application.rb

@@ -26,6 +26,18 @@ module Dummy
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
     config.active_record.raise_in_transactional_callbacks = true
+
+    config.generators do |g|
+      g.hidden_namespaces << 'test_unit' << 'erb'
+      g.orm             :active_record
+      g.template_engine :haml
+      g.test_framework  :rspec, fixture: false
+      g.integration_tool :rspec
+      g.stylesheets     false
+      g.javascripts     false
+      g.view_specs      false
+      g.helper_specs    false
+    end
   end
 end
 

data/spec/dummy/coverage/.last_run.json

@@ -0,0 +1,5 @@
+{
+  "result": {
+    "covered_percent": 53.33
+  }
+}

data/spec/dummy/coverage/.resultset.json

@@ -0,0 +1,155 @@
+{
+  "RSpec": {
+    "coverage": {
+      "/home/work/Gems/paid_up/spec/dummy/spec/spec_helper.rb": [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+      ],
+      "/home/work/Gems/paid_up/spec/dummy/spec/dummy/config/environment.rb": [
+        null,
+        1,
+        null,
+        null,
+        0
+      ],
+      "/home/work/Gems/paid_up/spec/dummy/spec/dummy/config/application.rb": [
+        1,
+        null,
+        null,
+        1,
+        1,
+        null,
+        1,
+        1,
+        null,
+        1,
+        1,
+        null,
+        0,
+        0,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        0,
+        null,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        null,
+        null,
+        null,
+        null
+      ],
+      "/home/work/Gems/paid_up/spec/dummy/spec/dummy/config/boot.rb": [
+        null,
+        1,
+        null,
+        1,
+        1
+      ]
+    },
+    "timestamp": 1435112021
+  }
+}

data/spec/dummy/db/seeds.rb

@@ -1,3 +1,5 @@
+# Dir[Rails.root.join("spec/factories/*.rb")].each {|f| require f}
+
 ###############
 # Plans       #
 ###############
@@ -12,7 +14,7 @@ Stripe::Plan.find_or_create_by_id(
         :id => 'anonymous-plan'
     }
 )
-anonymous = PaidUp::Plan.create(
+anonymous_plan = PaidUp::Plan.create(
     title: 'Anonymous',
     stripe_id: 'anonymous-plan',
     description: "What you can do without logging in.",
@@ -28,7 +30,7 @@ Stripe::Plan.find_or_create_by_id(
         :id => 'free-plan'
     }
 )
-free = PaidUp::Plan.create(
+free_plan = PaidUp::Plan.create(
     title: 'Free',
     stripe_id: 'free-plan',
     description: "Can't beat the price!",
@@ -44,7 +46,7 @@ Stripe::Plan.find_or_create_by_id(
         :id => 'no-ads-plan'
     }
 )
-no_ads = PaidUp::Plan.create(
+no_ads_plan = PaidUp::Plan.create(
     title: 'No Ads',
     stripe_id: 'no-ads-plan',
     description: "No frills, just removes the ads.",
@@ -60,7 +62,7 @@ Stripe::Plan.find_or_create_by_id(
         :id => 'group-leader-plan'
     }
 )
-group_leader = PaidUp::Plan.create(
+group_leader_plan = PaidUp::Plan.create(
     title: 'Group Leader',
     stripe_id: 'group-leader-plan',
     description: "For leaders of single groups, with configuration.",
@@ -76,7 +78,7 @@ Stripe::Plan.find_or_create_by_id(
         :id => 'professional-plan'
     }
 )
-professional = PaidUp::Plan.create(
+professional_plan = PaidUp::Plan.create(
     title: 'Professional',
     stripe_id: 'professional-plan',
     description: "Designed for professionals with unlimited groups, a calendar and configuration.",
@@ -100,40 +102,112 @@ Stripe::Customer.find_or_create_by_id(
 # Ad Free
 PaidUp::PlanFeatureSetting.create(
     feature: 'ad_free',
-    plan: no_ads,
+    plan: no_ads_plan,
     setting: 1
 )
 
 # Group Leader
 PaidUp::PlanFeatureSetting.create(
     feature: 'ad_free',
-    plan: group_leader,
+    plan: group_leader_plan,
     setting: 1
 )
 PaidUp::PlanFeatureSetting.create(
     feature: 'groups',
-    plan: group_leader,
-    setting: 1
+    plan: group_leader_plan,
+    setting: 5
 )
 PaidUp::PlanFeatureSetting.create(
     feature: 'doodads',
-    plan: group_leader,
-    setting: 5
+    plan: group_leader_plan,
+    setting: 10
 )
 
 # Professional
 PaidUp::PlanFeatureSetting.create(
     feature: 'ad_free',
-    plan: professional,
+    plan: professional_plan,
     setting: 1
 )
 PaidUp::PlanFeatureSetting.create(
     feature: 'groups',
-    plan: professional,
+    plan: professional_plan,
     setting: PaidUp::Unlimited.to_i(:db)
 )
 PaidUp::PlanFeatureSetting.create(
     feature: 'doodads',
-    plan: professional,
+    plan: professional_plan,
     setting: PaidUp::Unlimited.to_i(:db)
+)
+
+###############
+# Users       #
+###############
+
+free_subscriber = FactoryGirl.create(
+    :user,
+    name: 'Free Subscriber',
+    plan: free_plan
+)
+
+no_ads_subscriber = FactoryGirl.create(
+    :user,
+    name: 'No Ads Subscriber',
+    plan: no_ads_plan
+)
+
+group_leader_subscriber = FactoryGirl.create(
+    :user,
+    name: 'Group Leader Subscriber',
+    plan: group_leader_plan
+)
+
+disabling_subscriber = FactoryGirl.create(
+    :user,
+    name: 'Disabling Subscriber',
+    plan: group_leader_plan
+)
+
+professional_subscriber = FactoryGirl.create(
+    :user,
+    name: 'Professional Subscriber',
+    plan: professional_plan
+)
+
+blank_subscriber = FactoryGirl.create(
+    :user,
+    name: 'Blank Subscriber',
+    plan: professional_plan
+)
+
+###############
+# Groups      #
+###############
+
+FactoryGirl.create(
+    :group,
+    title: 'First Group',
+    owner: group_leader_subscriber
+)
+
+FactoryGirl.create(
+    :group,
+    title: 'Second Group',
+    owner: professional_subscriber
+)
+
+FactoryGirl.create(
+    :group,
+    title: 'Third Group',
+    owner: professional_subscriber
+)
+
+5.times do
+  FactoryGirl.create(:group, owner: disabling_subscriber)
+end
+
+FactoryGirl.create(
+    :group,
+    title: 'Disabled Group',
+    owner: disabling_subscriber
 )