apartment 0.17.0 → 0.17.1

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 0.17.1
+  * Oct 30, 2012
+
+  - Fixed a bug where switching to an unknown db in mysql2 would crash the app [Frodotus]
+
 # 0.17.0
   * Sept 26, 2012
 

data/README.md

@@ -231,3 +231,7 @@ All jobs *must* stored in the global (public) namespace, so add it to the list o
 * Rake tasks (see the Rakefile) will help you setup your dbs necessary to run tests
 * Please issue pull requests to the `development` branch.  All development happens here, master is used for releases
 * Ensure that your code is accompanied with tests.  No code will be merged without tests
+
+## License
+
+Apartment is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/lib/apartment/adapters/mysql2_adapter.rb

@@ -22,6 +22,7 @@ module Apartment
       def connect_to_new(database)
         super
       rescue Mysql2::Error
+        Apartment::Database.reset
         raise DatabaseNotFound, "Cannot find database #{environmentify(database)}"
       end
     end

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.17.0"
+  VERSION = "0.17.1"
 end

data/lib/generators/apartment/install/USAGE

@@ -0,0 +1,5 @@
+Description:
+  Creates an initializer for apartment.
+
+Example:
+  `rails generate apartment:install`

data/lib/generators/apartment/install/install_generator.rb

@@ -0,0 +1,10 @@
+module Apartment
+  class InstallGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+
+    def copy_files
+      template "apartment.rb", File.join("config", "initializers", "apartment.rb")
+    end
+
+  end
+end

data/lib/generators/apartment/install/templates/apartment.rb

@@ -0,0 +1,35 @@
+##
+# Apartment Configuration
+Apartment.configure do |config|
+
+  # these models will not be multi-tenanted,
+  # but remain in the global (public) namespace
+  config.excluded_models = %w{
+    ActiveRecord::SessionStore::Session
+  }
+
+  # use postgres schemas?
+  config.use_postgres_schemas = 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
+  config.database_names = lambda{ ToDo_Tenant_Or_User_Model.scoped.collect(&:database) }
+
+end
+
+##
+# Elevator Configuration
+
+# Rails.application.config.middleware.use 'Apartment::Elevators::Domain'
+
+# Rails.application.config.middleware.use 'Apartment::Elevators::Subdomain'
+
+Rails.application.config.middleware.use 'Apartment::Elevators::Generic', Proc.new { |request|
+  # TODO: supply generic implementation
+}

data/spec/database_spec.rb

@@ -9,7 +9,7 @@ describe Apartment::Database do
     before do
       ActiveRecord::Base.establish_connection config
       Apartment::Test.load_schema   # load the Rails schema in the public db schema
-      subject.stub(:config).and_return config   # Use postgresql database config for this test
+      subject.stub(:config).and_return config   # Use mysql database config for this test
     end
 
     describe "#adapter" do
@@ -21,6 +21,27 @@ describe Apartment::Database do
         subject.adapter
         Apartment::Adapters::Mysql2Adapter.should be_a(Class)
       end
+    end
+
+    # TODO this doesn't belong here, but there aren't integration tests currently for mysql
+    # where to put???
+    describe "#exception recovery", :type => :request do
+      let(:database1){ Apartment::Test.next_db }
+
+      before do
+        subject.reload!
+        subject.create database1
+      end
+      after{ subject.drop database1 }
+
+      it "should recover from incorrect database" do
+        session = Capybara::Session.new(:rack_test, Capybara.app)
+        session.visit("http://#{database1}.com")
+        expect {
+          session.visit("http://this-database-should-not-exist.com")
+        }.to raise_error
+        session.visit("http://#{database1}.com")
+      end
 
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apartment
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -259,6 +259,9 @@ files:
 - lib/apartment/sidekiq/client/database_middleware.rb
 - lib/apartment/sidekiq/server/database_middleware.rb
 - lib/apartment/version.rb
+- lib/generators/apartment/install/USAGE
+- lib/generators/apartment/install/install_generator.rb
+- lib/generators/apartment/install/templates/apartment.rb
 - lib/tasks/apartment.rake
 - spec/adapters/mysql2_adapter_spec.rb
 - spec/adapters/postgresql_adapter_spec.rb
@@ -336,7 +339,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 345291853530360169
+      hash: -4170403971247658822
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -345,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 345291853530360169
+      hash: -4170403971247658822
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24