paid_up 0.12.4 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4612a810fe632d12ebeb7f0c68f4579353d9f7e
-  data.tar.gz: a87cac6155ef7cb64ed0e926a0698b0c39002167
+  metadata.gz: ac10b7aa446893be36c1bbe6ebce746e92f9d648
+  data.tar.gz: 147c61473a523d4bd2377061ac5096f542ef4956
 SHA512:
-  metadata.gz: f291f849d8e96bb3683a12b62226ce08686f67c618dc3f8720d126592b1ddd3cb3183e23fe23a61acae87b87a96c03b0af21abb31352be176913c4b2ee9e9d8e
-  data.tar.gz: 89f5b07826d3971823a34b4aafacab78ddcd27a65527d42c51fd639c97e7b41019312d0e5ad762c50bc15d6bf4d761b32b47e73ed25a80a170e860961edcf66b
+  metadata.gz: f2292eee3ae93b7e4a8fdb3141dbfa80b292d99e7be312eec1cb9aa61ee404465a749aa5bb2fbbd4afd05f83a7b3fc6b0eb0c848ed2e6b38ac57b520a96c03fe
+  data.tar.gz: c1fe2155e1f5a66fbbb0ca278b0d83a05429939cd50c8cea261f1fc3aad9bd69ebc8f75560162e3fb61876994f9899cb11dfff9c775421a40616762f7554a4c2

data/Gemfile

@@ -17,10 +17,10 @@ gem 'bootstrap_leather', '~> 0.9'
 gem 'chronic', '~> 0.10'
 gem 'money', '~> 6.5'
 
-gem 'cancancan', '~> 1'
+gem 'cancancan', '>= 1', '< 3'
 gem 'devise', '>= 3.4', '< 5'
 gem 'rolify', '~> 5'
-gem 'stripe', '>= 1.36', '< 3'
+gem 'stripe', '>= 1.36', '< 3.4' # 3.4 and 3.5 break caching, because they return a singleton
 
 group :development do
   gem 'bundler', '~> 1'
@@ -28,18 +28,18 @@ group :development do
   gem 'juwelier', '~> 2'
   gem 'nokogiri', '>= 1.7'
   gem 'pre-commit', '~> 0.32'
-  gem 'rubocop', git: 'https://github.com/bbatsov/rubocop.git' # Wait for 0.49
-  gem 'scss_lint', '~> 0.52.0', require: false
+  gem 'rubocop', '>= 0.49', '< 1'
+  gem 'scss_lint', '>= 0.52.0', '< 1', require: false
   gem 'web-console', '~> 3'
 end
 
 group :test, :development do
-  gem 'bootstrap-sass', '~> 3'
+  gem 'bootstrap-sass', '>= 3.3', '< 4'
   gem 'factory_girl_rails', '~> 4.5'
   gem 'forgery', '~> 0.6'
   gem 'rails-controller-testing', '~> 1'
   gem 'rspec-rails', '~> 3'
-  gem 'sass-rails', '~> 5'
+  gem 'sass-rails', '>= 5', '< 7'
   gem 'sqlite3', '~> 1.3'
 end
 

data/VERSION

@@ -1 +1 @@
-0.12.4
+0.13.0

data/app/models/paid_up/ability.rb

@@ -50,7 +50,7 @@ module PaidUp
       allowed = rolify_setting.rows_allowed
       remaining = rolify_setting.rows_remaining
       if allowed.positive?
-        can :manage, model, id: model.with_role(:owner, user).ids
+        can :manage, model, roles: { name: 'owner', users: { id: user.id } }
       end
       enable_rows(model, allowed, remaining)
     end

data/config/initializers/stripe.rb

@@ -6,3 +6,5 @@ Rails.configuration.stripe = {
 }
 
 Stripe.api_key = Rails.configuration.stripe[:secret_key]
+
+Stripe.set_app_info('Rails PaidUp', version: PaidUp::VERSION, url: 'https://www.gemvein.com/museum/cases/paid_up')

data/lib/paid_up/mixins/paid_for.rb

@@ -52,7 +52,6 @@ module PaidUp
 
         def associations_for_rolify_rows
           resourcify
-          attr_accessor :owner
         end
 
         def associations_for_table_rows
@@ -69,6 +68,8 @@ module PaidUp
             [user]
           when 'rolify_rows'
             User.with_role(:owner, self)
+          else
+            raise :value_is_not_a_valid_setting_type.l
           end
         end
 
@@ -91,19 +92,19 @@ module PaidUp
         end
 
         def owners_records
-          self.class.where(id: owners_records_ids)
-        end
-
-        def owners_records_ids
-          setting = self.class.feature.setting_type
-                        .gsub('_rows', '_setting')
-          table_name = self.class.table_name
-          unless %w(table_setting rolify_setting).include? setting
-            raise :no_features_associated_with_table.l(table: table_name)
+          scoped_records = self.class.paid_for_scope
+          case self.class.feature.setting_type
+            when 'table_rows'
+              scoped_records.where(user_id: user_id)
+            when 'rolify_rows'
+              scoped_records
+                  .includes(roles: :users)
+                  .references(:roles, :users)
+                  .where('roles.name = ?', 'owner')
+                  .where('users.id IN (?)', owners.ids)
+            else
+              raise :value_is_not_a_valid_setting_type.l
           end
-          owners.map do |subscriber|
-            subscriber.send(setting, table_name).ids
-          end.flatten
         end
 
         def owners_records_count

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.12.4 ruby lib
+# stub: paid_up 0.13.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "paid_up".freeze
-  s.version = "0.12.4"
+  s.version = "0.13.0"
 
   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 = "2017-10-06"
+  s.date = "2017-10-11"
   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 = [
@@ -196,25 +196,25 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<bootstrap_leather>.freeze, ["~> 0.9"])
       s.add_runtime_dependency(%q<chronic>.freeze, ["~> 0.10"])
       s.add_runtime_dependency(%q<money>.freeze, ["~> 6.5"])
-      s.add_runtime_dependency(%q<cancancan>.freeze, ["~> 1"])
+      s.add_runtime_dependency(%q<cancancan>.freeze, ["< 3", ">= 1"])
       s.add_runtime_dependency(%q<devise>.freeze, ["< 5", ">= 3.4"])
       s.add_runtime_dependency(%q<rolify>.freeze, ["~> 5"])
-      s.add_runtime_dependency(%q<stripe>.freeze, ["< 3", ">= 1.36"])
+      s.add_runtime_dependency(%q<stripe>.freeze, ["< 3.4", ">= 1.36"])
       s.add_development_dependency(%q<dotenv-rails>.freeze, ["~> 2.2"])
       s.add_development_dependency(%q<bundler>.freeze, ["~> 1"])
       s.add_development_dependency(%q<coffeelint>.freeze, ["~> 1.14"])
       s.add_development_dependency(%q<juwelier>.freeze, ["~> 2"])
       s.add_development_dependency(%q<nokogiri>.freeze, [">= 1.7"])
       s.add_development_dependency(%q<pre-commit>.freeze, ["~> 0.32"])
-      s.add_development_dependency(%q<rubocop>.freeze, [">= 0"])
-      s.add_development_dependency(%q<scss_lint>.freeze, ["~> 0.52.0"])
+      s.add_development_dependency(%q<rubocop>.freeze, ["< 1", ">= 0.49"])
+      s.add_development_dependency(%q<scss_lint>.freeze, ["< 1", ">= 0.52.0"])
       s.add_development_dependency(%q<web-console>.freeze, ["~> 3"])
-      s.add_development_dependency(%q<bootstrap-sass>.freeze, ["~> 3"])
+      s.add_development_dependency(%q<bootstrap-sass>.freeze, ["< 4", ">= 3.3"])
       s.add_development_dependency(%q<factory_girl_rails>.freeze, ["~> 4.5"])
       s.add_development_dependency(%q<forgery>.freeze, ["~> 0.6"])
       s.add_development_dependency(%q<rails-controller-testing>.freeze, ["~> 1"])
       s.add_development_dependency(%q<rspec-rails>.freeze, ["~> 3"])
-      s.add_development_dependency(%q<sass-rails>.freeze, ["~> 5"])
+      s.add_development_dependency(%q<sass-rails>.freeze, ["< 7", ">= 5"])
       s.add_development_dependency(%q<sqlite3>.freeze, ["~> 1.3"])
     else
       s.add_dependency(%q<haml-rails>.freeze, ["< 2", ">= 1"])
@@ -225,25 +225,25 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bootstrap_leather>.freeze, ["~> 0.9"])
       s.add_dependency(%q<chronic>.freeze, ["~> 0.10"])
       s.add_dependency(%q<money>.freeze, ["~> 6.5"])
-      s.add_dependency(%q<cancancan>.freeze, ["~> 1"])
+      s.add_dependency(%q<cancancan>.freeze, ["< 3", ">= 1"])
       s.add_dependency(%q<devise>.freeze, ["< 5", ">= 3.4"])
       s.add_dependency(%q<rolify>.freeze, ["~> 5"])
-      s.add_dependency(%q<stripe>.freeze, ["< 3", ">= 1.36"])
+      s.add_dependency(%q<stripe>.freeze, ["< 3.4", ">= 1.36"])
       s.add_dependency(%q<dotenv-rails>.freeze, ["~> 2.2"])
       s.add_dependency(%q<bundler>.freeze, ["~> 1"])
       s.add_dependency(%q<coffeelint>.freeze, ["~> 1.14"])
       s.add_dependency(%q<juwelier>.freeze, ["~> 2"])
       s.add_dependency(%q<nokogiri>.freeze, [">= 1.7"])
       s.add_dependency(%q<pre-commit>.freeze, ["~> 0.32"])
-      s.add_dependency(%q<rubocop>.freeze, [">= 0"])
-      s.add_dependency(%q<scss_lint>.freeze, ["~> 0.52.0"])
+      s.add_dependency(%q<rubocop>.freeze, ["< 1", ">= 0.49"])
+      s.add_dependency(%q<scss_lint>.freeze, ["< 1", ">= 0.52.0"])
       s.add_dependency(%q<web-console>.freeze, ["~> 3"])
-      s.add_dependency(%q<bootstrap-sass>.freeze, ["~> 3"])
+      s.add_dependency(%q<bootstrap-sass>.freeze, ["< 4", ">= 3.3"])
       s.add_dependency(%q<factory_girl_rails>.freeze, ["~> 4.5"])
       s.add_dependency(%q<forgery>.freeze, ["~> 0.6"])
       s.add_dependency(%q<rails-controller-testing>.freeze, ["~> 1"])
       s.add_dependency(%q<rspec-rails>.freeze, ["~> 3"])
-      s.add_dependency(%q<sass-rails>.freeze, ["~> 5"])
+      s.add_dependency(%q<sass-rails>.freeze, ["< 7", ">= 5"])
       s.add_dependency(%q<sqlite3>.freeze, ["~> 1.3"])
     end
   else
@@ -255,25 +255,25 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bootstrap_leather>.freeze, ["~> 0.9"])
     s.add_dependency(%q<chronic>.freeze, ["~> 0.10"])
     s.add_dependency(%q<money>.freeze, ["~> 6.5"])
-    s.add_dependency(%q<cancancan>.freeze, ["~> 1"])
+    s.add_dependency(%q<cancancan>.freeze, ["< 3", ">= 1"])
     s.add_dependency(%q<devise>.freeze, ["< 5", ">= 3.4"])
     s.add_dependency(%q<rolify>.freeze, ["~> 5"])
-    s.add_dependency(%q<stripe>.freeze, ["< 3", ">= 1.36"])
+    s.add_dependency(%q<stripe>.freeze, ["< 3.4", ">= 1.36"])
     s.add_dependency(%q<dotenv-rails>.freeze, ["~> 2.2"])
     s.add_dependency(%q<bundler>.freeze, ["~> 1"])
     s.add_dependency(%q<coffeelint>.freeze, ["~> 1.14"])
     s.add_dependency(%q<juwelier>.freeze, ["~> 2"])
     s.add_dependency(%q<nokogiri>.freeze, [">= 1.7"])
     s.add_dependency(%q<pre-commit>.freeze, ["~> 0.32"])
-    s.add_dependency(%q<rubocop>.freeze, [">= 0"])
-    s.add_dependency(%q<scss_lint>.freeze, ["~> 0.52.0"])
+    s.add_dependency(%q<rubocop>.freeze, ["< 1", ">= 0.49"])
+    s.add_dependency(%q<scss_lint>.freeze, ["< 1", ">= 0.52.0"])
     s.add_dependency(%q<web-console>.freeze, ["~> 3"])
-    s.add_dependency(%q<bootstrap-sass>.freeze, ["~> 3"])
+    s.add_dependency(%q<bootstrap-sass>.freeze, ["< 4", ">= 3.3"])
     s.add_dependency(%q<factory_girl_rails>.freeze, ["~> 4.5"])
     s.add_dependency(%q<forgery>.freeze, ["~> 0.6"])
     s.add_dependency(%q<rails-controller-testing>.freeze, ["~> 1"])
     s.add_dependency(%q<rspec-rails>.freeze, ["~> 3"])
-    s.add_dependency(%q<sass-rails>.freeze, ["~> 5"])
+    s.add_dependency(%q<sass-rails>.freeze, ["< 7", ">= 5"])
     s.add_dependency(%q<sqlite3>.freeze, ["~> 1.3"])
   end
 end

data/spec/factories/group.rb

@@ -11,7 +11,7 @@ FactoryGirl.define do
     # attributes; `create_list`'s second argument is the number of records
     # to create and we make sure the user is associated properly to the post
     after(:create) do |group, evaluator|
-      evaluator.owner.add_role(:owner, group)
+      group.save_with_owner(evaluator.owner)
     end
   end
 end

data/spec/views/paid_up/plans_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe 'paid_up/plans/index' do
   before do
     view.extend PaidUp::PlansHelper
     view.extend PaidUp::FeaturesHelper
-    view.extend BootstrapLeatherHelper
+    view.extend BootstrapLeather::ApplicationHelper
   end
 
   context 'when user is anonymous' do

data/spec/views/paid_up/subscriptions_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe 'paid_up/subscriptions/new' do
   before do
     view.extend PaidUp::PlansHelper
     view.extend PaidUp::FeaturesHelper
-    view.extend BootstrapLeatherHelper
+    view.extend BootstrapLeather::ApplicationHelper
   end
 
   context 'when user is logged in as free customer' do
@@ -49,7 +49,7 @@ RSpec.describe 'paid_up/subscriptions/index' do
   before do
     view.extend PaidUp::PlansHelper
     view.extend PaidUp::FeaturesHelper
-    view.extend BootstrapLeatherHelper
+    view.extend BootstrapLeather::ApplicationHelper
   end
 
   context 'when user is logged in' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paid_up
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.13.0
 platform: ruby
 authors:
 - Karen Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml-rails
@@ -150,14 +150,20 @@ dependencies:
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
@@ -200,7 +206,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.36'
@@ -210,7 +216,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.36'
@@ -302,28 +308,40 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: scss_lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.52.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.52.0
 - !ruby/object:Gem::Dependency
@@ -344,16 +362,22 @@ dependencies:
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -414,14 +438,20 @@ dependencies:
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency