glebpom-db-charmer 1.1.5 → 1.3.0

data/Rakefile

@@ -2,11 +2,11 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = 'db-charmer'
-    gemspec.summary = 'ActiveRecord Connections Magic'
+    gemspec.summary = 'ActiveRecord Connections Magic (qik.com version)'
     gemspec.description = 'ActiveRecord Connections Magic (slaves, multiple connections, etc)'
-    gemspec.email = 'alexey@kovyrin.net'
-    gemspec.homepage = 'http://github.com/kovyrin/db-charmer'
-    gemspec.authors = ['Alexey Kovyrin']
+    gemspec.email = 'gleb.pomykalov@qik.com'
+    gemspec.homepage = 'http://github.com/glebpom/db-charmer'
+    gemspec.authors = ['Alexey Kovyrin', 'Gleb Pomykalov']
 
     gemspec.add_dependency('rails', '>= 2.2.0')
   end

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.3.0

data/db-charmer.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.1.5"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2009-09-18}
+  s.authors = ["Alexey Kovyrin", "Gleb Pomykalov"]
+  s.date = %q{2009-09-25}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
-  s.email = %q{alexey@kovyrin.net}
+  s.email = %q{gleb.pomykalov@qik.com}
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "db-charmer.gemspec",
      "init.rb",
      "lib/db_charmer.rb",
+     "lib/db_charmer/action_controller_extensions.rb",
      "lib/db_charmer/active_record_extensions.rb",
      "lib/db_charmer/association_proxy.rb",
      "lib/db_charmer/connection_factory.rb",
@@ -36,11 +37,11 @@ Gem::Specification.new do |s|
      "lib/db_charmer/multi_db_migrations.rb",
      "lib/db_charmer/multi_db_proxy.rb"
   ]
-  s.homepage = %q{http://github.com/kovyrin/db-charmer}
+  s.homepage = %q{http://github.com/glebpom/db-charmer}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{ActiveRecord Connections Magic}
+  s.summary = %q{ActiveRecord Connections Magic (qik.com version)}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/db_charmer/action_controller_extensions.rb

@@ -0,0 +1,40 @@
+module DbCharmer
+  module ActionControllerExtensions
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def force_master_db(*models)
+        models_array = case models
+          when String, Symbol
+            [models]
+          when Array
+            models
+          when nil
+            #use all models
+          else
+            raise ArgumentError, "You should specify correct list of models"
+        end.map { |m| m.to_s.camelize.constantize }
+
+        old_proxies = {}
+        append_around_filter do |c,a|
+          begin
+            models_array.each do |model|
+              model.db_charmer_connection_level += 1
+              old_proxies[model.object_id] = model.db_charmer_connection_proxy
+              model.switch_connection_to(nil, DbCharmer.migration_connections_should_exist?)
+            end
+            a.call
+          ensure
+            models_array.each do |model|
+              model.switch_connection_to(old_proxies[model.object_id], DbCharmer.migration_connections_should_exist?)
+              model.db_charmer_connection_level -= 1
+            end
+          end
+        end
+      end
+    end
+  end
+
+end

data/lib/db_charmer/finder_overrides.rb

@@ -27,7 +27,7 @@ module DbCharmer
     private
 
       def first_level_on_slave
-        if db_charmer_top_level_connection?
+        if db_charmer_top_level_connection? && on_master.connection.open_transactions.zero?
           on_slave { yield }
         else
           yield

data/lib/db_charmer.rb

@@ -56,3 +56,9 @@ ActiveRecord::Migration.extend(DbCharmer::MultiDbMigrations::ClassMethods)
 
 # Enable the magic
 ActiveRecord::Base.extend(DbCharmer::DbMagic::ClassMethods)
+
+#Extending ActionController
+puts "Extending ActionController..."
+require 'db_charmer/action_controller_extensions'
+ActionController::Base.send :include, DbCharmer::ActionControllerExtensions
+

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: glebpom-db-charmer
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
+  version: 1.3.0
 platform: ruby
 authors: 
 - Alexey Kovyrin
+- Gleb Pomykalov
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-09-18 00:00:00 -07:00
+date: 2009-09-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +24,7 @@ dependencies:
         version: 2.2.0
     version: 
 description: ActiveRecord Connections Magic (slaves, multiple connections, etc)
-email: alexey@kovyrin.net
+email: gleb.pomykalov@qik.com
 executables: []
 
 extensions: []
@@ -41,6 +42,7 @@ files:
 - db-charmer.gemspec
 - init.rb
 - lib/db_charmer.rb
+- lib/db_charmer/action_controller_extensions.rb
 - lib/db_charmer/active_record_extensions.rb
 - lib/db_charmer/association_proxy.rb
 - lib/db_charmer/connection_factory.rb
@@ -51,7 +53,7 @@ files:
 - lib/db_charmer/multi_db_migrations.rb
 - lib/db_charmer/multi_db_proxy.rb
 has_rdoc: false
-homepage: http://github.com/kovyrin/db-charmer
+homepage: http://github.com/glebpom/db-charmer
 licenses: 
 post_install_message: 
 rdoc_options: 
@@ -76,6 +78,6 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: ActiveRecord Connections Magic
+summary: ActiveRecord Connections Magic (qik.com version)
 test_files: []