paid_up 0.3.0 → 0.4.0

data/spec/factories/plan_feature_setting.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :plan_feature_setting, class: 'PaidUp::PlanFeatureSetting' do
+    feature nil
+    plan nil
+    setting 1
+  end
+end

data/spec/models/paid_up/{features_plan_spec.rb → plan_feature_setting_spec.rb}

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe PaidUp::FeaturesPlan do
+describe PaidUp::PlanFeatureSetting do
   it { should belong_to(:plan).class_name("PaidUp::Plan") }
   it { should validate_presence_of(:setting) }
   it { should validate_presence_of(:plan) }

data/spec/models/paid_up/plan_spec.rb

@@ -1,8 +1,8 @@
 require 'rails_helper'
 
 describe PaidUp::Plan do
-  it { should have_many(:features_plans).class_name('PaidUp::FeaturesPlan') }
-  it { should have_many(:features).class_name('PaidUp::Feature').through(:features_plans) }
+  it { should have_many(:plan_feature_settings).class_name('PaidUp::PlanFeatureSetting') }
+  it { should have_many(:features).class_name('PaidUp::Feature').through(:plan_feature_settings) }
 
   it { should validate_presence_of(:name) }
   it { should validate_presence_of(:stripe_id) }

data/spec/support/plans_and_features.rb

@@ -66,9 +66,9 @@ shared_context "plans and features" do
       sort_order: 1
     ).reload
   }
-  let!(:ad_free_no_ads_features_plan) {
+  let!(:ad_free_no_ads_plan_feature_setting) {
     FactoryGirl.create(
-       :features_plan,
+       :plan_feature_setting,
        plan_id: no_ads_plan.id,
        feature: 'ad_free',
        setting: true
@@ -92,25 +92,25 @@ shared_context "plans and features" do
       sort_order: 2
     ).reload
   }
-  let!(:ad_free_group_leader_features_plan) {
+  let!(:ad_free_group_leader_plan_feature_setting) {
     FactoryGirl.create(
-        :features_plan,
+        :plan_feature_setting,
         plan_id: group_leader_plan.id,
         feature: 'ad_free',
         setting: true
     )
   }
-  let!(:groups_group_leader_features_plan) {
+  let!(:groups_group_leader_plan_feature_setting) {
     FactoryGirl.create(
-        :features_plan,
+        :plan_feature_setting,
         plan_id: group_leader_plan.id,
         feature: 'groups',
         setting: 1
     )
   }
-  let!(:doodads_group_leader_features_plan) {
+  let!(:doodads_group_leader_plan_feature_setting) {
     FactoryGirl.create(
-        :features_plan,
+        :plan_feature_setting,
         plan_id: group_leader_plan.id,
         feature: 'doodads',
         setting: 5
@@ -135,25 +135,25 @@ shared_context "plans and features" do
       sort_order: 3
     ).reload
   }
-  let!(:ad_free_professional_features_plan) {
+  let!(:ad_free_professional_plan_feature_setting) {
     FactoryGirl.create(
-        :features_plan,
+        :plan_feature_setting,
         plan_id: professional_plan.id,
         feature: 'ad_free',
         setting: true
     )
   }
-  let!(:groups_professional_features_plan) {
+  let!(:groups_professional_plan_feature_setting) {
     FactoryGirl.create(
-        :features_plan,
+        :plan_feature_setting,
         plan_id: professional_plan.id,
         feature: 'groups',
         setting: PaidUp::Unlimited.to_i(:db)
     )
   }
-  let!(:doodads_professional_features_plan) {
+  let!(:doodads_professional_plan_feature_setting) {
     FactoryGirl.create(
-        :features_plan,
+        :plan_feature_setting,
         plan_id: professional_plan.id,
         feature: 'doodads',
         setting: PaidUp::Unlimited.to_i(:db)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paid_up
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Karen Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -303,8 +303,8 @@ files:
 - app/helpers/paid_up/subscriptions_helper.rb
 - app/models/paid_up/ability.rb
 - app/models/paid_up/feature.rb
-- app/models/paid_up/features_plan.rb
 - app/models/paid_up/plan.rb
+- app/models/paid_up/plan_feature_setting.rb
 - app/models/paid_up/unlimited.rb
 - app/views/devise/confirmations/new.html.haml
 - app/views/devise/passwords/edit.html.haml
@@ -328,7 +328,7 @@ files:
 - coverage/.last_run.json
 - coverage/.resultset.json
 - coverage/.resultset.json.lock
-- db/migrate/20150407105900_create_paid_up_features_plans_table.rb
+- db/migrate/20150407105900_create_paid_up_plan_feature_settings_table.rb
 - db/migrate/20150407110101_create_paid_up_plans_table.rb
 - db/migrate/20150519164237_add_stripe_id_column_to_users.rb
 - lib/generators/paid_up/install/install_generator.rb
@@ -396,12 +396,12 @@ files:
 - spec/dummy/db/migrate/20150517175136_create_doodads_table.rb
 - spec/dummy/db/migrate/20150523010827_add_devise_to_users.rb
 - spec/dummy/db/migrate/20150523010837_rolify_create_roles.rb
-- spec/dummy/db/migrate/20150523010838_create_paid_up_features_plans_table.paid_up.rb
+- spec/dummy/db/migrate/20150523010838_create_paid_up_plan_feature_settings_table.paid_up.rb
 - spec/dummy/db/migrate/20150523010839_create_paid_up_plans_table.paid_up.rb
 - spec/dummy/db/migrate/20150523010840_add_stripe_id_column_to_users.paid_up.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
-- spec/dummy/db/seeds/features_plans.seeds.rb
+- spec/dummy/db/seeds/plan_feature_settings.seeds.rb
 - spec/dummy/db/seeds/plans.seeds.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.keep
@@ -420,11 +420,11 @@ files:
 - spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-fe185d11a49676890d47bb783312a0cda5a44c4039214094e7957b4c040ef11c.woff2
 - spec/dummy/public/favicon.ico
 - spec/factories/feature.rb
-- spec/factories/features_plan.rb
 - spec/factories/plan.rb
+- spec/factories/plan_feature_setting.rb
 - spec/factories/user.rb
 - spec/models/paid_up/feature_spec.rb
-- spec/models/paid_up/features_plan_spec.rb
+- spec/models/paid_up/plan_feature_setting_spec.rb
 - spec/models/paid_up/plan_spec.rb
 - spec/models/user_spec.rb
 - spec/paid_up_spec.rb

data/spec/factories/features_plan.rb

@@ -1,7 +0,0 @@
-FactoryGirl.define do
-  factory :features_plan, class: 'PaidUp::FeaturesPlan' do
-    feature nil
-    plan nil
-    setting 1
-  end
-end