paid_up 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a7ea560275e3137dfc8316eeb8768b985c55a9c5
-  data.tar.gz: c2d093b99e53d8460787b3845ed0c64b0a0b0752
+SHA256:
+  metadata.gz: ed5cbcfee4f51c5a6c8e56e5c21c9d9ec8d0a3f29e7392d4f3c01943d1c76978
+  data.tar.gz: 974b7d1cafd005f4e4169642243665e0a50e5216218d9d1bff54c55d581e51d9
 SHA512:
-  metadata.gz: c7d54a790723c63cb3e0be5c6c2e9d8511c08c55425425e48dc1cbd40c4e944b7b1099665b13c4f029069c97ce3daf07ad6e0278830f7f402ba676b11648a9ef
-  data.tar.gz: 87cf4f4d9d7bb9398f233036394ac43e28e6d1ebcffcc535ac8b6fd98fe17bebe5464a831b264c7e816c97f4783496ca154eada0233bf1780852568ea85efce1
+  metadata.gz: 6e555d71c53fe90e069565169d3f5ecaa6523504d9a810ac4657697e72237a9cb8f5a9c1f69d80c094136b96df0a3b2ebebc17f3a9e75cede55f3f0a2cc5631d
+  data.tar.gz: 3505b1f701f3b3c321ccbc72a6c295cf6400a827cf62b31c4480897173a957fa4a78ad6a5402eb3d98ac6c201080482fbc3e7d5b47e4ddf5d3b3cc0a003cb444

data/Gemfile

@@ -44,7 +44,7 @@ group :test, :development do
 end
 
 group :test do
-  gem 'capybara', '~> 2'
+  gem 'capybara', '>= 3', '< 4'
   gem 'coveralls', '>= 0.8', '< 2', require: false
   gem 'database_cleaner', '~> 1'
   gem 'launchy', '~> 2.4', require: false

data/VERSION

@@ -1 +1 @@
-0.13.3
+0.13.4

data/app/models/paid_up/plan.rb

@@ -21,15 +21,15 @@ module PaidUp
 
     default_scope { order('sort_order ASC') }
     scope :subscribable, -> { where('sort_order >=  ?', 0) }
-    scope :within, ->(ids) { where(id: ids) }
-    scope :without, ->(ids) { where.not(id: ids) }
+    scope :including, ->(ids) { where(id: ids) }
+    scope :excluding, ->(ids) { where.not(id: ids) }
     scope :free, (lambda do
       find_by_stripe_id(PaidUp.configuration.free_plan_stripe_id)
     end)
-    scope :display, (lambda do |within, without|
+    scope :display, (lambda do |including, excluding|
       plans = subscribable
-      plans = plans.within(within) if within.present?
-      plans = plans.without(without) if without.present?
+      plans = plans.including(including) if including.present?
+      plans = plans.excluding(excluding) if excluding.present?
       plans
     end)
 

data/db/migrate/20150407110101_create_paid_up_plans_table.rb

@@ -1,4 +1,4 @@
-class CreatePaidUpPlansTable < ActiveRecord::Migration
+class CreatePaidUpPlansTable < ActiveRecord::Migration[5.2]
   def change
     create_table :paid_up_plans do |t|
       t.string :stripe_id

data/db/migrate/20150519164237_add_stripe_id_column_to_users.rb

@@ -1,4 +1,4 @@
-class AddStripeIdColumnToUsers < ActiveRecord::Migration
+class AddStripeIdColumnToUsers < ActiveRecord::Migration[5.2]
   def change
     add_column :users, :stripe_id, :string, index: true
   end

data/db/migrate/20160207113800_create_paid_up_plan_feature_settings_table.rb

@@ -1,4 +1,4 @@
-class CreatePaidUpPlanFeatureSettingsTable < ActiveRecord::Migration
+class CreatePaidUpPlanFeatureSettingsTable < ActiveRecord::Migration[5.2]
   def change
     create_table :paid_up_plan_feature_settings do |t|
       t.references :paid_up_plan, index: true, foreign_key: true

data/db/migrate/20160210165128_add_coupon_code_column_to_users.rb

@@ -1,4 +1,4 @@
-class AddCouponCodeColumnToUsers < ActiveRecord::Migration
+class AddCouponCodeColumnToUsers < ActiveRecord::Migration[5.2]
   def change
     add_column :users, :coupon_code, :string
   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.3 ruby lib
+# stub: paid_up 0.13.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "paid_up".freeze
-  s.version = "0.13.3"
+  s.version = "0.13.4"
 
   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-12-21"
+  s.date = "2018-05-19"
   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.6.11".freeze
+  s.rubygems_version = "2.7.6".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/controllers/paid_up/plans_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe PaidUp::PlansController do
     end
     context 'responds successfully with an HTTP 200 status code' do
       subject { response }
-      it { should be_success }
+      it { should be_successful }
       it { should have_http_status(200) }
     end
     context 'renders the index template' do

data/spec/controllers/paid_up/subscriptions_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe PaidUp::SubscriptionsController do
       end
       describe 'responds successfully with an HTTP 200 status code' do
         subject { response }
-        it { should be_success }
+        it { should be_successful }
         it { should have_http_status(200) }
       end
       describe 'renders the index template' do
@@ -59,7 +59,7 @@ RSpec.describe PaidUp::SubscriptionsController do
           end
           describe 'responds successfully with an HTTP 200 status code' do
             subject { response }
-            it { should be_success }
+            it { should be_successful }
             it { should have_http_status(200) }
           end
           describe 'renders the new template' do

data/spec/dummy/config/application.rb

@@ -44,3 +44,10 @@ module Dummy
     end
   end
 end
+
+Rails
+  .application
+  .config
+  .active_record
+  .sqlite3
+  .represent_boolean_as_integer = true

data/spec/dummy/db/migrate/20150406154440_create_users_table.rb

@@ -1,4 +1,4 @@
-class CreateUsersTable < ActiveRecord::Migration
+class CreateUsersTable < ActiveRecord::Migration[5.2]
   def change
     create_table :users do |t|
       t.string :name

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

@@ -1,4 +1,4 @@
-class CreateGroupsTable < ActiveRecord::Migration
+class CreateGroupsTable < ActiveRecord::Migration[5.2]
   def change
     create_table :groups do |t|
       t.string :title

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

@@ -1,4 +1,4 @@
-class CreateDoodadsTable < ActiveRecord::Migration
+class CreateDoodadsTable < ActiveRecord::Migration[5.2]
   def change
     create_table :doodads do |t|
       t.string :user_id, index: true

data/spec/dummy/db/migrate/20150523010827_add_devise_to_users.rb

@@ -1,4 +1,4 @@
-class AddDeviseToUsers < ActiveRecord::Migration
+class AddDeviseToUsers < ActiveRecord::Migration[5.2]
   def self.up
     change_table(:users) do |t|
       ## Database authenticatable

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

@@ -1,4 +1,4 @@
-class RolifyCreateRoles < ActiveRecord::Migration
+class RolifyCreateRoles < ActiveRecord::Migration[5.2]
   def change
     create_table(:roles) do |t|
       t.string :name

data/spec/dummy/db/migrate/20160207184112_create_paid_up_plans_table.paid_up.rb

@@ -1,5 +1,5 @@
 # This migration comes from paid_up (originally 20150407110101)
-class CreatePaidUpPlansTable < ActiveRecord::Migration
+class CreatePaidUpPlansTable < ActiveRecord::Migration[5.2]
   def change
     create_table :paid_up_plans do |t|
       t.string :stripe_id

data/spec/dummy/db/migrate/20160207184113_add_stripe_id_column_to_users.paid_up.rb

@@ -1,5 +1,5 @@
 # This migration comes from paid_up (originally 20150519164237)
-class AddStripeIdColumnToUsers < ActiveRecord::Migration
+class AddStripeIdColumnToUsers < ActiveRecord::Migration[5.2]
   def change
     add_column :users, :stripe_id, :string, index: true
   end

data/spec/dummy/db/migrate/20160207184114_create_paid_up_plan_feature_settings_table.paid_up.rb

@@ -1,5 +1,5 @@
 # This migration comes from paid_up (originally 20160207113800)
-class CreatePaidUpPlanFeatureSettingsTable < ActiveRecord::Migration
+class CreatePaidUpPlanFeatureSettingsTable < ActiveRecord::Migration[5.2]
   def change
     create_table :paid_up_plan_feature_settings do |t|
       t.references :paid_up_plan, index: true, foreign_key: true

data/spec/dummy/db/migrate/20160210165341_add_coupon_code_column_to_users.paid_up.rb

@@ -1,5 +1,5 @@
 # This migration comes from paid_up (originally 20160210165128)
-class AddCouponCodeColumnToUsers < ActiveRecord::Migration
+class AddCouponCodeColumnToUsers < ActiveRecord::Migration[5.2]
   def change
     add_column :users, :coupon_code, :string
   end

data/spec/dummy/db/migrate/20170219225950_create_posts_table.rb

@@ -1,4 +1,4 @@
-class CreatePostsTable < ActiveRecord::Migration
+class CreatePostsTable < ActiveRecord::Migration[5.2]
   def change
     create_table :posts do |t|
       t.string :user_id, index: true

data/spec/dummy/db/migrate/20170220001913_add_active_column_to_groups.rb

@@ -1,4 +1,4 @@
-class AddActiveColumnToGroups < ActiveRecord::Migration
+class AddActiveColumnToGroups < ActiveRecord::Migration[5.2]
   def change
     add_column :groups, :active, :boolean, null: false, default: false
     add_index :groups, :active

data/spec/dummy/db/schema.rb

@@ -10,77 +10,78 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170220001913) do
+ActiveRecord::Schema.define(version: 2017_02_20_001913) do
 
   create_table "doodads", force: :cascade do |t|
     t.string "user_id"
     t.string "name"
-    t.text   "description"
+    t.text "description"
     t.index ["user_id"], name: "index_doodads_on_user_id"
   end
 
   create_table "groups", force: :cascade do |t|
-    t.string   "title"
-    t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "active",      default: false, null: false
+    t.string "title"
+    t.text "description"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.boolean "active", default: false, null: false
     t.index ["active"], name: "index_groups_on_active"
   end
 
   create_table "paid_up_plan_feature_settings", force: :cascade do |t|
     t.integer "paid_up_plan_id"
-    t.string  "feature"
+    t.string "feature"
     t.integer "setting"
     t.index ["feature"], name: "index_paid_up_plan_feature_settings_on_feature"
     t.index ["paid_up_plan_id"], name: "index_paid_up_plan_feature_settings_on_paid_up_plan_id"
   end
 
   create_table "paid_up_plans", force: :cascade do |t|
-    t.string   "stripe_id"
-    t.string   "title"
-    t.text     "description"
-    t.integer  "sort_order"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string "stripe_id"
+    t.string "title"
+    t.text "description"
+    t.integer "sort_order"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["stripe_id"], name: "index_paid_up_plans_on_stripe_id", unique: true
     t.index ["title"], name: "index_paid_up_plans_on_title", unique: true
   end
 
   create_table "posts", force: :cascade do |t|
-    t.string   "user_id"
-    t.string   "title"
-    t.boolean  "active",     default: false, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string "user_id"
+    t.string "title"
+    t.boolean "active", default: false, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["active"], name: "index_posts_on_active"
     t.index ["user_id"], name: "index_posts_on_user_id"
   end
 
   create_table "roles", force: :cascade do |t|
-    t.string   "name"
-    t.string   "resource_type"
-    t.integer  "resource_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string "name"
+    t.string "resource_type"
+    t.integer "resource_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id"
     t.index ["name"], name: "index_roles_on_name"
+    t.index ["resource_type", "resource_id"], name: "index_roles_on_resource_type_and_resource_id"
   end
 
   create_table "users", force: :cascade do |t|
-    t.string   "name"
-    t.string   "email",                  default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+    t.string "name"
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    t.integer "sign_in_count", default: 0, null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.string   "stripe_id"
-    t.string   "coupon_code"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.string "stripe_id"
+    t.string "coupon_code"
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
@@ -88,7 +89,9 @@ ActiveRecord::Schema.define(version: 20170220001913) do
   create_table "users_roles", id: false, force: :cascade do |t|
     t.integer "user_id"
     t.integer "role_id"
+    t.index ["role_id"], name: "index_users_roles_on_role_id"
     t.index ["user_id", "role_id"], name: "index_users_roles_on_user_id_and_role_id"
+    t.index ["user_id"], name: "index_users_roles_on_user_id"
   end
 
 end

data/spec/factories/user.rb

@@ -8,7 +8,7 @@ FactoryBot.define do
     password 'password'
     password_confirmation 'password'
     transient do
-      plan { PaidUp::Plan.order('RANDOM()').first }
+      plan { PaidUp::Plan.all.sample }
       past_due false
     end
     # the after(:create) yields two values; the user instance itself and the

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paid_up
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Karen Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-05-19 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.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Allows a model of your choosing to subscribe to a plan, which enables features.