apartment 0.26.1 → 1.0.0

data/lib/tasks/apartment.rake

@@ -35,7 +35,7 @@ apartment_namespace = namespace :apartment do
     tenants.each do |tenant|
       begin
         puts("Seeding #{tenant} tenant")
-        Apartment::Tenant.process(tenant) do
+        Apartment::Tenant.switch(tenant) do
           Apartment::Tenant.seed
         end
       rescue Apartment::TenantNotFound => e

data/spec/adapters/jdbc_mysql_adapter_spec.rb

@@ -11,7 +11,7 @@ if defined?(JRUBY_VERSION)
       ActiveRecord::Base.connection.execute("SELECT schema_name FROM information_schema.schemata").collect { |row| row['schema_name'] }
     end
 
-    let(:default_tenant) { subject.process { ActiveRecord::Base.connection.current_database } }
+    let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.current_database } }
 
     it_should_behave_like "a generic apartment adapter"
     it_should_behave_like "a connection based apartment adapter"

data/spec/adapters/jdbc_postgresql_adapter_spec.rb

@@ -16,7 +16,7 @@ if defined?(JRUBY_VERSION)
         ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect { |row| row['nspname'] }
       end
 
-      let(:default_tenant) { subject.process { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
+      let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
 
       it_should_behave_like "a generic apartment adapter"
       it_should_behave_like "a schema based apartment adapter"
@@ -31,7 +31,7 @@ if defined?(JRUBY_VERSION)
         connection.execute("select datname from pg_database;").collect { |row| row['datname'] }
       end
 
-      let(:default_tenant) { subject.process { ActiveRecord::Base.connection.current_database } }
+      let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.current_database } }
 
       it_should_behave_like "a generic apartment adapter"
       it_should_behave_like "a connection based apartment adapter"

data/spec/adapters/mysql2_adapter_spec.rb

@@ -10,7 +10,7 @@ describe Apartment::Adapters::Mysql2Adapter, database: :mysql do
       ActiveRecord::Base.connection.execute("SELECT schema_name FROM information_schema.schemata").collect { |row| row[0] }
     end
 
-    let(:default_tenant) { subject.process { ActiveRecord::Base.connection.current_database } }
+    let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.current_database } }
 
     context "using - the equivalent of - schemas" do
       before { Apartment.use_schemas = true }
@@ -18,7 +18,9 @@ describe Apartment::Adapters::Mysql2Adapter, database: :mysql do
       it_should_behave_like "a generic apartment adapter"
 
       describe "#default_tenant" do
-        its(:default_tenant){ should == config[:database] }
+        it "is set to the original db from config" do
+          expect(subject.default_tenant).to eq(config[:database])
+        end
       end
 
       describe "#init" do

data/spec/adapters/postgresql_adapter_spec.rb

@@ -15,7 +15,7 @@ describe Apartment::Adapters::PostgresqlAdapter, database: :postgresql do
         ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect { |row| row['nspname'] }
       end
 
-      let(:default_tenant) { subject.process { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
+      let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
 
       it_should_behave_like "a generic apartment adapter"
       it_should_behave_like "a schema based apartment adapter"
@@ -30,7 +30,7 @@ describe Apartment::Adapters::PostgresqlAdapter, database: :postgresql do
         ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect { |row| row['nspname'] }
       end
 
-      let(:default_tenant) { subject.process { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
+      let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
 
       it_should_behave_like "a generic apartment adapter"
       it_should_behave_like "a schema based apartment adapter"
@@ -51,7 +51,7 @@ describe Apartment::Adapters::PostgresqlAdapter, database: :postgresql do
         connection.execute("select datname from pg_database;").collect { |row| row['datname'] }
       end
 
-      let(:default_tenant) { subject.process { ActiveRecord::Base.connection.current_database } }
+      let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.current_database } }
 
       it_should_behave_like "a generic apartment adapter"
       it_should_behave_like "a connection based apartment adapter"

data/spec/adapters/sqlite3_adapter_spec.rb

@@ -13,7 +13,7 @@ describe Apartment::Adapters::Sqlite3Adapter, database: :sqlite do
       end
 
       let(:default_tenant) do
-        subject.process { File.basename(Apartment::Test.config['connections']['sqlite']['database'], '.sqlite3') }
+        subject.switch { File.basename(Apartment::Test.config['connections']['sqlite']['database'], '.sqlite3') }
       end
 
       it_should_behave_like "a generic apartment adapter"

data/spec/dummy_engine/.gitignore

@@ -0,0 +1,8 @@
+.bundle/
+log/*.log
+pkg/
+test/dummy/db/*.sqlite3
+test/dummy/db/*.sqlite3-journal
+test/dummy/log/*.log
+test/dummy/tmp/
+test/dummy/.sass-cache

data/spec/dummy_engine/Gemfile

@@ -0,0 +1,15 @@
+source "https://rubygems.org"
+
+# Declare your gem's dependencies in dummy_engine.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+
+# To use debugger
+# gem 'debugger'
+gem 'apartment', path: '../../'

data/spec/dummy_engine/Rakefile

@@ -0,0 +1,34 @@
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+require 'rdoc/task'
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'DummyEngine'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+
+
+
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+
+task default: :test

data/spec/dummy_engine/bin/rails

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/dummy_engine/engine', __FILE__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/spec/dummy_engine/config/initializers/apartment.rb

@@ -0,0 +1,51 @@
+# Require whichever elevator you're using below here...
+#
+# require 'apartment/elevators/generic'
+# require 'apartment/elevators/domain'
+require 'apartment/elevators/subdomain'
+
+#
+# Apartment Configuration
+#
+Apartment.configure do |config|
+
+  # These models will not be multi-tenanted,
+  # but remain in the global (public) namespace
+  #
+  # An example might be a Customer or Tenant model that stores each tenant information
+  # ex:
+  #
+  # config.excluded_models = %w{Tenant}
+  #
+  config.excluded_models = %w{}
+
+  # use postgres schemas?
+  config.use_schemas = true
+
+  # use raw SQL dumps for creating postgres schemas? (only appies with use_schemas set to true)
+  #config.use_sql = true
+
+  # configure persistent schemas (E.g. hstore )
+  # config.persistent_schemas = %w{ hstore }
+
+  # add the Rails environment to database names?
+  # config.prepend_environment = true
+  # config.append_environment = true
+
+  # supply list of database names for migrations to run on
+  # config.tenant_names = lambda{ ToDo_Tenant_Or_User_Model.pluck :database }
+
+  # Specify a connection other than ActiveRecord::Base for apartment to use (only needed if your models are using a different connection)
+  # config.connection_class = ActiveRecord::Base
+end
+
+##
+# Elevator Configuration
+
+# Rails.application.config.middleware.use 'Apartment::Elevators::Generic', lambda { |request|
+#   # TODO: supply generic implementation
+# }
+
+# Rails.application.config.middleware.use 'Apartment::Elevators::Domain'
+
+Rails.application.config.middleware.use 'Apartment::Elevators::Subdomain'

data/spec/dummy_engine/dummy_engine.gemspec

@@ -0,0 +1,24 @@
+$:.push File.expand_path("../lib", __FILE__)
+
+# Maintain your gem's version:
+require "dummy_engine/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name        = "dummy_engine"
+  s.version     = DummyEngine::VERSION
+  s.authors     = ["Your name"]
+  s.email       = ["Your email"]
+  s.homepage    = ""
+  s.summary     = "Summary of DummyEngine."
+  s.description = "Description of DummyEngine."
+  s.license     = "MIT"
+
+  s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
+  s.test_files = Dir["test/**/*"]
+
+  s.add_dependency "rails", "~> 4.1.6"
+  s.add_dependency "apartment"
+
+  s.add_development_dependency "sqlite3"
+end

data/spec/dummy_engine/lib/dummy_engine.rb

@@ -0,0 +1,4 @@
+require "dummy_engine/engine"
+
+module DummyEngine
+end

data/spec/dummy_engine/lib/dummy_engine/engine.rb

@@ -0,0 +1,4 @@
+module DummyEngine
+  class Engine < ::Rails::Engine
+  end
+end

data/spec/dummy_engine/lib/dummy_engine/version.rb

@@ -0,0 +1,3 @@
+module DummyEngine
+  VERSION = "0.0.1"
+end

data/spec/dummy_engine/test/dummy/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks

data/spec/dummy_engine/test/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Rails.application

data/spec/dummy_engine/test/dummy/config/application.rb

@@ -0,0 +1,22 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require(*Rails.groups)
+require "dummy_engine"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+  end
+end

data/spec/dummy_engine/test/dummy/config/boot.rb

@@ -0,0 +1,5 @@
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy_engine/test/dummy/config/database.yml

@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
+  adapter: sqlite3
+  pool: 5
+  timeout: 5000
+
+development:
+  <<: *default
+  database: db/development.sqlite3
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: db/test.sqlite3
+
+production:
+  <<: *default
+  database: db/production.sqlite3

data/spec/dummy_engine/test/dummy/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the Rails application.
+require File.expand_path('../application', __FILE__)
+
+# Initialize the Rails application.
+Rails.application.initialize!

data/spec/dummy_engine/test/dummy/config/environments/development.rb

@@ -0,0 +1,37 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end

data/spec/dummy_engine/test/dummy/config/environments/production.rb

@@ -0,0 +1,78 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this).
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
+
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+
+  # Generate digests for assets URLs.
+  config.assets.digest = true
+
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
+
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation cannot be found).
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation = :notify
+
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
+end