acts_as_tenant 0.4.0 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (113) hide show
  1. checksums.yaml +5 -5
  2. data/README.md +90 -26
  3. data/Rakefile +5 -14
  4. data/lib/acts_as_tenant.rb +114 -12
  5. data/lib/acts_as_tenant/configuration.rb +6 -19
  6. data/lib/acts_as_tenant/controller_extensions.rb +11 -56
  7. data/lib/acts_as_tenant/controller_extensions/filter.rb +13 -0
  8. data/lib/acts_as_tenant/controller_extensions/subdomain.rb +20 -0
  9. data/lib/acts_as_tenant/controller_extensions/subdomain_or_domain.rb +20 -0
  10. data/lib/acts_as_tenant/errors.rb +3 -4
  11. data/lib/acts_as_tenant/model_extensions.rb +62 -107
  12. data/lib/acts_as_tenant/sidekiq.rb +16 -8
  13. data/lib/acts_as_tenant/tenant_helper.rb +7 -0
  14. data/lib/acts_as_tenant/test_tenant_middleware.rb +15 -0
  15. data/lib/acts_as_tenant/version.rb +1 -1
  16. data/spec/acts_as_tenant/configuration_spec.rb +8 -19
  17. data/spec/acts_as_tenant/sidekiq_spec.rb +14 -19
  18. data/spec/controllers/filter_spec.rb +28 -0
  19. data/spec/controllers/subdomain_or_domain_spec.rb +55 -0
  20. data/spec/controllers/subdomain_spec.rb +49 -0
  21. data/spec/dummy/.ruby-version +1 -0
  22. data/spec/dummy/Rakefile +6 -0
  23. data/spec/dummy/app/assets/config/manifest.js +2 -0
  24. data/spec/dummy/app/assets/images/.keep +0 -0
  25. data/spec/dummy/app/assets/stylesheets/application.css +15 -0
  26. data/spec/dummy/app/channels/application_cable/channel.rb +4 -0
  27. data/spec/dummy/app/channels/application_cable/connection.rb +4 -0
  28. data/spec/dummy/app/controllers/application_controller.rb +2 -0
  29. data/spec/dummy/app/controllers/concerns/.keep +0 -0
  30. data/spec/dummy/app/helpers/application_helper.rb +2 -0
  31. data/spec/dummy/app/javascript/packs/application.js +15 -0
  32. data/spec/dummy/app/jobs/application_job.rb +7 -0
  33. data/spec/dummy/app/mailers/application_mailer.rb +4 -0
  34. data/spec/dummy/app/mailers/user_mailer.rb +5 -0
  35. data/spec/dummy/app/models/account.rb +4 -0
  36. data/spec/dummy/app/models/aliased_task.rb +4 -0
  37. data/spec/dummy/app/models/article.rb +3 -0
  38. data/spec/dummy/app/models/comment.rb +5 -0
  39. data/spec/dummy/app/models/concerns/.keep +0 -0
  40. data/spec/dummy/app/models/custom_counter_cache_task.rb +4 -0
  41. data/spec/dummy/app/models/custom_foreign_key_task.rb +4 -0
  42. data/spec/dummy/app/models/custom_primary_key_task.rb +4 -0
  43. data/spec/dummy/app/models/global_project.rb +6 -0
  44. data/spec/dummy/app/models/manager.rb +4 -0
  45. data/spec/dummy/app/models/polymorphic_tenant_comment.rb +5 -0
  46. data/spec/dummy/app/models/project.rb +8 -0
  47. data/spec/dummy/app/models/task.rb +7 -0
  48. data/spec/dummy/app/models/unique_task.rb +5 -0
  49. data/spec/dummy/app/models/unscoped_model.rb +3 -0
  50. data/spec/dummy/app/views/layouts/application.html.erb +14 -0
  51. data/spec/dummy/app/views/layouts/mailer.html.erb +13 -0
  52. data/spec/dummy/app/views/layouts/mailer.text.erb +1 -0
  53. data/spec/dummy/bin/rails +4 -0
  54. data/spec/dummy/bin/rake +4 -0
  55. data/spec/dummy/bin/setup +33 -0
  56. data/spec/dummy/config.ru +5 -0
  57. data/spec/dummy/config/application.rb +19 -0
  58. data/spec/dummy/config/boot.rb +5 -0
  59. data/spec/dummy/config/cable.yml +10 -0
  60. data/spec/dummy/config/database.yml +19 -0
  61. data/spec/dummy/config/environment.rb +5 -0
  62. data/spec/dummy/config/environments/development.rb +62 -0
  63. data/spec/dummy/config/environments/production.rb +112 -0
  64. data/spec/dummy/config/environments/test.rb +49 -0
  65. data/spec/dummy/config/initializers/application_controller_renderer.rb +8 -0
  66. data/spec/dummy/config/initializers/assets.rb +12 -0
  67. data/spec/dummy/config/initializers/backtrace_silencers.rb +7 -0
  68. data/spec/dummy/config/initializers/content_security_policy.rb +28 -0
  69. data/spec/dummy/config/initializers/cookies_serializer.rb +5 -0
  70. data/spec/dummy/config/initializers/filter_parameter_logging.rb +4 -0
  71. data/spec/dummy/config/initializers/inflections.rb +16 -0
  72. data/spec/dummy/config/initializers/mime_types.rb +4 -0
  73. data/spec/dummy/config/initializers/wrap_parameters.rb +14 -0
  74. data/spec/dummy/config/locales/en.yml +40 -0
  75. data/spec/dummy/config/puma.rb +38 -0
  76. data/spec/dummy/config/routes.rb +4 -0
  77. data/spec/dummy/config/spring.rb +6 -0
  78. data/spec/dummy/config/storage.yml +34 -0
  79. data/spec/dummy/db/schema.rb +84 -0
  80. data/spec/dummy/lib/assets/.keep +0 -0
  81. data/spec/dummy/log/.keep +0 -0
  82. data/spec/dummy/public/404.html +67 -0
  83. data/spec/dummy/public/422.html +67 -0
  84. data/spec/dummy/public/500.html +66 -0
  85. data/spec/dummy/public/apple-touch-icon-precomposed.png +0 -0
  86. data/spec/dummy/public/apple-touch-icon.png +0 -0
  87. data/spec/dummy/public/favicon.ico +0 -0
  88. data/spec/dummy/tmp/development_secret.txt +1 -0
  89. data/spec/fixtures/accounts.yml +10 -0
  90. data/spec/fixtures/custom_primary_key_tasks.yml +2 -0
  91. data/spec/fixtures/global_projects.yml +13 -0
  92. data/spec/fixtures/projects.yml +10 -0
  93. data/spec/helpers/tenant_helper_spec.rb +16 -0
  94. data/spec/middlewares/test_tenant_middleware_spec.rb +86 -0
  95. data/spec/models/model_extensions_spec.rb +383 -0
  96. data/spec/spec_helper.rb +10 -15
  97. metadata +196 -54
  98. data/.gitignore +0 -7
  99. data/.travis.yml +0 -6
  100. data/CHANGELOG.md +0 -101
  101. data/Gemfile +0 -4
  102. data/acts_as_tenant.gemspec +0 -33
  103. data/rails/init.rb +0 -2
  104. data/spec/active_record_helper.rb +0 -22
  105. data/spec/active_record_models.rb +0 -109
  106. data/spec/acts_as_tenant/model_extensions_spec.rb +0 -394
  107. data/spec/acts_as_tenant/tenant_by_filter_spec.rb +0 -33
  108. data/spec/acts_as_tenant/tenant_by_subdomain_or_domain.rb +0 -46
  109. data/spec/acts_as_tenant/tenant_by_subdomain_spec.rb +0 -32
  110. data/spec/database.yml +0 -3
  111. data/spec/mongoid.yml +0 -6
  112. data/spec/mongoid_helper.rb +0 -23
  113. data/spec/mongoid_models.rb +0 -81
@@ -0,0 +1,28 @@
1
+ require "spec_helper"
2
+
3
+ class ApplicationController2 < ActionController::Base
4
+ include Rails.application.routes.url_helpers
5
+ set_current_tenant_through_filter
6
+ before_action :your_method_that_finds_the_current_tenant
7
+
8
+ def your_method_that_finds_the_current_tenant
9
+ current_account = Account.new(name: "account1")
10
+ set_current_tenant(current_account)
11
+ end
12
+ end
13
+
14
+ # Start testing
15
+ describe ApplicationController2, type: :controller do
16
+ controller do
17
+ def index
18
+ # Exercise current_tenant helper method
19
+ render plain: current_tenant.name
20
+ end
21
+ end
22
+
23
+ it "Finds the correct tenant using the filter command" do
24
+ get :index
25
+ expect(ActsAsTenant.current_tenant.name).to eq "account1"
26
+ expect(response.body).to eq "account1"
27
+ end
28
+ end
@@ -0,0 +1,55 @@
1
+ require "spec_helper"
2
+
3
+ class DomainController < ActionController::Base
4
+ include Rails.application.routes.url_helpers
5
+ set_current_tenant_by_subdomain_or_domain
6
+ end
7
+
8
+ describe DomainController, type: :controller do
9
+ let(:account) { accounts(:with_domain) }
10
+
11
+ controller do
12
+ def index
13
+ # Exercise current_tenant helper method
14
+ render plain: current_tenant.name
15
+ end
16
+ end
17
+
18
+ it "finds the correct tenant with a example1.com" do
19
+ @request.host = account.domain
20
+ get :index
21
+ expect(ActsAsTenant.current_tenant).to eq account
22
+ expect(response.body).to eq account.name
23
+ end
24
+
25
+ it "finds the correct tenant with a subdomain.example.com" do
26
+ @request.host = "#{account.subdomain}.example.com"
27
+ get :index
28
+ expect(ActsAsTenant.current_tenant).to eq account
29
+ expect(response.body).to eq account.name
30
+ end
31
+
32
+ it "finds the correct tenant with a www.subdomain.example.com" do
33
+ @request.host = "www.#{account.subdomain}.example.com"
34
+ get :index
35
+ expect(ActsAsTenant.current_tenant).to eq account
36
+ end
37
+
38
+ it "ignores case when finding tenant by subdomain" do
39
+ @request.host = "#{account.subdomain.upcase}.example.com"
40
+ get :index
41
+ expect(ActsAsTenant.current_tenant).to eq account
42
+ end
43
+
44
+ context "overriding subdomain lookup" do
45
+ after { controller.subdomain_lookup = :last }
46
+
47
+ it "allows overriding the subdomain lookup" do
48
+ controller.subdomain_lookup = :first
49
+ @request.host = "#{account.subdomain}.another.example.com"
50
+ get :index
51
+ expect(ActsAsTenant.current_tenant).to eq account
52
+ expect(response.body).to eq(account.subdomain)
53
+ end
54
+ end
55
+ end
@@ -0,0 +1,49 @@
1
+ require "spec_helper"
2
+
3
+ class SubdomainController < ActionController::Base
4
+ include Rails.application.routes.url_helpers
5
+ set_current_tenant_by_subdomain
6
+ end
7
+
8
+ describe SubdomainController, type: :controller do
9
+ let(:account) { accounts(:with_domain) }
10
+
11
+ controller(SubdomainController) do
12
+ def index
13
+ # Exercise current_tenant helper method
14
+ render plain: current_tenant.name
15
+ end
16
+ end
17
+
18
+ it "finds the correct tenant with a subdomain.example.com" do
19
+ @request.host = "#{account.subdomain}.example.com"
20
+ get :index
21
+ expect(ActsAsTenant.current_tenant).to eq account
22
+ expect(response.body).to eq(account.subdomain)
23
+ end
24
+
25
+ it "finds the correct tenant with a www.subdomain.example.com" do
26
+ @request.host = "www.#{account.subdomain}.example.com"
27
+ get :index
28
+ expect(ActsAsTenant.current_tenant).to eq account
29
+ expect(response.body).to eq(account.subdomain)
30
+ end
31
+
32
+ it "ignores case when finding tenant by subdomain" do
33
+ @request.host = "#{account.subdomain.upcase}.example.com"
34
+ get :index
35
+ expect(ActsAsTenant.current_tenant).to eq account
36
+ end
37
+
38
+ context "overriding subdomain lookup" do
39
+ after { controller.subdomain_lookup = :last }
40
+
41
+ it "allows overriding the subdomain lookup" do
42
+ controller.subdomain_lookup = :first
43
+ @request.host = "#{account.subdomain}.another.example.com"
44
+ get :index
45
+ expect(ActsAsTenant.current_tenant).to eq account
46
+ expect(response.body).to eq(account.subdomain)
47
+ end
48
+ end
49
+ end
@@ -0,0 +1 @@
1
+ ruby-2.7.1
@@ -0,0 +1,6 @@
1
+ # Add your own tasks in files placed in lib/tasks ending in .rake,
2
+ # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
3
+
4
+ require_relative "config/application"
5
+
6
+ Rails.application.load_tasks
@@ -0,0 +1,2 @@
1
+ //= link_tree ../images
2
+ //= link_directory ../stylesheets .css
File without changes
@@ -0,0 +1,15 @@
1
+ /*
2
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
3
+ * listed below.
4
+ *
5
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
6
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
7
+ *
8
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
9
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
10
+ * files in this directory. Styles in this file should be added after the last require_* statement.
11
+ * It is generally better to create a new file per style scope.
12
+ *
13
+ *= require_tree .
14
+ *= require_self
15
+ */
@@ -0,0 +1,4 @@
1
+ module ApplicationCable
2
+ class Channel < ActionCable::Channel::Base
3
+ end
4
+ end
@@ -0,0 +1,4 @@
1
+ module ApplicationCable
2
+ class Connection < ActionCable::Connection::Base
3
+ end
4
+ end
@@ -0,0 +1,2 @@
1
+ class ApplicationController < ActionController::Base
2
+ end
@@ -0,0 +1,2 @@
1
+ module ApplicationHelper
2
+ end
@@ -0,0 +1,15 @@
1
+ // This is a manifest file that'll be compiled into application.js, which will include all the files
2
+ // listed below.
3
+ //
4
+ // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
5
+ // or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
6
+ //
7
+ // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
8
+ // compiled file. JavaScript code in this file should be added after the last require_* statement.
9
+ //
10
+ // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
11
+ // about supported directives.
12
+ //
13
+ //= require rails-ujs
14
+ //= require activestorage
15
+ //= require_tree .
@@ -0,0 +1,7 @@
1
+ class ApplicationJob < ActiveJob::Base
2
+ # Automatically retry jobs that encountered a deadlock
3
+ # retry_on ActiveRecord::Deadlocked
4
+
5
+ # Most jobs are safe to ignore if the underlying records are no longer available
6
+ # discard_on ActiveJob::DeserializationError
7
+ end
@@ -0,0 +1,4 @@
1
+ class ApplicationMailer < ActionMailer::Base
2
+ default from: "from@example.com", to: "to@example.com"
3
+ layout "mailer"
4
+ end
@@ -0,0 +1,5 @@
1
+ class UserMailer < ApplicationMailer
2
+ def comment_notification
3
+ mail(body: "")
4
+ end
5
+ end
@@ -0,0 +1,4 @@
1
+ class Account < ActiveRecord::Base
2
+ has_many :projects
3
+ has_many :global_projects
4
+ end
@@ -0,0 +1,4 @@
1
+ class AliasedTask < ActiveRecord::Base
2
+ acts_as_tenant(:account)
3
+ belongs_to :project_alias, class_name: "Project"
4
+ end
@@ -0,0 +1,3 @@
1
+ class Article < ActiveRecord::Base
2
+ has_many :polymorphic_tenant_comments, as: :polymorphic_tenant_commentable
3
+ end
@@ -0,0 +1,5 @@
1
+ class Comment < ActiveRecord::Base
2
+ belongs_to :commentable, polymorphic: true
3
+ belongs_to :task, -> { where(comments: {commentable_type: "Task"}) }, foreign_key: "commentable_id"
4
+ acts_as_tenant :account
5
+ end
File without changes
@@ -0,0 +1,4 @@
1
+ class CustomCounterCacheTask < ActiveRecord::Base
2
+ self.table_name = "projects"
3
+ acts_as_tenant(:account, counter_cache: "projects_count")
4
+ end
@@ -0,0 +1,4 @@
1
+ class CustomForeignKeyTask < ActiveRecord::Base
2
+ acts_as_tenant(:account, foreign_key: "accountID")
3
+ validates_uniqueness_to_tenant :name
4
+ end
@@ -0,0 +1,4 @@
1
+ class CustomPrimaryKeyTask < ActiveRecord::Base
2
+ acts_as_tenant(:account, foreign_key: "name", primary_key: "name")
3
+ validates_presence_of :name
4
+ end
@@ -0,0 +1,6 @@
1
+ class GlobalProject < ActiveRecord::Base
2
+ self.table_name = "projects"
3
+
4
+ acts_as_tenant :account, has_global_records: true
5
+ validates_uniqueness_to_tenant :name
6
+ end
@@ -0,0 +1,4 @@
1
+ class Manager < ActiveRecord::Base
2
+ belongs_to :project
3
+ acts_as_tenant :account
4
+ end
@@ -0,0 +1,5 @@
1
+ class PolymorphicTenantComment < ActiveRecord::Base
2
+ belongs_to :polymorphic_tenant_commentable, polymorphic: true
3
+ belongs_to :account
4
+ acts_as_tenant :polymorphic_tenant_commentable, polymorphic: true
5
+ end
@@ -0,0 +1,8 @@
1
+ class Project < ActiveRecord::Base
2
+ has_one :manager
3
+ has_many :tasks
4
+ has_many :polymorphic_tenant_comments, as: :polymorphic_tenant_commentable
5
+ acts_as_tenant :account
6
+
7
+ validates_uniqueness_to_tenant :name
8
+ end
@@ -0,0 +1,7 @@
1
+ class Task < ActiveRecord::Base
2
+ belongs_to :project
3
+ default_scope -> { where(completed: nil).order("name") }
4
+
5
+ acts_as_tenant :account
6
+ validates_uniqueness_of :name
7
+ end
@@ -0,0 +1,5 @@
1
+ class UniqueTask < ActiveRecord::Base
2
+ acts_as_tenant(:account)
3
+ belongs_to :project
4
+ validates_uniqueness_to_tenant :name, scope: :user_defined_scope
5
+ end
@@ -0,0 +1,3 @@
1
+ class UnscopedModel < ActiveRecord::Base
2
+ validates_uniqueness_of :name
3
+ end
@@ -0,0 +1,14 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <title>Dummy</title>
5
+ <%= csrf_meta_tags %>
6
+ <%= csp_meta_tag %>
7
+
8
+ <%= stylesheet_link_tag 'application', media: 'all' %>
9
+ </head>
10
+
11
+ <body>
12
+ <%= yield %>
13
+ </body>
14
+ </html>
@@ -0,0 +1,13 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5
+ <style>
6
+ /* Email styles need to be inline */
7
+ </style>
8
+ </head>
9
+
10
+ <body>
11
+ <%= yield %>
12
+ </body>
13
+ </html>
@@ -0,0 +1 @@
1
+ <%= yield %>
@@ -0,0 +1,4 @@
1
+ #!/usr/bin/env ruby
2
+ APP_PATH = File.expand_path("../config/application", __dir__)
3
+ require_relative "../config/boot"
4
+ require "rails/commands"
@@ -0,0 +1,4 @@
1
+ #!/usr/bin/env ruby
2
+ require_relative "../config/boot"
3
+ require "rake"
4
+ Rake.application.run
@@ -0,0 +1,33 @@
1
+ #!/usr/bin/env ruby
2
+ require "fileutils"
3
+
4
+ # path to your application root.
5
+ APP_ROOT = File.expand_path("..", __dir__)
6
+
7
+ def system!(*args)
8
+ system(*args) || abort("\n== Command #{args} failed ==")
9
+ end
10
+
11
+ FileUtils.chdir APP_ROOT do
12
+ # This script is a way to setup or update your development environment automatically.
13
+ # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
14
+ # Add necessary setup steps to this file.
15
+
16
+ puts "== Installing dependencies =="
17
+ system! "gem install bundler --conservative"
18
+ system("bundle check") || system!("bundle install")
19
+
20
+ # puts "\n== Copying sample files =="
21
+ # unless File.exist?('config/database.yml')
22
+ # FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
23
+ # end
24
+
25
+ puts "\n== Preparing database =="
26
+ system! "bin/rails db:prepare"
27
+
28
+ puts "\n== Removing old logs and tempfiles =="
29
+ system! "bin/rails log:clear tmp:clear"
30
+
31
+ puts "\n== Restarting application server =="
32
+ system! "bin/rails restart"
33
+ end
@@ -0,0 +1,5 @@
1
+ # This file is used by Rack-based servers to start the application.
2
+
3
+ require_relative "config/environment"
4
+
5
+ run Rails.application
@@ -0,0 +1,19 @@
1
+ require_relative "boot"
2
+
3
+ require "rails/all"
4
+
5
+ Bundler.require(*Rails.groups)
6
+ require "acts_as_tenant"
7
+
8
+ module Dummy
9
+ class Application < Rails::Application
10
+ # Settings in config/environments/* take precedence over those specified here.
11
+ # Application configuration can go into files in config/initializers
12
+ # -- all .rb files in that directory are automatically loaded after loading
13
+ # the framework and any gems in your application.
14
+
15
+ if Rails.gem_version < Gem::Version.new("6.0") && config.active_record.sqlite3
16
+ config.active_record.sqlite3.represent_boolean_as_integer = true
17
+ end
18
+ end
19
+ end
@@ -0,0 +1,5 @@
1
+ # Set up gems listed in the Gemfile.
2
+ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile", __dir__)
3
+
4
+ require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
5
+ $LOAD_PATH.unshift File.expand_path("../../../lib", __dir__)
@@ -0,0 +1,10 @@
1
+ development:
2
+ adapter: async
3
+
4
+ test:
5
+ adapter: test
6
+
7
+ production:
8
+ adapter: redis
9
+ url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
10
+ channel_prefix: dummy_production