paid_up 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 432376dddad99990aaeb41d9a4a700b1a25bb779
-  data.tar.gz: 192def84a1d60162f25460bd590597f99e489941
+  metadata.gz: 5d3b6766b534600023dd6ca246f15831806ecd9f
+  data.tar.gz: b3f579ab8dfd4041808a5878492ed1098b1c7898
 SHA512:
-  metadata.gz: 6451dedbd6341f59a82bf4667a6d0bf970f30b32498a7c86f91b607f0bd94e2f3741bd43e1a7fdb07bfe0b1acfe1db22a944516ed7294178287a9ab55e480621
-  data.tar.gz: 55c274334a207da352fdc7788ecefd2477bbc3da634c11ca3f3e7b6e568d21c3b1757b1f8f335e89e135ebe75950d70b8a88f1dab25445c3447d883d7ef3bf05
+  metadata.gz: 3670c879dac94ea3b75bd3272ee8f5999ff5a5b10ecf66b82bebf6ad0963b21e8f9701e686f7bd47a501d821474639354f35efaa9ec980a021d8c5c96f208949
+  data.tar.gz: 2dd17be69cb0f0a5b8a72855f675382d7bd688900a0f67855a078594c182e33392df6f2723237d1f4aaf9a9f271712d728ae6b7984a0f6e6131248955be73a3a

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+gem 'dotenv-rails', '~> 2.2', require: 'dotenv/rails-now', groups: [:development, :test]
+
 gem 'rails', '~> 4.2'
 gem 'rails-i18n', '~> 4'
 gem 'haml-rails', '~> 0.9'

data/VERSION

@@ -1 +1 @@
-0.11.4
+0.11.5

data/lib/paid_up/mixins/paid_for.rb

@@ -4,9 +4,35 @@ module PaidUp
     module PaidFor
       extend ActiveSupport::Concern
 
-      class_methods do
-        attr_accessor :paid_for_scope_symbol # Creates class-level instance var
+      def paid_for(options = {})
+        cattr_accessor :paid_for_scope_symbol # Creates class-level instance var
 
+        send :extend, ClassMethods
+        send :include, InstanceMethods
+
+        self.paid_for_scope_symbol = options.fetch(:scope, :all)
+        feature.nil? && raise(
+          :feature_not_found_feature.l(feature: table_name)
+        )
+        case feature.setting_type
+        when 'boolean'
+          # Nothing needs doing
+        when 'rolify_rows'
+          resourcify
+          attr_accessor :owner
+        when 'table_rows'
+          belongs_to :user
+          User.has_many table_name.to_sym
+        else
+          raise(
+            :value_is_not_a_valid_setting_type.l(
+              value: feature.setting_type
+            )
+          )
+        end
+      end
+
+      module ClassMethods
         def feature
           PaidUp::Feature.find_by_slug(table_name)
         end
@@ -14,92 +40,71 @@ module PaidUp
         def paid_for_scope
           send(self.paid_for_scope_symbol)
         end
+      end
 
-        def paid_for(options = {})
-          self.paid_for_scope_symbol = options.fetch(:scope, :all)
-          feature.nil? && raise(
-            :feature_not_found_feature.l(feature: table_name)
-          )
-          case feature.setting_type
-          when 'boolean'
-            # Nothing needs doing
-          when 'rolify_rows'
-            resourcify
-            attr_accessor :owner
+      module InstanceMethods
+        def owners
+          case self.class.feature.setting_type
           when 'table_rows'
-            belongs_to :user
-            User.has_many table_name.to_sym
+            [user]
+          when 'rolify_rows'
+            User.with_role(:owner, self)
+          end
+        end
+
+        def save_with_owner(owner)
+          if save
+            owner.add_role(:owner, self)
+            self
           else
-            raise(
-              :value_is_not_a_valid_setting_type.l(
-                value: feature.setting_type
-              )
-            )
+            false
           end
+        end
 
-          send(:define_method, :owners) do
+        # How many records can this user have?
+        def owners_enabled_count
+          setting = 0
+          owners.each do |subscriber|
+            setting += subscriber.plan.feature_setting(self.class.table_name)
+          end
+          setting
+        end
+
+        def owners_records
+          ids = []
+          owners.each do |subscriber|
             case self.class.feature.setting_type
             when 'table_rows'
-              [user]
+              ids += subscriber.send(self.class.table_name)
+              .paid_for_scope
+              .ids
             when 'rolify_rows'
-              User.with_role(:owner, self)
-            end
-          end
-
-          send(:define_method, :save_with_owner) do |owner|
-            if save
-              owner.add_role(:owner, self)
-              self
+              ids += self.class
+              .with_role(:owner, subscriber)
+              .paid_for_scope
+              .ids
             else
-              false
-            end
-          end
-
-          # How many records can this user have?
-          send(:define_method, :owners_enabled_count) do
-            setting = 0
-            owners.each do |subscriber|
-              setting += subscriber.plan.feature_setting(self.class.table_name)
-            end
-            setting
-          end
-
-          send(:define_method, :owners_records) do
-            ids = []
-            owners.each do |subscriber|
-              case self.class.feature.setting_type
-              when 'table_rows'
-                ids += subscriber.send(self.class.table_name)
-                                 .paid_for_scope
-                                 .ids
-              when 'rolify_rows'
-                ids += self.class
-                           .with_role(:owner, subscriber)
-                           .paid_for_scope
-                           .ids
-              else
-                raise(
-                  :no_features_associated_with_table.l(
-                    table: self.class.table_name
-                  )
+              raise(
+                :no_features_associated_with_table.l(
+                  table: self.class.table_name
                 )
-              end
+              )
             end
-            self.class.where(id: ids)
           end
+          self.class.where(id: ids)
+        end
 
-          send(:define_method, :owners_records_count) do
-            owners_records.count
-          end
+        def owners_records_count
+          owners_records.count
+        end
 
-          send(:define_method, :enabled) do
-            if owners_enabled_count >= owners_records_count
-              true
-            else
-              enabled_records = owners_records.order('created_at ASC')
-                                              .limit(owners_enabled_count)
-              enabled_records.include? self
-            end
+        def enabled
+          if owners_enabled_count >= owners_records_count
+            true
+          else
+            enabled_records = owners_records.order('created_at ASC')
+            .limit(owners_enabled_count)
+            enabled_records.include? self
           end
         end
       end

data/lib/paid_up/mixins/subscriber.rb

@@ -3,166 +3,186 @@ module PaidUp
     # Subscriber Mixin
     module Subscriber
       extend ActiveSupport::Concern
-      class_methods do
-        def subscriber
-          features = PaidUp::Feature.find_all_by_setting_type('table_rows')
-          features.each do |feature|
-            has_many feature.slug.to_sym
-          end
 
-          after_initialize :set_default_attributes, :load_stripe_data
-          before_save :remove_anonymous_association
-          before_destroy { |record| record.stripe_data.delete }
+      def subscriber
+        features = PaidUp::Feature.find_all_by_setting_type('table_rows')
+        features.each do |feature|
+          has_many feature.slug.to_sym
+        end
 
-          send(:define_method, :reload) do |*args, &blk|
-            super(*args, &blk)
-            load_stripe_data
-            self
-          end
-          send(:define_method, :stripe_data) do
-            (stripe_id.present? || new_record?) && @customer_stripe_data
-          end
-          send(:define_method, :cards) do
-            stripe_data.present? && stripe_data.sources.all(object: 'card')
-          end
-          send(
-            :define_method,
-            :subscribe_to_plan
-          ) do |plan_to_set, stripe_token = nil, trial_end = nil|
-            # If there is an existing subscription
-            if stripe_id.present? && !subscription.nil?
-              if stripe_token.present? # The customer has entered a new card
-                subscription.source = stripe_token
-                subscription.save
-                reload
-              end
-              if coupon_code.present?
-                stripe_data.coupon = coupon_code
-                stripe_data.save
-              end
-              if trial_end.present?
-                stripe_data.subscription.trial_end = trial_end
-                stripe_data.subscription.save
-              end
-              subscription.plan = plan_to_set.stripe_id
-              result = subscription.save ||
-                       (raise(:could_not_update_subscription.l) && false)
-            else # Totally new subscription
-              args = {
-                source: stripe_token,
-                plan: plan_to_set.stripe_id,
-                email: email,
-                trial_end: trial_end
-              }
-              coupon_code.present? && args[:coupon] = coupon_code
-              customer = Stripe::Customer.create(args) ||
-                         (raise(:could_not_create_subscription.l) && false)
-
-              # If there is an update to be made, we go ahead
-              if stripe_id != customer.id
-                result = update_attributes(stripe_id: customer.id) ||
-                         (raise(:could_not_associate_subscription.l) && false)
-              else
-                result = true
-              end
+        after_initialize :set_default_attributes, :load_stripe_data
+        before_save :remove_anonymous_association
+        before_destroy { |record| record.stripe_data.delete }
+        send :include, InstanceMethods
+      end
+
+      module InstanceMethods
+        def reload(*args, &blk)
+          super(*args, &blk)
+          load_stripe_data
+          self
+        end
+
+        def stripe_data
+          (stripe_id.present? || new_record?) && @customer_stripe_data
+        end
+
+        def cards
+          stripe_data.present? && stripe_data.sources.all(object: 'card')
+        end
+
+        def subscribe_to_plan(plan_to_set, stripe_token = nil, trial_end = nil)
+          # If there is an existing subscription
+          if stripe_id.present? && !subscription.nil?
+            if stripe_token.present? # The customer has entered a new card
+              subscription.source = stripe_token
+              subscription.save
+              reload
             end
-            result && Rails.cache.delete("#{stripe_id}/stripe_data") && reload
-          end
-          send(:define_method, :subscribe_to_free_plan) do
-            subscribe_to_plan PaidUp::Plan.free
-          end
-          send(:define_method, :plan) do
-            if subscription.present?
-              PaidUp::Plan.find_by_stripe_id(subscription.plan.id)
+            if coupon_code.present?
+              stripe_data.coupon = coupon_code
+              stripe_data.save
+            end
+            if trial_end.present?
+              stripe_data.subscription.trial_end = trial_end
+              stripe_data.subscription.save
+            end
+            subscription.plan = plan_to_set.stripe_id
+            result = subscription.save ||
+              (raise(:could_not_update_subscription.l) && false)
+          else # Totally new subscription
+            args = {
+              source: stripe_token,
+              plan: plan_to_set.stripe_id,
+              email: email,
+              trial_end: trial_end
+            }
+            coupon_code.present? && args[:coupon] = coupon_code
+            customer = Stripe::Customer.create(args) ||
+              (raise(:could_not_create_subscription.l) && false)
+
+            # If there is an update to be made, we go ahead
+            if stripe_id != customer.id
+              result = update_attributes(stripe_id: customer.id) ||
+                (raise(:could_not_associate_subscription.l) && false)
             else
-              PaidUp::Plan.free
+              result = true
             end
           end
-          send(:define_method, :table_rows_unlimited?) do |table_name|
-            table_rows_allowed(table_name) == PaidUp::Unlimited.to_i
-          end
-          send(:define_method, :table_rows_remaining) do |table_name|
-            table_rows_allowed(table_name) - table_rows(table_name)
-          end
-          send(:define_method, :table_rows_allowed) do |table_name|
-            plan.feature_setting table_name
-          end
-          send(:define_method, :table_rows) do |table_name|
-            model = table_name.classify.constantize
-            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
-          end
-          send(:define_method, :rolify_rows_remaining) do |table_name|
-            rolify_rows_allowed(table_name) - rolify_rows(table_name)
-          end
-          send(:define_method, :rolify_rows_allowed) do |table_name|
-            plan.feature_setting table_name
-          end
-          send(:define_method, :rolify_rows) do |table_name|
-            model = table_name.classify.constantize
-            model.with_role(:owner, self).paid_for_scope.size
-          end
-          send(:define_method, :plan_stripe_id) do
-            subscription.nil? && return
-            subscription.plan.id
-          end
-          send(:define_method, :subscription) do
-            stripe_data.nil? && subscribe_to_free_plan
-            stripe_data.subscriptions.data.first
-          end
-          send(:define_method, :is_subscribed_to?) do |plan_to_check|
-            plan.present? && plan.id == plan_to_check.id
-          end
-          send(:define_method, :can_upgrade_to?) do |plan_to_check|
-            plan.nil? || (
-              !is_subscribed_to?(plan_to_check) &&
-              (plan_to_check.sort_order.to_i > plan.sort_order.to_i)
-            )
-          end
-          send(:define_method, :can_downgrade_to?) do |plan_to_check|
-            !plan.nil? && (
-              !is_subscribed_to?(plan_to_check) &&
-              (plan_to_check.sort_order.to_i < plan.sort_order.to_i)
-            )
+          result && Rails.cache.delete("#{stripe_id}/stripe_data") && reload
+        end
+
+        def subscribe_to_free_plan
+          subscribe_to_plan PaidUp::Plan.free
+        end
+
+        def plan
+          if subscription.present?
+            PaidUp::Plan.find_by_stripe_id(subscription.plan.id)
+          else
+            PaidUp::Plan.free
           end
-          send(:define_method, :using_free_plan?) do
-            plan.nil? ||
-              stripe_data.delinquent ||
-              (plan.stripe_id == PaidUp.configuration.free_plan_stripe_id)
+        end
+
+        def table_rows_unlimited?(table_name)
+          table_rows_allowed(table_name) == PaidUp::Unlimited.to_i
+        end
+
+        def table_rows_remaining(table_name)
+          table_rows_allowed(table_name) - table_rows(table_name)
+        end
+
+        def table_rows_allowed(table_name)
+          plan.feature_setting table_name
+        end
+
+        def table_rows(table_name)
+          model = table_name.classify.constantize
+          model.where(user: self).paid_for_scope.size
+        end
+
+        def rolify_rows_unlimited?(table_name)
+          rolify_rows_allowed(table_name) == PaidUp::Unlimited.to_i
+        end
+
+        def rolify_rows_remaining(table_name)
+          rolify_rows_allowed(table_name) - rolify_rows(table_name)
+        end
+
+        def rolify_rows_allowed(table_name)
+          plan.feature_setting table_name
+        end
+
+        def rolify_rows(table_name)
+          model = table_name.classify.constantize
+          model.with_role(:owner, self).paid_for_scope.size
+        end
+
+        def plan_stripe_id
+          subscription.nil? && return
+          subscription.plan.id
+        end
+
+        def subscription
+          stripe_data.nil? && subscribe_to_free_plan
+          stripe_data.subscriptions.data.first
+        end
+
+        def is_subscribed_to?(plan_to_check)
+          plan.present? && plan.id == plan_to_check.id
+        end
+
+        def can_upgrade_to?(plan_to_check)
+          plan.nil? || (
+            !is_subscribed_to?(plan_to_check) &&
+            (plan_to_check.sort_order.to_i > plan.sort_order.to_i)
+          )
+        end
+
+        def can_downgrade_to?(plan_to_check)
+          !plan.nil? && (
+            !is_subscribed_to?(plan_to_check) &&
+            (plan_to_check.sort_order.to_i < plan.sort_order.to_i)
+          )
+        end
+
+        def using_free_plan?
+          plan.nil? ||
+            stripe_data.delinquent ||
+            (plan.stripe_id == PaidUp.configuration.free_plan_stripe_id)
+        end
+
+        private
+
+        def set_default_attributes
+          if new_record?
+            self.stripe_id = PaidUp.configuration.anonymous_customer_stripe_id
           end
-          send(:define_method, :set_default_attributes) do
-            if new_record?
-              self.stripe_id = PaidUp.configuration.anonymous_customer_stripe_id
-            end
+        end
+
+        def load_stripe_data
+          working_stripe_id = if new_record?
+            PaidUp.configuration
+            .anonymous_customer_stripe_id
+          else
+            !stripe_id.present? && subscribe_to_free_plan
+            stripe_id
           end
-          send(:private, :set_default_attributes)
-          send(:define_method, :load_stripe_data) do
-            working_stripe_id = if new_record?
-                                  PaidUp.configuration
-                                        .anonymous_customer_stripe_id
-                                else
-                                  !stripe_id.present? && subscribe_to_free_plan
-                                  stripe_id
-                                end
-
-            @customer_stripe_data = Rails.cache.fetch(
-              "#{working_stripe_id}/stripe_data",
-              expires_in: 12.hours
-            ) do
-              Stripe::Customer.retrieve working_stripe_id
-            end
 
-            @customer_stripe_data.nil? && raise(:could_not_load_subscription.l)
+          @customer_stripe_data = Rails.cache.fetch(
+            "#{working_stripe_id}/stripe_data",
+            expires_in: 12.hours
+          ) do
+            Stripe::Customer.retrieve working_stripe_id
           end
-          send(:private, :load_stripe_data)
-          send(:define_method, :remove_anonymous_association) do
-            if stripe_id == PaidUp.configuration.anonymous_customer_stripe_id
-              self.stripe_id = nil
-            end
+
+          @customer_stripe_data.nil? && raise(:could_not_load_subscription.l)
+        end
+
+        def remove_anonymous_association
+          if stripe_id == PaidUp.configuration.anonymous_customer_stripe_id
+            self.stripe_id = nil
           end
-          send(:private, :remove_anonymous_association)
         end
       end
     end

data/lib/paid_up.rb

@@ -40,5 +40,5 @@ Integer.send(:include, PaidUp::Extensions::Integer)
 
 Stripe::APIResource.send(:include, PaidUp::Extensions::Stripe)
 
-ActiveRecord::Base.send(:include, PaidUp::Mixins::Subscriber)
-ActiveRecord::Base.send(:include, PaidUp::Mixins::PaidFor)
+ActiveRecord::Base.send(:extend, PaidUp::Mixins::Subscriber)
+ActiveRecord::Base.send(:extend, 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.11.4 ruby lib
+# stub: paid_up 0.11.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "paid_up"
-  s.version = "0.11.4"
+  s.version = "0.11.5"
 
   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 = "2017-02-20"
+  s.date = "2017-03-12"
   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 = [
@@ -132,7 +132,6 @@ Gem::Specification.new do |s|
     "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",
     "spec/dummy/db/migrate/20150517175136_create_doodads_table.rb",
@@ -146,7 +145,6 @@ Gem::Specification.new do |s|
     "spec/dummy/db/migrate/20170220001913_add_active_column_to_groups.rb",
     "spec/dummy/db/schema.rb",
     "spec/dummy/db/seeds.rb",
-    "spec/dummy/db/test.sqlite3",
     "spec/dummy/lib/assets/.keep",
     "spec/dummy/lib/tasks/system.rake",
     "spec/dummy/log/.keep",
@@ -212,6 +210,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<cancancan>, ["~> 1.10"])
       s.add_runtime_dependency(%q<rolify>, ["~> 5"])
       s.add_runtime_dependency(%q<stripe>, ["~> 1.36"])
+      s.add_development_dependency(%q<dotenv-rails>, ["~> 2.2"])
       s.add_development_dependency(%q<jeweler>, ["~> 2"])
       s.add_development_dependency(%q<bundler>, ["~> 1"])
       s.add_development_dependency(%q<web-console>, ["~> 3.0"])
@@ -239,6 +238,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<cancancan>, ["~> 1.10"])
       s.add_dependency(%q<rolify>, ["~> 5"])
       s.add_dependency(%q<stripe>, ["~> 1.36"])
+      s.add_dependency(%q<dotenv-rails>, ["~> 2.2"])
       s.add_dependency(%q<jeweler>, ["~> 2"])
       s.add_dependency(%q<bundler>, ["~> 1"])
       s.add_dependency(%q<web-console>, ["~> 3.0"])
@@ -267,6 +267,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<cancancan>, ["~> 1.10"])
     s.add_dependency(%q<rolify>, ["~> 5"])
     s.add_dependency(%q<stripe>, ["~> 1.36"])
+    s.add_dependency(%q<dotenv-rails>, ["~> 2.2"])
     s.add_dependency(%q<jeweler>, ["~> 2"])
     s.add_dependency(%q<bundler>, ["~> 1"])
     s.add_dependency(%q<web-console>, ["~> 3.0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paid_up
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Karen Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.36'
+- !ruby/object:Gem::Dependency
+  name: dotenv-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -496,7 +510,6 @@ files:
 - 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
 - spec/dummy/db/migrate/20150517175136_create_doodads_table.rb
@@ -510,7 +523,6 @@ files:
 - spec/dummy/db/migrate/20170220001913_add_active_column_to_groups.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.keep
 - spec/dummy/lib/tasks/system.rake
 - spec/dummy/log/.keep