paid_up 0.13.5 → 0.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 771072f0a7877fd4d05487ecbf96da45af6f0b2cc40a279b45daa68eb8d5d445
-  data.tar.gz: d6b8d8e64c3377e5e5cfb62983ac319b82cdc9d0d5640eb6d6d1d865f1226789
+  metadata.gz: fd4aa53725c15d418c3798c8b7d8a4dea31e0ff1f114ca425d063b67896e75d2
+  data.tar.gz: c10e4d754c584056c161f98a164a526c33047356b2b8f0120daa5fc8b29862e2
 SHA512:
-  metadata.gz: 3a7129b2b0de5d27094e977f64d39273d9e41240148f37c61fb77d3e542f6b4ac5c0e1f4d29585ed8601c31121e4789b41806b32c753be6af84150b1473ef8b0
-  data.tar.gz: 2523f6baf9b3d7eacd444d09ba04f60ab4661d688d6a64ed8a30c85ed768240cf790ebc6b1dff7adcaa957aa76aef1e6bf14851f7ee0f12cfd510596d15deb5b
+  metadata.gz: 3bf0feabd9990f7f6259377138cd4a6f937a07c80feba530de59bcfac12d1113353de804e9b049d88620c68444883cf07287499aa6a17d9d619653437a13206e
+  data.tar.gz: e2c416e17d6f7b9da15da8c00c088a9c8f96c7d6a5ea4d3a26ba716de16cd67ba2428623ad0b70008be648e0e1378538a29df6db959f4b50577c24344a899673

data/README.md

@@ -104,11 +104,15 @@ Abilities corresponding to features you have defined will be generated automatic
     
 ## Speeding up User queries
 
-If you try generating a list of users for display in a directory, you may find
-that the Stripe checking code slows down your query.
+If you try generating a list of users (such as for display in a user directory), you may find
+that the Stripe checking code slows down your query significantly.
 
 To avoid this, add "select(:field_1, :field_2, :etc)" to your finder, being
 sure to *omit* the :stripe_id column.
+
+Another option would be to create a Person model that inherits from the User model but omits the :stripe_id column 
+(as above) in its `default_scope`. You can use this Person object for queries related to directory or profile display, 
+thereby speeding up all queries not requiring plan information. 
     
 ## Controller
 

data/VERSION

@@ -1 +1 @@
-0.13.5
+0.13.6

data/app/models/paid_up/ability.rb

@@ -59,7 +59,7 @@ module PaidUp
 
     def enable_boolean(user, feature)
       slug = feature.slug
-      can :use, slug.to_sym if user.plan.feature_setting slug
+      can :use, slug.to_sym if user.plan&.feature_setting slug
     end
   end
 end

data/app/models/paid_up/plan.rb

@@ -11,7 +11,7 @@ module PaidUp
     )
     accepts_nested_attributes_for :plan_feature_settings
 
-    after_initialize :load_stripe_data
+    after_initialize :load_stripe_data, :load_feature_settings
     after_save :expire_stripe_data
 
     attr_accessor :stripe_data
@@ -39,19 +39,35 @@ module PaidUp
       self
     end
 
-    def feature_setting(feature_name)
-      feature = PaidUp::Feature.find_by_slug!(feature_name)
-      raw = plan_feature_settings.where(feature: feature_name)
-      case feature.setting_type
+    def load_feature_settings
+      @feature_settings = {}
+      settings = {}
+
+      plan_feature_settings.each do |feature_setting|
+        settings[feature_setting.feature] = feature_setting.setting
+      end
+
+      PaidUp::Feature.all.each do |feature|
+        slug = feature.slug
+        @feature_settings[slug] = parse_setting_by_type(feature.setting_type, settings[slug])
+      end
+    end
+
+    def parse_setting_by_type(setting_type, setting)
+      case setting_type
       when 'boolean'
-        raw&.first&.setting == 1
+        setting == 1
       when 'table_rows', 'rolify_rows'
-        raw&.first&.setting || 0
+        setting || 0
       else
         raise :error_handling_feature_setting.l feature: feature
       end
     end
 
+    def feature_setting(feature_name)
+      @feature_settings[feature_name]
+    end
+
     def feature_unlimited?(feature_name)
       feature_setting(feature_name) == PaidUp::Unlimited.to_i
     end

data/paid_up.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: paid_up 0.13.5 ruby lib
+# stub: paid_up 0.13.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "paid_up".freeze
-  s.version = "0.13.5"
+  s.version = "0.13.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Karen Lundgren".freeze]
-  s.date = "2018-05-31"
+  s.date = "2018-09-09"
   s.description = "Allows a model of your choosing (such as users) to subscribe to a plan, which enables features.".freeze
   s.email = "karen.e.lundgren@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -177,7 +177,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://www.gemvein.com/museum/cases/paid_up".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "2.7.7".freeze
   s.summary = "Allows a model of your choosing to subscribe to a plan, which enables features.".freeze
 
   if s.respond_to? :specification_version then

data/spec/factories/doodad.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :doodad do
-    name 'Test Name'
+    name { 'Test Name'}
     user { User.order('RANDOM()').first }
   end
 end

data/spec/factories/group.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :group do
-    title 'Test Title'
+    title { 'Test Title' }
     transient do
       owner { User.order('RANDOM()').first }
     end

data/spec/factories/plan.rb

@@ -2,8 +2,8 @@
 
 FactoryBot.define do
   factory :plan, class: 'PaidUp::Plan' do
-    title 'Plan Title'
-    description 'This is the description'
-    sort_order 0
+    title { 'Plan Title' }
+    description { 'This is the description' }
+    sort_order { 0 }
   end
 end

data/spec/factories/plan_feature_setting.rb

@@ -2,8 +2,8 @@
 
 FactoryBot.define do
   factory :plan_feature_setting, class: 'PaidUp::PlanFeatureSetting' do
-    feature nil
-    plan nil
-    setting 1
+    feature { nil }
+    plan { nil }
+    setting { 1 }
   end
 end

data/spec/factories/post.rb

@@ -2,8 +2,8 @@
 
 FactoryBot.define do
   factory :post do
-    title 'Test Title'
+    title { 'Test Title' }
     user { User.order('RANDOM()').first }
-    active true
+    active { true }
   end
 end

data/spec/factories/user.rb

@@ -5,11 +5,11 @@ FactoryBot.define do
     sequence :email do |n|
       "#{name.tr(' ', '.').downcase}#{n}@example.com"
     end
-    password 'password'
-    password_confirmation 'password'
+    password { 'password' }
+    password_confirmation { 'password' }
     transient do
       plan { PaidUp::Plan.all.sample }
-      past_due false
+      past_due { false }
     end
     # the after(:create) yields two values; the user instance itself and the
     # evaluator, which stores all values from the factory, including transient

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paid_up
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 0.13.6
 platform: ruby
 authors:
 - Karen Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml-rails
@@ -664,7 +664,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Allows a model of your choosing to subscribe to a plan, which enables features.