paid_up 0.2.4 → 0.3.0

data/db/migrate/20150407105900_create_paid_up_features_plans_table.rb

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

data/lib/generators/paid_up/install/install_generator.rb

@@ -14,6 +14,7 @@ module PaidUp
 
     def install_devise
       output "To start with, Devise is used to authenticate users. No need to install it separately, I'll do that now.", :magenta
+      gsub_file "config/routes.rb", /devise_for :users/, ''
       generate("devise:install")
       generate("devise User")
     end
@@ -23,6 +24,11 @@ module PaidUp
       template "ability.rb", "app/models/ability.rb"
     end
 
+    def install_rolify
+      output "To provide varying roles for Users, we'll use Rolify. Let's set that up now.", :magenta
+      generate("rolify", "Role User")
+    end
+
     def add_initializer
       output "Next, you'll need an initializer.  This is where you put your configuration options.", :magenta
       template "initializer.rb", "config/initializers/paid_up.rb"

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

@@ -2,4 +2,24 @@ PaidUp.configure do |config|
   config.anonymous_customer_stripe_id = 'anonymous-customer'
   config.anonymous_plan_stripe_id = 'anonymous-plan'
   config.free_plan_stripe_id = 'free-plan'
-end
+end
+
+PaidUp::Feature.new(
+  slug: 'ad_free',
+  title: 'Ad Free',
+  description: 'Are ads removed from the site with this plan?',
+  setting_type: 'boolean'
+)
+PaidUp::Feature.new(
+  slug: 'groups',
+  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
+)
+PaidUp::Feature.new(
+  slug: 'doodads',
+  title: 'Doodads',
+  description: 'How many doodads included with this plan?',
+  setting_type: 'rolify_rows'
+)

data/lib/paid_up/{integer.rb → extensions/integer.rb}

@@ -1,9 +1,7 @@
-module PaidUp
+module PaidUp::Extensions
   module Integer
     def to_date
       Time.at(self).strftime("%m/%d/%Y")
     end
   end
-end
-
-Integer.send(:include, PaidUp::Integer)
+end

data/lib/paid_up/{stripe_extensions.rb → extensions/stripe.rb}

@@ -1,5 +1,5 @@
-module PaidUp
-  module StripeExtensions
+module PaidUp::Extensions
+  module Stripe
     extend ActiveSupport::Concern
     class_methods do
       def find_or_create_by_id(id, item)
@@ -11,7 +11,4 @@ module PaidUp
       end
     end
   end
-end
-
-Stripe::Customer.send(:include, PaidUp::StripeExtensions)
-Stripe::Plan.send(:include, PaidUp::StripeExtensions)
+end

data/lib/paid_up/mixins/paid_for.rb

@@ -0,0 +1,24 @@
+module PaidUp::Mixins
+  module PaidFor
+    extend ActiveSupport::Concern
+    class_methods do
+      def paid_for
+        feature = PaidUp::Feature.find_by_slug(table_name)
+        if feature.nil?
+          raise :feature_not_found_feature.l feature: table_name
+        else
+          case feature.setting_type
+            when 'boolean'
+              # Nothing needs doing
+            when 'rolify_rows'
+              resourcify
+            when 'table_rows'
+              belongs_to :user
+            else
+              raise :value_is_not_a_valid_setting_type.l(value: feature.setting_type)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/paid_up/{mixins.rb → mixins/subscriber.rb}

@@ -1,9 +1,12 @@
-module PaidUp
-  module Mixins
+module PaidUp::Mixins
+  module Subscriber
     extend ActiveSupport::Concern
     class_methods do
       def subscriber
-        attr_reader :stripe_data
+        features = PaidUp::Feature.find_all_by_setting_type('table_rows')
+        for feature in features
+          has_many feature.slug.to_sym
+        end
 
         after_initialize :set_default_attributes, :load_stripe_data
         before_save :remove_anonymous_association
@@ -67,10 +70,23 @@ module PaidUp
           table_rows_allowed(table_name) - table_rows(table_name)
         }
         self.send(:define_method, :table_rows_allowed) { |table_name|
-          plan.feature_setting_by_name table_name
+          plan.feature_setting table_name
         }
         self.send(:define_method, :table_rows) { |table_name|
-          send(table_name).count
+          send(table_name).size
+        }
+        self.send(:define_method, :rolify_rows_unlimited?) { |table_name|
+          rolify_rows_allowed(table_name) == PaidUp::Unlimited.to_i
+        }
+        self.send(:define_method, :rolify_rows_remaining) { |table_name|
+          rolify_rows_allowed(table_name) - rolify_rows(table_name)
+        }
+        self.send(:define_method, :rolify_rows_allowed) { |table_name|
+          plan.feature_setting table_name
+        }
+        self.send(:define_method, :rolify_rows) { |table_name|
+          records = table_name.classify.constantize.with_role(:owner, self)
+          records.size
         }
         self.send(:define_method, :plan_stripe_id) {
          if subscription.nil?
@@ -96,6 +112,12 @@ module PaidUp
         self.send(:define_method, :using_free_plan?) {
           plan.stripe_id == PaidUp.configuration.free_plan_stripe_id || stripe_data.delinquent
         }
+        self.send(:define_method, :set_default_attributes) {
+          if new_record?
+            self.stripe_id = PaidUp.configuration.anonymous_customer_stripe_id
+          end
+        }
+        self.send(:private, :set_default_attributes)
         self.send(:define_method, :load_stripe_data) {
           if new_record?
             working_stripe_id = PaidUp.configuration.anonymous_customer_stripe_id
@@ -111,29 +133,13 @@ module PaidUp
           end
         }
         self.send(:private, :load_stripe_data)
-        self.send(:define_method, :set_default_attributes) {
-          if new_record?
-            self.stripe_id = PaidUp.configuration.anonymous_customer_stripe_id
-          end
-        }
-        self.send(:private, :set_default_attributes)
         self.send(:define_method, :remove_anonymous_association) {
           if stripe_id == PaidUp.configuration.anonymous_customer_stripe_id
             self.stripe_id = nil
           end
         }
         self.send(:private, :remove_anonymous_association)
-
-        PaidUp::Plan.subscribed_to(self)
-      end
-
-      def subscribed_to(model)
-        has_many :subscribers, :through => :subscriptions, :source => :subscriber, :source_type => model.model_name
       end
     end
   end
-end
-
-
-
-ActiveRecord::Base.send(:include, PaidUp::Mixins)
+end

data/lib/paid_up/validators/rolify_rows.rb

@@ -0,0 +1,9 @@
+module PaidUp::Validators
+  class RolifyRows < ActiveModel::Validator
+    def validate(record)
+      if record.send(options[:field]) == options[:comparison] && !ActiveRecord::Base.connection.table_exists?(record.send(options[:found_in]))
+        record.errors[options[:found_in]] << :when_using_rolify_rows_table_must_exist.l
+      end
+    end
+  end
+end

data/lib/paid_up/{table_validator.rb → validators/table_rows.rb}

@@ -1,5 +1,5 @@
-module PaidUp
-  class TableValidator < ActiveModel::Validator
+module PaidUp::Validators
+  class TableRows < ActiveModel::Validator
     def validate(record)
       if record.send(options[:field]) == options[:comparison] && !ActiveRecord::Base.connection.table_exists?(record.send(options[:found_in]))
         record.errors[options[:found_in]] << :when_using_table_rows_table_must_exist.l

data/lib/paid_up.rb

@@ -1,6 +1,14 @@
 module PaidUp
-  require 'rails/all'
+  # require 'rails/all'
+
+  require "active_record/railtie"
+  require "action_controller/railtie"
+  require "action_mailer/railtie"
+  require "action_view/railtie"
+  require "sprockets/railtie"
+
   require 'rails-i18n'
+
   require 'stripe' # Needs to be required before paid_up/stripe_extensions
   require 'devise' # Needs to be required before paid_up/mixins
 
@@ -9,11 +17,15 @@ module PaidUp
   require 'paid_up/engine'
   require 'paid_up/localization'
   require 'paid_up/version'
-  require 'paid_up/stripe_extensions'
-  require 'paid_up/unlimited'
-  require 'paid_up/mixins'
-  require 'paid_up/integer'
-  require 'paid_up/table_validator'
+
+  require 'paid_up/extensions/stripe'
+  require 'paid_up/extensions/integer'
+
+  require 'paid_up/mixins/subscriber'
+  require 'paid_up/mixins/paid_for'
+
+  require 'paid_up/validators/table_rows'
+  require 'paid_up/validators/rolify_rows'
 
   require 'haml-rails'
   require 'bootstrap_leather'
@@ -23,4 +35,12 @@ module PaidUp
 
   require 'seedbank'
   require 'chronic'
-end
+end
+
+Integer.send(:include, PaidUp::Extensions::Integer)
+
+Stripe::Customer.send(:include, PaidUp::Extensions::Stripe)
+Stripe::Plan.send(:include, PaidUp::Extensions::Stripe)
+
+ActiveRecord::Base.send(:include, PaidUp::Mixins::Subscriber)
+ActiveRecord::Base.send(:include, PaidUp::Mixins::PaidFor)

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.2.4 ruby lib
+# stub: paid_up 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "paid_up"
-  s.version = "0.2.4"
+  s.version = "0.3.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-22"
+  s.date = "2015-05-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.executables = ["rails"]
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
     "app/models/paid_up/feature.rb",
     "app/models/paid_up/features_plan.rb",
     "app/models/paid_up/plan.rb",
+    "app/models/paid_up/unlimited.rb",
     "app/views/devise/confirmations/new.html.haml",
     "app/views/devise/passwords/edit.html.haml",
     "app/views/devise/passwords/new.html.haml",
@@ -62,7 +63,6 @@ Gem::Specification.new do |s|
     "coverage/.resultset.json",
     "coverage/.resultset.json.lock",
     "db/migrate/20150407105900_create_paid_up_features_plans_table.rb",
-    "db/migrate/20150407110100_create_paid_up_features_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",
@@ -72,13 +72,14 @@ Gem::Specification.new do |s|
     "lib/paid_up.rb",
     "lib/paid_up/configuration.rb",
     "lib/paid_up/engine.rb",
-    "lib/paid_up/integer.rb",
+    "lib/paid_up/extensions/integer.rb",
+    "lib/paid_up/extensions/stripe.rb",
     "lib/paid_up/localization.rb",
-    "lib/paid_up/mixins.rb",
+    "lib/paid_up/mixins/paid_for.rb",
+    "lib/paid_up/mixins/subscriber.rb",
     "lib/paid_up/railtie.rb",
-    "lib/paid_up/stripe_extensions.rb",
-    "lib/paid_up/table_validator.rb",
-    "lib/paid_up/unlimited.rb",
+    "lib/paid_up/validators/rolify_rows.rb",
+    "lib/paid_up/validators/table_rows.rb",
     "lib/paid_up/version.rb",
     "paid_up.gemspec",
     "spec/controllers/paid_up/plans_spec.rb",
@@ -88,13 +89,16 @@ Gem::Specification.new do |s|
     "spec/dummy/app/assets/stylesheets/application.css.scss",
     "spec/dummy/app/controllers/application_controller.rb",
     "spec/dummy/app/models/ability.rb",
+    "spec/dummy/app/models/doodad.rb",
     "spec/dummy/app/models/group.rb",
+    "spec/dummy/app/models/role.rb",
     "spec/dummy/app/models/user.rb",
     "spec/dummy/app/views/layouts/application.html.haml",
     "spec/dummy/app/views/pages/index.html.haml",
     "spec/dummy/bin/bundle",
     "spec/dummy/bin/rails",
     "spec/dummy/bin/rake",
+    "spec/dummy/bin/rspec",
     "spec/dummy/bin/setup",
     "spec/dummy/config.ru",
     "spec/dummy/config/application.rb",
@@ -113,6 +117,7 @@ Gem::Specification.new do |s|
     "spec/dummy/config/initializers/inflections.rb",
     "spec/dummy/config/initializers/mime_types.rb",
     "spec/dummy/config/initializers/paid_up.rb",
+    "spec/dummy/config/initializers/rolify.rb",
     "spec/dummy/config/initializers/session_store.rb",
     "spec/dummy/config/initializers/wrap_parameters.rb",
     "spec/dummy/config/locales/devise.en.yml",
@@ -122,14 +127,14 @@ Gem::Specification.new do |s|
     "spec/dummy/db/development.sqlite3",
     "spec/dummy/db/migrate/20150406154440_create_users_table.rb",
     "spec/dummy/db/migrate/20150517175135_create_groups_table.rb",
-    "spec/dummy/db/migrate/20150518000915_add_devise_to_users.rb",
-    "spec/dummy/db/migrate/20150518000917_create_paid_up_features_plans_table.paid_up.rb",
-    "spec/dummy/db/migrate/20150518000918_create_paid_up_features_table.paid_up.rb",
-    "spec/dummy/db/migrate/20150518000919_create_paid_up_plans_table.paid_up.rb",
-    "spec/dummy/db/migrate/20150519164355_add_stripe_id_column_to_users.paid_up.rb",
+    "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/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.seeds.rb",
     "spec/dummy/db/seeds/features_plans.seeds.rb",
     "spec/dummy/db/seeds/plans.seeds.rb",
     "spec/dummy/db/test.sqlite3",
@@ -148,7 +153,6 @@ 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/dummy/test/controllers/plans_controller_controller_test.rb",
     "spec/factories/feature.rb",
     "spec/factories/features_plan.rb",
     "spec/factories/plan.rb",
@@ -191,11 +195,13 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<money>, ["~> 6.5"])
       s.add_runtime_dependency(%q<devise>, ["~> 3.4"])
       s.add_runtime_dependency(%q<cancan>, ["~> 1.6"])
+      s.add_runtime_dependency(%q<rolify>, ["~> 4"])
       s.add_runtime_dependency(%q<stripe>, ["~> 1.21"])
       s.add_development_dependency(%q<sqlite3>, ["~> 1.3"])
       s.add_development_dependency(%q<forgery>, ["~> 0.6"])
       s.add_development_dependency(%q<bootstrap-sass>, ["~> 3.3"])
       s.add_development_dependency(%q<sass-rails>, ["~> 5.0"])
+      s.add_development_dependency(%q<high_voltage>, ["~> 2.3"])
     else
       s.add_dependency(%q<rails>, ["~> 4"])
       s.add_dependency(%q<rails-i18n>, ["~> 4"])
@@ -209,11 +215,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<money>, ["~> 6.5"])
       s.add_dependency(%q<devise>, ["~> 3.4"])
       s.add_dependency(%q<cancan>, ["~> 1.6"])
+      s.add_dependency(%q<rolify>, ["~> 4"])
       s.add_dependency(%q<stripe>, ["~> 1.21"])
       s.add_dependency(%q<sqlite3>, ["~> 1.3"])
       s.add_dependency(%q<forgery>, ["~> 0.6"])
       s.add_dependency(%q<bootstrap-sass>, ["~> 3.3"])
       s.add_dependency(%q<sass-rails>, ["~> 5.0"])
+      s.add_dependency(%q<high_voltage>, ["~> 2.3"])
     end
   else
     s.add_dependency(%q<rails>, ["~> 4"])
@@ -228,11 +236,13 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<money>, ["~> 6.5"])
     s.add_dependency(%q<devise>, ["~> 3.4"])
     s.add_dependency(%q<cancan>, ["~> 1.6"])
+    s.add_dependency(%q<rolify>, ["~> 4"])
     s.add_dependency(%q<stripe>, ["~> 1.21"])
     s.add_dependency(%q<sqlite3>, ["~> 1.3"])
     s.add_dependency(%q<forgery>, ["~> 0.6"])
     s.add_dependency(%q<bootstrap-sass>, ["~> 3.3"])
     s.add_dependency(%q<sass-rails>, ["~> 5.0"])
+    s.add_dependency(%q<high_voltage>, ["~> 2.3"])
   end
 end
 

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

@@ -6,7 +6,6 @@ class Ability
     user ||= User.new # anonymous user (not logged in)
 
     # Rails Application's initialization could go here.
-    can :manage, Group, user: user
 
     initialize_paid_up(user)
   end

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

@@ -0,0 +1,3 @@
+class Doodad < ActiveRecord::Base
+  paid_for
+end

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

@@ -1,3 +1,3 @@
 class Group < ActiveRecord::Base
-  belongs_to :user
+  paid_for
 end

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

@@ -0,0 +1,10 @@
+class Role < ActiveRecord::Base
+  has_and_belongs_to_many :users, :join_table => :users_roles
+  belongs_to :resource, :polymorphic => true
+
+  validates :resource_type,
+            :inclusion => { :in => Rolify.resource_types },
+            :allow_nil => true
+
+  scopify
+end

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

@@ -1,9 +1,8 @@
 class User < ActiveRecord::Base
-  subscriber
+  rolify
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable
-
-  has_many :groups
+  subscriber
 end

data/spec/dummy/bin/rspec

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'bundler/setup'
+load Gem.bin_path('rspec-core', 'rspec')

data/spec/dummy/config/application.rb

@@ -6,7 +6,6 @@ require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
 require "sprockets/railtie"
-# require "rails/test_unit/railtie"
 
 Bundler.require(*Rails.groups)
 require "paid_up"

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

@@ -2,4 +2,24 @@ PaidUp.configure do |config|
   config.anonymous_customer_stripe_id = 'anonymous-customer'
   config.anonymous_plan_stripe_id = 'anonymous-plan'
   config.free_plan_stripe_id = 'free-plan'
-end
+end
+
+PaidUp::Feature.new(
+  slug: 'ad_free',
+  title: 'Ad Free',
+  description: 'Are ads removed from the site with this plan?',
+  setting_type: 'boolean'
+)
+PaidUp::Feature.new(
+  slug: 'groups',
+  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
+)
+PaidUp::Feature.new(
+  slug: 'doodads',
+  title: 'Doodads',
+  description: 'How many doodads included with this plan?',
+  setting_type: 'table_rows'
+)

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

@@ -0,0 +1,7 @@
+Rolify.configure do |config|
+  # By default ORM adapter is ActiveRecord. uncomment to use mongoid
+  # config.use_mongoid
+
+  # Dynamic shortcuts for User class (user.is_admin? like methods). Default is: false
+  # config.use_dynamic_shortcuts
+end

data/spec/dummy/config/routes.rb

@@ -1,4 +1,14 @@
 Rails.application.routes.draw do
   mount PaidUp::Engine => '/', :as => 'paid_up'
   devise_for :users
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 end

data/spec/dummy/db/migrate/20150517175135_create_groups_table.rb

@@ -1,7 +1,6 @@
 class CreateGroupsTable < ActiveRecord::Migration
   def change
     create_table :groups do |t|
-      t.string :user_id, index: true
       t.string :name
       t.text :description
 

data/spec/dummy/db/migrate/20150517175136_create_doodads_table.rb

@@ -0,0 +1,9 @@
+class CreateDoodadsTable < ActiveRecord::Migration
+  def change
+    create_table :doodads do |t|
+      t.string :user_id, index: true
+      t.string :name
+      t.text :description
+    end
+  end
+end

data/spec/dummy/db/migrate/20150523010837_rolify_create_roles.rb

@@ -0,0 +1,19 @@
+class RolifyCreateRoles < ActiveRecord::Migration
+  def change
+    create_table(:roles) do |t|
+      t.string :name
+      t.references :resource, :polymorphic => true
+
+      t.timestamps
+    end
+
+    create_table(:users_roles, :id => false) do |t|
+      t.references :user
+      t.references :role
+    end
+
+    add_index(:roles, :name)
+    add_index(:roles, [ :name, :resource_type, :resource_id ])
+    add_index(:users_roles, [ :user_id, :role_id ])
+  end
+end

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

@@ -2,8 +2,8 @@
 class CreatePaidUpFeaturesPlansTable < ActiveRecord::Migration
   def change
     create_table :paid_up_features_plans do |t|
-      t.references :feature, index: true, foreign_key: true
       t.references :plan, index: true, foreign_key: true
+      t.string :feature, index: true, foreign_key: true
       t.integer :setting
     end
   end