db-charmer 1.8.4 → 1.9.0

data/lib/db_charmer/sharding/stub_connection.rb

@@ -37,6 +37,12 @@ module DbCharmer
         @real_conn = ::ActiveRecord::Base.coerce_to_connection_proxy(conn, DbCharmer.connections_should_exist?)
       end
 
+      def respond_to?(method_name, include_all = false)
+        return true if super
+        return false if real_connection.object_id == self.object_id
+        real_connection.respond_to?(method_name, include_all)
+      end
+
       def method_missing(meth, *args, &block)
         # Fail on database statements
         if ::ActiveRecord::ConnectionAdapters::DatabaseStatements.instance_methods.member?(meth.to_s)

data/lib/db_charmer/version.rb

@@ -1,8 +1,8 @@
 module DbCharmer
   module Version
     MAJOR = 1
-    MINOR = 8
-    PATCH = 4
+    MINOR = 9
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/lib/db_charmer/with_remapped_databases.rb

@@ -0,0 +1,49 @@
+module DbCharmer
+  def self.with_remapped_databases(mappings, &proc)
+    old_mappings = ::ActiveRecord::Base.db_charmer_database_remappings
+    begin
+      ::ActiveRecord::Base.db_charmer_database_remappings = mappings
+      if mappings[:master] || mappings['master']
+        with_all_hijacked(&proc)
+      else
+        proc.call
+      end
+    ensure
+      ::ActiveRecord::Base.db_charmer_database_remappings = old_mappings
+    end
+  end
+
+  def self.hijack_new_classes?
+    !! Thread.current[:db_charmer_hijack_new_classes]
+  end
+
+private
+
+  def self.with_all_hijacked
+    old_hijack_new_classes = Thread.current[:db_charmer_hijack_new_classes]
+    begin
+      Thread.current[:db_charmer_hijack_new_classes] = true
+      subclasses_method = DbCharmer.rails3? ? :descendants : :subclasses
+      ::ActiveRecord::Base.send(subclasses_method).each do |subclass|
+        subclass.hijack_connection!
+      end
+      yield
+    ensure
+      Thread.current[:db_charmer_hijack_new_classes] = old_hijack_new_classes
+    end
+  end
+end
+
+#---------------------------------------------------------------------------------------------------
+# Hijack connection on all new AR classes when we're in a block with main AR connection remapped
+class ActiveRecord::Base
+  class << self
+    def inherited_with_hijacking(subclass)
+      out = inherited_without_hijacking(subclass)
+      hijack_connection! if DbCharmer.hijack_new_classes?
+      out
+    end
+
+    alias_method_chain :inherited, :hijacking
+  end
+end

data/lib/tasks/databases.rake

@@ -68,7 +68,11 @@ namespace :db_charmer do
 end
 
 def drop_core_and_sub_database(config)
-  drop_database(config)
+  begin
+    drop_database(config)
+  rescue
+    $stderr.puts "#{config['database']} not exists"
+  end  
   config.each_value do | sub_config |
     next unless sub_config.is_a?(Hash)
     next unless sub_config['database']

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: db-charmer
 version: !ruby/object:Gem::Version
-  version: 1.8.4
-  prerelease: 
+  version: 1.9.0
 platform: ruby
 authors:
 - Oleksiy Kovyrin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <=
+    - - <
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <=
+    - - <
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <=
+    - - <
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <=
+    - - <
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -133,6 +122,7 @@ files:
 - lib/db_charmer/sharding/stub_connection.rb
 - lib/db_charmer/sharding.rb
 - lib/db_charmer/version.rb
+- lib/db_charmer/with_remapped_databases.rb
 - lib/db_charmer.rb
 - lib/tasks/databases.rake
 - init.rb
@@ -141,28 +131,26 @@ files:
 - CHANGES
 homepage: http://dbcharmer.net
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord Connections Magic (slaves, multiple connections, etc)
 test_files: []
-has_rdoc: