mtwarden 6.0.1 → 6.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (57) hide show
  1. checksums.yaml +4 -4
  2. data/MIT-LICENSE +20 -20
  3. data/README.md +35 -35
  4. data/Rakefile +33 -33
  5. data/app/assets/config/mtwarden_manifest.js +2 -2
  6. data/app/assets/javascripts/mtwarden/application.js +2 -2
  7. data/app/assets/stylesheets/mtwarden/application.scss +2 -2
  8. data/app/controllers/mtwarden/account/accounts_controller.rb +67 -67
  9. data/app/controllers/mtwarden/account/dashboard_controller.rb +7 -7
  10. data/app/controllers/mtwarden/account/sessions_controller.rb +20 -20
  11. data/app/controllers/mtwarden/account/users_controller.rb +23 -23
  12. data/app/controllers/mtwarden/accounts_controller.rb +32 -32
  13. data/app/controllers/mtwarden/application_controller.rb +12 -12
  14. data/app/controllers/mtwarden/dashboard_controller.rb +6 -6
  15. data/app/extenders/controllers/application_controller_extender.rb +38 -38
  16. data/app/helpers/mtwarden/application_helper.rb +4 -4
  17. data/app/jobs/mtwarden/application_job.rb +4 -4
  18. data/app/mailers/mtwarden/application_mailer.rb +8 -8
  19. data/app/models/mtwarden/account.rb +39 -39
  20. data/app/models/mtwarden/application_record.rb +5 -5
  21. data/app/models/mtwarden/member.rb +6 -6
  22. data/app/models/mtwarden/plan.rb +4 -4
  23. data/app/models/mtwarden/user.rb +7 -7
  24. data/app/views/layouts/mtwarden/application.html.erb +16 -16
  25. data/app/views/mtwarden/account/accounts/_existing_subscription.html.erb +3 -3
  26. data/app/views/mtwarden/account/accounts/_new_subscription.html.erb +38 -38
  27. data/app/views/mtwarden/account/accounts/edit.html.erb +17 -17
  28. data/app/views/mtwarden/account/accounts/plan.html.erb +14 -14
  29. data/app/views/mtwarden/account/dashboard/index.html.erb +1 -1
  30. data/app/views/mtwarden/account/sessions/new.html.erb +19 -19
  31. data/app/views/mtwarden/account/users/_form.html.erb +14 -14
  32. data/app/views/mtwarden/account/users/new.html.erb +6 -6
  33. data/app/views/mtwarden/accounts/new.html.erb +20 -20
  34. data/app/views/mtwarden/dashboard/index.html.erb +1 -1
  35. data/app/views/mtwarden/shared/_login.html.erb +7 -7
  36. data/config/initializers/warden/strategies/password.rb +18 -18
  37. data/config/routes.rb +30 -30
  38. data/db/migrate/20140621030847_create_mtwarden_accounts.rb +11 -11
  39. data/db/migrate/20140621114149_add_owner_id_to_mtwarden_accounts.rb +7 -7
  40. data/db/migrate/20140621114231_create_mtwarden_users.rb +12 -12
  41. data/db/migrate/20140621114308_create_mtwarden_members.rb +12 -12
  42. data/db/migrate/20140621114417_add_subdomain_to_mtwarden_accounts.rb +8 -8
  43. data/db/migrate/20140829231923_create_mtwarden_plans.rb +13 -13
  44. data/db/migrate/20140830011033_add_plan_id_to_mtwarden_accounts.rb +7 -7
  45. data/db/migrate/20140830020346_add_braintree_subscription_id_to_mtwarden_accounts.rb +7 -7
  46. data/lib/mtwarden.rb +4 -4
  47. data/lib/mtwarden/braintree_plan_fetcher.rb +22 -22
  48. data/lib/mtwarden/constraints/subdomain_required.rb +11 -11
  49. data/lib/mtwarden/engine.rb +52 -52
  50. data/lib/mtwarden/scoped_to.rb +9 -9
  51. data/lib/mtwarden/testing_support/authentication_helpers.rb +21 -21
  52. data/lib/mtwarden/testing_support/factories/account_factory.rb +14 -14
  53. data/lib/mtwarden/testing_support/factories/user_factory.rb +7 -7
  54. data/lib/mtwarden/testing_support/subdomain_helpers.rb +16 -16
  55. data/lib/mtwarden/version.rb +3 -3
  56. data/lib/tasks/mtwarden_tasks.rake +6 -6
  57. metadata +23 -53
@@ -1,7 +1,7 @@
1
- class AddPlanIdToMtwardenAccounts < ActiveRecord::Migration[5.0]
2
- def change
3
-
4
- add_column :mtwarden_accounts, :plan_id, :integer
5
-
6
- end
7
- end
1
+ class AddPlanIdToMtwardenAccounts < ActiveRecord::Migration[5.0]
2
+ def change
3
+
4
+ add_column :mtwarden_accounts, :plan_id, :integer
5
+
6
+ end
7
+ end
@@ -1,7 +1,7 @@
1
- class AddBraintreeSubscriptionIdToMtwardenAccounts < ActiveRecord::Migration[5.0]
2
- def change
3
-
4
- add_column :mtwarden_accounts, :braintree_subscription_id, :string
5
-
6
- end
7
- end
1
+ class AddBraintreeSubscriptionIdToMtwardenAccounts < ActiveRecord::Migration[5.0]
2
+ def change
3
+
4
+ add_column :mtwarden_accounts, :braintree_subscription_id, :string
5
+
6
+ end
7
+ end
data/lib/mtwarden.rb CHANGED
@@ -1,5 +1,5 @@
1
- require "mtwarden/engine"
2
- require "mtwarden/scoped_to"
3
-
4
- module Mtwarden
1
+ require "mtwarden/engine"
2
+ require "mtwarden/scoped_to"
3
+
4
+ module Mtwarden
5
5
  end
@@ -1,22 +1,22 @@
1
- module Mtwarden
2
- class BraintreePlanFetcher
3
-
4
- def self.store_locally
5
- Braintree::Plan.all.each do |plan|
6
- if local_plan = Mtwarden::Plan.find_by(braintree_id: plan.id)
7
- local_plan.update_attributes({
8
- :name => plan.name,
9
- :price => plan.price
10
- })
11
- else
12
- Mtwarden::Plan.create({
13
- :name => plan.name,
14
- :price => plan.price,
15
- :braintree_id => plan.id
16
- })
17
- end
18
- end
19
- end
20
-
21
- end
22
- end
1
+ module Mtwarden
2
+ class BraintreePlanFetcher
3
+
4
+ def self.store_locally
5
+ Braintree::Plan.all.each do |plan|
6
+ if local_plan = Mtwarden::Plan.find_by(braintree_id: plan.id)
7
+ local_plan.update_attributes({
8
+ :name => plan.name,
9
+ :price => plan.price
10
+ })
11
+ else
12
+ Mtwarden::Plan.create({
13
+ :name => plan.name,
14
+ :price => plan.price,
15
+ :braintree_id => plan.id
16
+ })
17
+ end
18
+ end
19
+ end
20
+
21
+ end
22
+ end
@@ -1,11 +1,11 @@
1
- module Mtwarden
2
- module Constraints
3
- class SubdomainRequired
4
-
5
- def self.matches?(request)
6
- request.subdomain.present? && request.subdomain != "www"
7
- end
8
-
9
- end
10
- end
11
- end
1
+ module Mtwarden
2
+ module Constraints
3
+ class SubdomainRequired
4
+
5
+ def self.matches?(request)
6
+ request.subdomain.present? && request.subdomain != "www"
7
+ end
8
+
9
+ end
10
+ end
11
+ end
@@ -1,52 +1,52 @@
1
- require "warden"
2
- require "houser"
3
- require 'gravtastic'
4
-
5
- require "dynamic_form"
6
- require "braintree"
7
-
8
- module Mtwarden
9
- class Engine < ::Rails::Engine
10
-
11
- isolate_namespace Mtwarden
12
-
13
- config.generators do |g|
14
- g.test_framework :rspec, :view_specs => false
15
- end
16
-
17
- initializer "mtwarden.middleware.warden" do
18
- Rails.application.config.middleware.use Warden::Manager do |manager|
19
- manager.default_strategies :password
20
- manager.serialize_into_session do |user|
21
- user.id
22
- end
23
- manager.serialize_from_session do |id|
24
- Mtwarden::User.find(id)
25
- end
26
- end
27
- end
28
-
29
- initializer "mtwarden.middleware.fake_braintree_redirect" do
30
- if Rails.env.test?
31
- require "fake_braintree_redirect"
32
- Rails.application.config.middleware.insert_before \
33
- Warden::Manager,
34
- FakeBraintreeRedirect
35
- end
36
- end
37
-
38
- config.to_prepare do
39
- root = Mtwarden::Engine.root
40
- extenders_path = root + "app/extenders/**/*.rb"
41
- Dir.glob(extenders_path) do |file|
42
- Rails.configuration.cache_classes ? require(file) : load(file)
43
- end
44
- end
45
-
46
- initializer 'mtwarden.middleware.houser' do
47
- Rails.application.config.middleware.use Houser::Middleware,
48
- :class_name => 'Mtwarden::Account'
49
- end
50
-
51
- end
52
- end
1
+ require "warden"
2
+ require "houser"
3
+ require 'gravtastic'
4
+
5
+ require "dynamic_form"
6
+ require "braintree"
7
+
8
+ module Mtwarden
9
+ class Engine < ::Rails::Engine
10
+
11
+ isolate_namespace Mtwarden
12
+
13
+ config.generators do |g|
14
+ g.test_framework :rspec, :view_specs => false
15
+ end
16
+
17
+ initializer "mtwarden.middleware.warden" do
18
+ Rails.application.config.middleware.use Warden::Manager do |manager|
19
+ manager.default_strategies :password
20
+ manager.serialize_into_session do |user|
21
+ user.id
22
+ end
23
+ manager.serialize_from_session do |id|
24
+ Mtwarden::User.find(id)
25
+ end
26
+ end
27
+ end
28
+
29
+ initializer "mtwarden.middleware.fake_braintree_redirect" do
30
+ if Rails.env.test?
31
+ require "fake_braintree_redirect"
32
+ Rails.application.config.middleware.insert_before \
33
+ Warden::Manager,
34
+ FakeBraintreeRedirect
35
+ end
36
+ end
37
+
38
+ config.to_prepare do
39
+ root = Mtwarden::Engine.root
40
+ extenders_path = root + "app/extenders/**/*.rb"
41
+ Dir.glob(extenders_path) do |file|
42
+ Rails.configuration.cache_classes ? require(file) : load(file)
43
+ end
44
+ end
45
+
46
+ initializer 'mtwarden.middleware.houser' do
47
+ Rails.application.config.middleware.use Houser::Middleware,
48
+ :class_name => 'Mtwarden::Account'
49
+ end
50
+
51
+ end
52
+ end
@@ -1,9 +1,9 @@
1
- module Mtwarden
2
- module ScopedTo
3
-
4
- def scoped_to(account)
5
- where(:account_id => account.id)
6
- end
7
-
8
- end
9
- end
1
+ module Mtwarden
2
+ module ScopedTo
3
+
4
+ def scoped_to(account)
5
+ where(:account_id => account.id)
6
+ end
7
+
8
+ end
9
+ end
@@ -1,21 +1,21 @@
1
- module Mtwarden
2
- module TestingSupport
3
- module AuthenticationHelpers
4
-
5
- include Warden::Test::Helpers
6
-
7
- def self.included(base)
8
- base.after do
9
- logout
10
- end
11
- end
12
-
13
- def sign_in_as(options={})
14
- options.each do |scope, object|
15
- login_as(object, :scope => scope)
16
- end
17
- end
18
-
19
- end
20
- end
21
- end
1
+ module Mtwarden
2
+ module TestingSupport
3
+ module AuthenticationHelpers
4
+
5
+ include Warden::Test::Helpers
6
+
7
+ def self.included(base)
8
+ base.after do
9
+ logout
10
+ end
11
+ end
12
+
13
+ def sign_in_as(options={})
14
+ options.each do |scope, object|
15
+ login_as(object, :scope => scope)
16
+ end
17
+ end
18
+
19
+ end
20
+ end
21
+ end
@@ -1,14 +1,14 @@
1
- require "mtwarden/testing_support/factories/user_factory"
2
-
3
- FactoryGirl.define do
4
- factory :account, :class => Mtwarden::Account do
5
- sequence(:name) { |n| "Test Account ##{n}" }
6
- sequence(:subdomain) { |n| "test#{n}" }
7
- association :owner, :factory => :user
8
-
9
- after(:create) do |account|
10
- account.users << account.owner
11
- end
12
-
13
- end
14
- end
1
+ require "mtwarden/testing_support/factories/user_factory"
2
+
3
+ FactoryGirl.define do
4
+ factory :account, :class => Mtwarden::Account do
5
+ sequence(:name) { |n| "Test Account ##{n}" }
6
+ sequence(:subdomain) { |n| "test#{n}" }
7
+ association :owner, :factory => :user
8
+
9
+ after(:create) do |account|
10
+ account.users << account.owner
11
+ end
12
+
13
+ end
14
+ end
@@ -1,7 +1,7 @@
1
- FactoryGirl.define do
2
- factory :user, :class => Mtwarden::User do
3
- sequence(:email) { |n| "test#{n}@example.com" }
4
- password "password"
5
- password_confirmation "password"
6
- end
7
- end
1
+ FactoryGirl.define do
2
+ factory :user, :class => Mtwarden::User do
3
+ sequence(:email) { |n| "test#{n}@example.com" }
4
+ password "password"
5
+ password_confirmation "password"
6
+ end
7
+ end
@@ -1,16 +1,16 @@
1
- module Mtwarden
2
- module TestingSupport
3
- module SubdomainHelpers
4
-
5
- def within_account_subdomain(&block)
6
- context "within a subdomain" do
7
- let(:subdomain_url) { "http://#{account.subdomain}.example.com" }
8
- before { Capybara.default_host = subdomain_url }
9
- after { Capybara.default_host = "http://example.com" }
10
- yield
11
- end
12
- end
13
-
14
- end
15
- end
16
- end
1
+ module Mtwarden
2
+ module TestingSupport
3
+ module SubdomainHelpers
4
+
5
+ def within_account_subdomain(&block)
6
+ context "within a subdomain" do
7
+ let(:subdomain_url) { "http://#{account.subdomain}.example.com" }
8
+ before { Capybara.default_host = subdomain_url }
9
+ after { Capybara.default_host = "http://example.com" }
10
+ yield
11
+ end
12
+ end
13
+
14
+ end
15
+ end
16
+ end
@@ -1,3 +1,3 @@
1
- module Mtwarden
2
- VERSION = '6.0.1'
3
- end
1
+ module Mtwarden
2
+ VERSION = '6.1.0'
3
+ end
@@ -1,7 +1,7 @@
1
- require "mtwarden/braintree_plan_fetcher"
2
- namespace :mtwarden do
3
- desc "Import plans from Braintree"
4
- task :import_plans => :environment do
5
- Mtwarden::BraintreePlanFetcher.store_locally
6
- end
1
+ require "mtwarden/braintree_plan_fetcher"
2
+ namespace :mtwarden do
3
+ desc "Import plans from Braintree"
4
+ task :import_plans => :environment do
5
+ Mtwarden::BraintreePlanFetcher.store_locally
6
+ end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mtwarden
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.1
4
+ version: 6.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - BradPotts
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-05-19 00:00:00.000000000 Z
11
+ date: 2017-05-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -204,14 +204,14 @@ dependencies:
204
204
  requirements:
205
205
  - - "~>"
206
206
  - !ruby/object:Gem::Version
207
- version: '1.2'
207
+ version: '2.0'
208
208
  type: :runtime
209
209
  prerelease: false
210
210
  version_requirements: !ruby/object:Gem::Requirement
211
211
  requirements:
212
212
  - - "~>"
213
213
  - !ruby/object:Gem::Version
214
- version: '1.2'
214
+ version: '2.0'
215
215
  - !ruby/object:Gem::Dependency
216
216
  name: tinymce-rails
217
217
  requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ dependencies:
221
221
  version: '4.6'
222
222
  - - ">="
223
223
  - !ruby/object:Gem::Version
224
- version: 4.6.1
224
+ version: 4.6.2
225
225
  type: :runtime
226
226
  prerelease: false
227
227
  version_requirements: !ruby/object:Gem::Requirement
@@ -231,7 +231,7 @@ dependencies:
231
231
  version: '4.6'
232
232
  - - ">="
233
233
  - !ruby/object:Gem::Version
234
- version: 4.6.1
234
+ version: 4.6.2
235
235
  - !ruby/object:Gem::Dependency
236
236
  name: oj
237
237
  requirement: !ruby/object:Gem::Requirement
@@ -241,7 +241,7 @@ dependencies:
241
241
  version: '3.0'
242
242
  - - ">="
243
243
  - !ruby/object:Gem::Version
244
- version: 3.0.9
244
+ version: 3.0.10
245
245
  type: :runtime
246
246
  prerelease: false
247
247
  version_requirements: !ruby/object:Gem::Requirement
@@ -251,7 +251,7 @@ dependencies:
251
251
  version: '3.0'
252
252
  - - ">="
253
253
  - !ruby/object:Gem::Version
254
- version: 3.0.9
254
+ version: 3.0.10
255
255
  - !ruby/object:Gem::Dependency
256
256
  name: rabl
257
257
  requirement: !ruby/object:Gem::Requirement
@@ -360,128 +360,98 @@ dependencies:
360
360
  requirements:
361
361
  - - "~>"
362
362
  - !ruby/object:Gem::Version
363
- version: '7.0'
363
+ version: '7.1'
364
364
  type: :runtime
365
365
  prerelease: false
366
366
  version_requirements: !ruby/object:Gem::Requirement
367
367
  requirements:
368
368
  - - "~>"
369
369
  - !ruby/object:Gem::Version
370
- version: '7.0'
370
+ version: '7.1'
371
371
  - !ruby/object:Gem::Dependency
372
372
  name: phcnotifi
373
373
  requirement: !ruby/object:Gem::Requirement
374
374
  requirements:
375
375
  - - "~>"
376
376
  - !ruby/object:Gem::Version
377
- version: '6.0'
377
+ version: '6.1'
378
378
  type: :runtime
379
379
  prerelease: false
380
380
  version_requirements: !ruby/object:Gem::Requirement
381
381
  requirements:
382
382
  - - "~>"
383
383
  - !ruby/object:Gem::Version
384
- version: '6.0'
384
+ version: '6.1'
385
385
  - !ruby/object:Gem::Dependency
386
386
  name: phctheme1
387
387
  requirement: !ruby/object:Gem::Requirement
388
388
  requirements:
389
389
  - - "~>"
390
390
  - !ruby/object:Gem::Version
391
- version: '14.0'
392
- - - ">="
393
- - !ruby/object:Gem::Version
394
- version: 14.0.1
391
+ version: '14.2'
395
392
  type: :runtime
396
393
  prerelease: false
397
394
  version_requirements: !ruby/object:Gem::Requirement
398
395
  requirements:
399
396
  - - "~>"
400
397
  - !ruby/object:Gem::Version
401
- version: '14.0'
402
- - - ">="
403
- - !ruby/object:Gem::Version
404
- version: 14.0.1
398
+ version: '14.2'
405
399
  - !ruby/object:Gem::Dependency
406
400
  name: phctheme2
407
401
  requirement: !ruby/object:Gem::Requirement
408
402
  requirements:
409
403
  - - "~>"
410
404
  - !ruby/object:Gem::Version
411
- version: '5.0'
412
- - - ">="
413
- - !ruby/object:Gem::Version
414
- version: 5.0.1
405
+ version: '5.2'
415
406
  type: :runtime
416
407
  prerelease: false
417
408
  version_requirements: !ruby/object:Gem::Requirement
418
409
  requirements:
419
410
  - - "~>"
420
411
  - !ruby/object:Gem::Version
421
- version: '5.0'
422
- - - ">="
423
- - !ruby/object:Gem::Version
424
- version: 5.0.1
412
+ version: '5.2'
425
413
  - !ruby/object:Gem::Dependency
426
414
  name: phcadmin1
427
415
  requirement: !ruby/object:Gem::Requirement
428
416
  requirements:
429
417
  - - "~>"
430
418
  - !ruby/object:Gem::Version
431
- version: '10.0'
432
- - - ">="
433
- - !ruby/object:Gem::Version
434
- version: 10.0.1
419
+ version: '10.2'
435
420
  type: :runtime
436
421
  prerelease: false
437
422
  version_requirements: !ruby/object:Gem::Requirement
438
423
  requirements:
439
424
  - - "~>"
440
425
  - !ruby/object:Gem::Version
441
- version: '10.0'
442
- - - ">="
443
- - !ruby/object:Gem::Version
444
- version: 10.0.1
426
+ version: '10.2'
445
427
  - !ruby/object:Gem::Dependency
446
428
  name: phcadmin2
447
429
  requirement: !ruby/object:Gem::Requirement
448
430
  requirements:
449
431
  - - "~>"
450
432
  - !ruby/object:Gem::Version
451
- version: '8.0'
452
- - - ">="
453
- - !ruby/object:Gem::Version
454
- version: 8.0.1
433
+ version: '8.2'
455
434
  type: :runtime
456
435
  prerelease: false
457
436
  version_requirements: !ruby/object:Gem::Requirement
458
437
  requirements:
459
438
  - - "~>"
460
439
  - !ruby/object:Gem::Version
461
- version: '8.0'
462
- - - ">="
463
- - !ruby/object:Gem::Version
464
- version: 8.0.1
440
+ version: '8.2'
465
441
  - !ruby/object:Gem::Dependency
466
442
  name: phcadmin3
467
443
  requirement: !ruby/object:Gem::Requirement
468
444
  requirements:
469
445
  - - "~>"
470
446
  - !ruby/object:Gem::Version
471
- version: '5.0'
472
- - - ">="
473
- - !ruby/object:Gem::Version
474
- version: 5.0.1
447
+ version: '5.2'
475
448
  type: :runtime
476
449
  prerelease: false
477
450
  version_requirements: !ruby/object:Gem::Requirement
478
451
  requirements:
479
452
  - - "~>"
480
453
  - !ruby/object:Gem::Version
481
- version: '5.0'
482
- - - ">="
483
- - !ruby/object:Gem::Version
484
- version: 5.0.1
454
+ version: '5.2'
485
455
  - !ruby/object:Gem::Dependency
486
456
  name: bcrypt
487
457
  requirement: !ruby/object:Gem::Requirement
@@ -918,7 +888,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
918
888
  version: '0'
919
889
  requirements: []
920
890
  rubyforge_project:
921
- rubygems_version: 2.6.12
891
+ rubygems_version: 2.6.8
922
892
  signing_key:
923
893
  specification_version: 4
924
894
  summary: Rails 5.1 Engine - MTWarden(6)