db-charmer 1.6.19 → 1.7.0.pre1

data/lib/db_charmer/active_record/sharding.rb

@@ -0,0 +1,40 @@
+module DbCharmer
+  module ActiveRecord
+    module Sharding
+
+      def self.extended(model)
+        model.cattr_accessor(:sharded_connection)
+      end
+
+      def shard_for(key, proxy_target = nil, &block)
+        raise ArgumentError, "No sharded connection configured!" unless sharded_connection
+        conn = sharded_connection.sharder.shard_for_key(key)
+        on_db(conn, proxy_target, &block)
+      end
+
+      # Run on default shard (if supported by the sharding method)
+      def on_default_shard(proxy_target = nil, &block)
+        raise ArgumentError, "No sharded connection configured!" unless sharded_connection
+
+        if sharded_connection.support_default_shard?
+          shard_for(:default, proxy_target, &block)
+        else
+          raise ArgumentError, "This model's sharding method does not support default shard"
+        end
+      end
+
+      # Enumerate shards
+      def on_each_shard(proxy_target = nil, &block)
+        raise ArgumentError, "No sharded connection configured!" unless sharded_connection
+
+        conns = sharded_connection.shard_connections
+        raise ArgumentError, "This model's sharding method does not support shards enumeration" unless conns
+
+        conns.each do |conn|
+          on_db(conn, proxy_target, &block)
+        end
+      end
+
+    end
+  end
+end

data/lib/db_charmer/connection_factory.rb

@@ -62,7 +62,7 @@ module DbCharmer
 
     def self.generate_empty_abstract_ar_class(klass)
       # Define class
-      module_eval "class #{klass} < ActiveRecord::Base; self.abstract_class = true; end"
+      module_eval "class #{klass} < ::ActiveRecord::Base; self.abstract_class = true; end"
 
       # Return class
       klass.constantize

data/lib/db_charmer/core_extensions.rb

@@ -4,6 +4,16 @@ class Object
       send(method, *options, &block)
     end
   end
+
+  # These methods are added to all objects so we could call proxy? on anything
+  # and figure if an object is a proxy w/o hitting method_missing or respond_to?
+  def self.proxy?
+    false
+  end
+
+  def proxy?
+    false
+  end
 end
 
 class NilClass

data/lib/db_charmer/force_slave_reads.rb

@@ -0,0 +1,36 @@
+module DbCharmer
+  @@current_controller = nil
+  mattr_accessor :current_controller
+
+  @@forced_slave_reads = false
+
+  def self.force_slave_reads?
+    # If global force slave reads is requested, do it
+    return @@forced_slave_reads if @@forced_slave_reads
+
+    # If not, try to use current controller to decide on this
+    return false unless current_controller.respond_to?(:force_slave_reads?)
+
+    slave_reads = current_controller.force_slave_reads?
+    logger.debug("Using controller to figure out if slave reads should be forced: #{slave_reads}")
+    return slave_reads
+  end
+
+  def self.with_controller(controller)
+    raise ArgumentError, "No block given" unless block_given?
+    logger.debug("Setting current controller for db_charmer: #{controller.class.name}")
+    self.current_controller = controller
+    yield
+  ensure
+    logger.debug('Clearing current controller for db_charmer')
+    self.current_controller = nil
+  end
+
+  def self.force_slave_reads
+    raise ArgumentError, "No block given" unless block_given?
+    @@forced_slave_reads = true
+    yield
+  ensure
+    @@forced_slave_reads = false
+  end
+end

data/lib/db_charmer/sharding.rb

@@ -1,41 +1,5 @@
 module DbCharmer
   module Sharding
-    module ClassMethods
-      def self.extended(model)
-        model.cattr_accessor(:sharded_connection)
-      end
-
-      def shard_for(key, proxy_target = nil, &block)
-        raise ArgumentError, "No sharded connection configured!" unless sharded_connection
-        conn = sharded_connection.sharder.shard_for_key(key)
-        on_db(conn, proxy_target, &block)
-      end
-
-      # Run on default shard (if supported by the sharding method)
-      def on_default_shard(proxy_target = nil, &block)
-        raise ArgumentError, "No sharded connection configured!" unless sharded_connection
-
-        if sharded_connection.support_default_shard?
-          shard_for(:default, proxy_target, &block)
-        else
-          raise ArgumentError, "This model's sharding method does not support default shard"
-        end
-      end
-
-      # Enumerate shards
-      def on_each_shard(proxy_target = nil, &block)
-        raise ArgumentError, "No sharded connection configured!" unless sharded_connection
-
-        conns = sharded_connection.shard_connections
-        raise ArgumentError, "This model's sharding method does not support shards enumeration" unless conns
-
-        conns.each do |conn|
-          on_db(conn, proxy_target, &block)
-        end
-      end
-    end
-
-    #-------------------------------------------------------------
     @@sharded_connections = {}
 
     def self.register_connection(config)

data/lib/db_charmer/sharding/method/db_block_group_map.rb

@@ -10,7 +10,7 @@ module DbCharmer
     module Method
       class DbBlockGroupMap
         # Shard connection info model
-        class Shard < ActiveRecord::Base
+        class Shard < ::ActiveRecord::Base
           validates_presence_of :db_host
           validates_presence_of :db_port
           validates_presence_of :db_user
@@ -21,7 +21,7 @@ module DbCharmer
         end
 
         # Table group info model
-        class Group < ActiveRecord::Base
+        class Group < ::ActiveRecord::Base
           validates_presence_of :shard_id
           belongs_to :shard, :class_name => 'DbCharmer::Sharding::Method::DbBlockGroupMap::Shard'
         end
@@ -241,7 +241,7 @@ module DbCharmer
         def shard_connections
           # Find all groups
           prepare_shard_models
-          groups = Group.all(:conditions => { :enabled => true })
+          groups = Group.all(:conditions => { :enabled => true }, :include => :shard)
           # Map them to shards
           groups.map { |group| shard_connection_config(group.shard, group.id) }
         end

data/lib/db_charmer/sharding/method/db_block_map.rb

@@ -42,7 +42,7 @@ module DbCharmer
           begin
             # Auto-allocate new blocks
             block ||= allocate_new_block_for_key(key)
-          rescue ActiveRecord::StatementInvalid => e
+          rescue ::ActiveRecord::StatementInvalid => e
             raise unless e.message.include?('Duplicate entry')
             block = block_for_key(key)
           end
@@ -58,7 +58,7 @@ module DbCharmer
           shard_connection_config(shard_info)
         end
 
-        class ShardInfo < ActiveRecord::Base
+        class ShardInfo < ::ActiveRecord::Base
           validates_presence_of :db_host
           validates_presence_of :db_port
           validates_presence_of :db_user
@@ -82,7 +82,7 @@ module DbCharmer
             sql = "SELECT * FROM #{map_table} WHERE start_id = #{key_range.first} AND end_id = #{key_range.last} LIMIT 1"
             connection.select_one(sql, 'Find a shard block')
           end
-          
+
           set_cached_block(block_cache_key, block)
 
           return block

data/lib/db_charmer/sharding/stub_connection.rb

@@ -30,18 +30,18 @@ module DbCharmer
 
         # Get connection proxy for our real connection
         return nil unless conn
-        @real_conn = ActiveRecord::Base.coerce_to_connection_proxy(conn, DbCharmer.connections_should_exist?)
+        @real_conn = ::ActiveRecord::Base.coerce_to_connection_proxy(conn, DbCharmer.connections_should_exist?)
       end
 
       def method_missing(meth, *args, &block)
         # Fail on database statements
-        if ActiveRecord::ConnectionAdapters::DatabaseStatements.instance_methods.member?(meth.to_s)
-          raise ActiveRecord::ConnectionNotEstablished, "You have to switch connection on your model before using it!"
+        if ::ActiveRecord::ConnectionAdapters::DatabaseStatements.instance_methods.member?(meth.to_s)
+          raise ::ActiveRecord::ConnectionNotEstablished, "You have to switch connection on your model before using it!"
         end
 
         # Fail if no connection has been established yet
         unless real_connection
-          raise ActiveRecord::ConnectionNotEstablished, "No real connection to proxy this method to!"
+          raise ::ActiveRecord::ConnectionNotEstablished, "No real connection to proxy this method to!"
         end
 
         # Proxy the call to our real connection target

data/lib/db_charmer/version.rb

@@ -0,0 +1,10 @@
+module DbCharmer
+  module Version
+    MAJOR = 1
+    MINOR = 7
+    PATCH = 0
+    BUILD = 'pre1'
+
+    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
+  end
+end

data/lib/tasks/databases.rake

@@ -2,7 +2,7 @@ namespace :db_charmer do
   namespace :create do
     desc 'Create all the local databases defined in config/database.yml'
     task :all => "db:load_config" do
-      ActiveRecord::Base.configurations.each_value do |config|
+      ::ActiveRecord::Base.configurations.each_value do |config|
         # Skip entries that don't have a database key, such as the first entry here:
         #
         #  defaults: &defaults
@@ -25,7 +25,7 @@ namespace :db_charmer do
   task :create => "db:load_config" do
     create_core_and_sub_database(ActiveRecord::Base.configurations[RAILS_ENV])
   end
-  
+
   def create_core_and_sub_database(config)
     create_database(config)
     config.each_value do | sub_config |
@@ -34,11 +34,11 @@ namespace :db_charmer do
       create_database(sub_config)
     end
   end
-  
+
   namespace :drop do
     desc 'Drops all the local databases defined in config/database.yml'
     task :all => "db:load_config" do
-      ActiveRecord::Base.configurations.each_value do |config|
+      ::ActiveRecord::Base.configurations.each_value do |config|
         # Skip entries that don't have a database key
         next unless config['database']
         # Only connect to local databases
@@ -49,14 +49,14 @@ namespace :db_charmer do
 
   desc 'Drops the database for the current RAILS_ENV'
   task :drop => "db:load_config" do
-    config = ActiveRecord::Base.configurations[RAILS_ENV || 'development']
+    config = ::ActiveRecord::Base.configurations[RAILS_ENV || 'development']
     begin
       drop_core_and_sub_database(config)
     rescue Exception => e
       puts "Couldn't drop #{config['database']} : #{e.inspect}"
     end
   end
-  
+
 
   def local_database?(config, &block)
     if %w( 127.0.0.1 localhost ).include?(config['host']) || config['host'].blank?

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: db-charmer
 version: !ruby/object:Gem::Version 
-  hash: 41
-  prerelease: false
+  hash: 1923832059
+  prerelease: 6
   segments: 
   - 1
-  - 6
-  - 19
-  version: 1.6.19
+  - 7
+  - 0
+  - pre
+  - 1
+  version: 1.7.0.pre1
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -04:00
+date: 2011-05-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,22 +65,24 @@ files:
 - Makefile
 - README.rdoc
 - Rakefile
-- VERSION
 - db-charmer.gemspec
 - init.rb
 - lib/db_charmer.rb
-- lib/db_charmer/abstract_adapter_extensions.rb
-- lib/db_charmer/active_record_extensions.rb
-- lib/db_charmer/association_preload.rb
+- lib/db_charmer/abstract_adapter/log_formatting.rb
+- lib/db_charmer/action_controller/force_slave_reads.rb
+- lib/db_charmer/active_record/association_preload.rb
+- lib/db_charmer/active_record/class_attributes.rb
+- lib/db_charmer/active_record/connection_switching.rb
+- lib/db_charmer/active_record/db_magic.rb
+- lib/db_charmer/active_record/finder_overrides.rb
+- lib/db_charmer/active_record/migration/multi_db_migrations.rb
+- lib/db_charmer/active_record/multi_db_proxy.rb
+- lib/db_charmer/active_record/named_scope/scope_proxy.rb
+- lib/db_charmer/active_record/sharding.rb
 - lib/db_charmer/connection_factory.rb
 - lib/db_charmer/connection_proxy.rb
-- lib/db_charmer/connection_switch.rb
 - lib/db_charmer/core_extensions.rb
-- lib/db_charmer/db_magic.rb
-- lib/db_charmer/finder_overrides.rb
-- lib/db_charmer/multi_db_migrations.rb
-- lib/db_charmer/multi_db_proxy.rb
-- lib/db_charmer/scope_proxy.rb
+- lib/db_charmer/force_slave_reads.rb
 - lib/db_charmer/sharding.rb
 - lib/db_charmer/sharding/connection.rb
 - lib/db_charmer/sharding/method/db_block_group_map.rb
@@ -86,6 +90,7 @@ files:
 - lib/db_charmer/sharding/method/hash_map.rb
 - lib/db_charmer/sharding/method/range.rb
 - lib/db_charmer/sharding/stub_connection.rb
+- lib/db_charmer/version.rb
 - lib/tasks/databases.rake
 has_rdoc: true
 homepage: http://github.com/kovyrin/db-charmer
@@ -108,16 +113,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: ActiveRecord Connections Magic

data/VERSION

@@ -1 +0,0 @@
-1.6.19

data/lib/db_charmer/connection_switch.rb

@@ -1,40 +0,0 @@
-module DbCharmer
-  module ConnectionSwitch
-    module ClassMethods
-      def coerce_to_connection_proxy(conn, should_exist = true)
-        return nil if conn.nil?
-
-        if conn.kind_of?(Symbol) || conn.kind_of?(String)
-          return DbCharmer::ConnectionFactory.connect(conn, should_exist)
-        end
-
-        if conn.kind_of?(Hash)
-          conn = conn.symbolize_keys
-          raise ArgumentError, "Missing required :connection_name parameter" unless conn[:connection_name]
-          return DbCharmer::ConnectionFactory.connect_to_db(conn[:connection_name], conn)
-        end
-
-        if conn.respond_to?(:db_charmer_connection_proxy)
-          return conn.db_charmer_connection_proxy
-        end
-
-        if conn.kind_of?(ActiveRecord::ConnectionAdapters::AbstractAdapter) || conn.kind_of?(DbCharmer::Sharding::StubConnection)
-          return conn
-        end
-
-        raise "Unsupported connection type: #{conn.class}"
-      end
-
-      def switch_connection_to(conn, require_config_to_exist = true)
-        new_conn = coerce_to_connection_proxy(conn, require_config_to_exist)
-
-        if db_charmer_connection_proxy.is_a?(DbCharmer::Sharding::StubConnection)
-          db_charmer_connection_proxy.set_real_connection(new_conn)
-        end
-
-        self.db_charmer_connection_proxy = new_conn
-        self.hijack_connection!
-      end
-    end
-  end
-end

data/lib/db_charmer/finder_overrides.rb

@@ -1,56 +0,0 @@
-module DbCharmer
-  module FinderOverrides
-    module ClassMethods
-      SLAVE_METHODS = [ :find_by_sql, :count_by_sql, :calculate ]
-      MASTER_METHODS = [ :update, :create, :delete, :destroy, :delete_all, :destroy_all, :update_all, :update_counters ]
-
-      SLAVE_METHODS.each do |slave_method|
-        class_eval <<-EOF, __FILE__, __LINE__ + 1
-          def #{slave_method}(*args, &block)
-            first_level_on_slave do
-              super(*args, &block)
-            end
-          end
-        EOF
-      end
-
-      MASTER_METHODS.each do |master_method|
-        class_eval <<-EOF, __FILE__, __LINE__ + 1
-          def #{master_method}(*args, &block)
-            on_master do
-              super(*args, &block)
-            end
-          end
-        EOF
-      end
-
-      def find(*args, &block)
-        options = args.last
-        if options.is_a?(Hash) && options[:lock]
-          on_master { super(*args, &block) }
-        else
-          super(*args, &block)
-        end
-      end
-
-    private
-
-      def first_level_on_slave
-        if db_charmer_top_level_connection? && on_master.connection.open_transactions.zero?
-          on_slave { yield }
-        else
-          yield
-        end
-      end
-
-    end
-
-    module InstanceMethods
-      def reload(*args, &block)
-        self.class.on_master do
-          super(*args, &block)
-        end
-      end
-    end
-  end
-end