paid_up 0.3.0 → 0.4.0

data/db/migrate/{20150407105900_create_paid_up_features_plans_table.rb → 20150407105900_create_paid_up_plan_feature_settings_table.rb}

@@ -1,6 +1,6 @@
-class CreatePaidUpFeaturesPlansTable < ActiveRecord::Migration
+class CreatePaidUpPlanFeatureSettingsTable < ActiveRecord::Migration
   def change
-    create_table :paid_up_features_plans do |t|
+    create_table :paid_up_plan_feature_settings do |t|
       t.references :plan, index: true, foreign_key: true
       t.string :feature, index: true, foreign_key: true
       t.integer :setting

data/lib/generators/paid_up/install/templates/initializer.rb

@@ -15,7 +15,7 @@ PaidUp::Feature.new(
   title: 'Groups',
   description: 'How many groups are allowed with this plan?',
   setting_type: 'table_rows'  # Enables table row counting that is enabled by a positive value
-# for the PaidUp::FeaturesPlan.setting associated with this PaidUp::Feature
+# for the PaidUp::PlanFeatureSetting.setting associated with this PaidUp::Feature
 )
 PaidUp::Feature.new(
   slug: 'doodads',

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.3.0 ruby lib
+# stub: paid_up 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "paid_up"
-  s.version = "0.3.0"
+  s.version = "0.4.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 = "2015-05-24"
+  s.date = "2015-05-25"
   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.executables = ["rails"]
@@ -37,8 +37,8 @@ Gem::Specification.new do |s|
     "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",
@@ -62,7 +62,7 @@ Gem::Specification.new do |s|
     "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",
@@ -130,12 +130,12 @@ Gem::Specification.new do |s|
     "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",
@@ -154,11 +154,11 @@ Gem::Specification.new do |s|
     "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/dummy/config/initializers/paid_up.rb

@@ -15,7 +15,7 @@ PaidUp::Feature.new(
   title: 'Groups',
   description: 'How many groups are allowed with this plan?',
   setting_type: 'rolify_rows'  # Enables table row counting that is enabled by a positive value
-# for the PaidUp::FeaturesPlan.setting associated with this PaidUp::Feature
+# for the PaidUp::PlanFeatureSetting.setting associated with this PaidUp::Feature
 )
 PaidUp::Feature.new(
   slug: 'doodads',

data/spec/dummy/db/migrate/{20150523010838_create_paid_up_features_plans_table.paid_up.rb → 20150523010838_create_paid_up_plan_feature_settings_table.paid_up.rb}

@@ -1,7 +1,7 @@
 # This migration comes from paid_up (originally 20150407105900)
-class CreatePaidUpFeaturesPlansTable < ActiveRecord::Migration
+class CreatePaidUpPlanFeatureSettingsTable < ActiveRecord::Migration
   def change
-    create_table :paid_up_features_plans do |t|
+    create_table :paid_up_plan_feature_settings do |t|
       t.references :plan, index: true, foreign_key: true
       t.string :feature, index: true, foreign_key: true
       t.integer :setting

data/spec/dummy/db/schema.rb

@@ -28,14 +28,14 @@ ActiveRecord::Schema.define(version: 20150523010840) do
     t.datetime "updated_at"
   end
 
-  create_table "paid_up_features_plans", force: :cascade do |t|
+  create_table "paid_up_plan_feature_settings", force: :cascade do |t|
     t.integer "plan_id"
     t.string  "feature"
     t.integer "setting"
   end
 
-  add_index "paid_up_features_plans", ["feature"], name: "index_paid_up_features_plans_on_feature"
-  add_index "paid_up_features_plans", ["plan_id"], name: "index_paid_up_features_plans_on_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", ["plan_id"], name: "index_paid_up_plan_feature_settings_on_plan_id"
 
   create_table "paid_up_plans", force: :cascade do |t|
     t.string   "stripe_id"

data/spec/dummy/db/seeds/{features_plans.seeds.rb → plan_feature_settings.seeds.rb}

@@ -1,50 +1,46 @@
 after :plans do
-  ad_free = PaidUp::Feature.find_by_slug 'ad_free'
-  groups = PaidUp::Feature.find_by_slug 'groups'
-  doodads = PaidUp::Feature.find_by_slug 'doodads'
-
   free = PaidUp::Plan.find_by_name 'Free'
   no_ads = PaidUp::Plan.find_by_name 'No Ads'
   group_leader = PaidUp::Plan.find_by_name 'Group Leader'
   professional = PaidUp::Plan.find_by_name 'Professional'
 
   # Ad Free
-  PaidUp::FeaturesPlan.create(
-      feature: ad_free,
+  PaidUp::PlanFeatureSetting.create(
+      feature: 'ad_free',
       plan: no_ads,
       setting: 1
   )
 
   # Group Leader
-  PaidUp::FeaturesPlan.create(
-      feature: ad_free,
+  PaidUp::PlanFeatureSetting.create(
+      feature: 'ad_free',
       plan: group_leader,
       setting: 1
   )
-  PaidUp::FeaturesPlan.create(
-      feature: groups,
+  PaidUp::PlanFeatureSetting.create(
+      feature: 'groups',
       plan: group_leader,
       setting: 1
   )
-  PaidUp::FeaturesPlan.create(
-      feature: doodads,
+  PaidUp::PlanFeatureSetting.create(
+      feature: 'doodads',
       plan: group_leader,
       setting: 5
   )
 
   # Professional
-  PaidUp::FeaturesPlan.create(
-      feature: ad_free,
+  PaidUp::PlanFeatureSetting.create(
+      feature: 'ad_free',
       plan: professional,
       setting: 1
   )
-  PaidUp::FeaturesPlan.create(
-      feature: groups,
+  PaidUp::PlanFeatureSetting.create(
+      feature: 'groups',
       plan: professional,
       setting: PaidUp::Unlimited.to_i(:db)
   )
-  PaidUp::FeaturesPlan.create(
-      feature: doodads,
+  PaidUp::PlanFeatureSetting.create(
+      feature: 'doodads',
       plan: professional,
       setting: PaidUp::Unlimited.to_i(:db)
   )