db-charmer 1.6.16 → 1.6.17

data/CHANGES

@@ -1,3 +1,10 @@
+1.6.15 (2011-04-25):
+
+Bugfixes: Do not touch database for sharded models until we really need to. Before 1.6.15
+if a database server was dead and there were any other connection issues, class loading
+in Ruby would be broken and sharded model class would not be initialized.
+
+----------------------------------------------------------------------------------------
 1.6.14 (2011-01-09):
 
 Bugfixes: We do not support Rails 3, and now we prohibit any versions but 2.2 and 2.3 from

data/VERSION

@@ -1 +1 @@
-1.6.16
+1.6.17

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.6.16"
+  s.version = "1.6.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2011-02-28}
+  s.date = %q{2011-04-25}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
      "lib/db_charmer/sharding/method/db_block_map.rb",
      "lib/db_charmer/sharding/method/hash_map.rb",
      "lib/db_charmer/sharding/method/range.rb",
-     "lib/db_charmer/stub_connection.rb",
+     "lib/db_charmer/sharding/stub_connection.rb",
      "lib/tasks/databases.rake"
   ]
   s.homepage = %q{http://github.com/kovyrin/db-charmer}

data/lib/db_charmer.rb

@@ -71,7 +71,6 @@ require 'db_charmer/core_extensions'
 require 'db_charmer/connection_factory'
 require 'db_charmer/connection_proxy'
 require 'db_charmer/connection_switch'
-require 'db_charmer/stub_connection'
 require 'db_charmer/scope_proxy'
 require 'db_charmer/multi_db_proxy'
 
@@ -121,6 +120,10 @@ require 'db_charmer/association_preload'
 require 'db_charmer/multi_db_migrations'
 require 'db_charmer/multi_db_proxy'
 
+require 'db_charmer/sharding'
+require 'db_charmer/sharding/connection'
+require 'db_charmer/sharding/stub_connection'
+
 # Enable multi-db migrations
 ActiveRecord::Migration.extend(DbCharmer::MultiDbMigrations)
 

data/lib/db_charmer/connection_switch.rb

@@ -18,7 +18,7 @@ module DbCharmer
           return conn.db_charmer_connection_proxy
         end
 
-        if conn.kind_of?(ActiveRecord::ConnectionAdapters::AbstractAdapter) || conn.kind_of?(DbCharmer::StubConnection)
+        if conn.kind_of?(ActiveRecord::ConnectionAdapters::AbstractAdapter) || conn.kind_of?(DbCharmer::Sharding::StubConnection)
           return conn
         end
 
@@ -28,7 +28,7 @@ module DbCharmer
       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::StubConnection)
+        if db_charmer_connection_proxy.is_a?(DbCharmer::Sharding::StubConnection)
           db_charmer_connection_proxy.set_real_connection(new_conn)
         end
 

data/lib/db_charmer/db_magic.rb

@@ -23,20 +23,6 @@ module DbCharmer
         if opt[:sharded]
           raise ArgumentError, "Can't use sharding on a model with slaves!" if opt[:slaves].any?
           setup_sharding_magic(opt[:sharded])
-
-          # If method supports shards enumeration, get the first shard
-          conns = sharded_connection.shard_connections || []
-          real_conn = conns.first
-
-          # If connection we do not have real connection yet, try to use the default one
-          real_conn ||= sharded_connection.sharder.shard_for_key(:default) if sharded_connection.support_default_shard?
-
-          # Create stub connection
-          real_conn = coerce_to_connection_proxy(real_conn, DbCharmer.connections_should_exist?) if real_conn
-          stub_conn = DbCharmer::StubConnection.new(real_conn)
-
-          # ... and set it as the default one for this model
-          setup_connection_magic(stub_conn)
         end
       end
 
@@ -52,9 +38,16 @@ module DbCharmer
       end
 
       def setup_sharding_magic(config)
+        # Add sharding-specific methods
         self.extend(DbCharmer::Sharding::ClassMethods)
+
+        # Get configuration
         name = config[:sharded_connection] or raise ArgumentError, "No :sharded_connection!"
+        # Assign sharded connection
         self.sharded_connection = DbCharmer::Sharding.sharded_connection(name)
+
+        # Setup model default connection
+        setup_connection_magic(sharded_connection.default_connection)
       end
 
       def setup_connection_magic(conn, should_exist = true)

data/lib/db_charmer/sharding/connection.rb

@@ -22,6 +22,10 @@ module DbCharmer
       def support_default_shard?
         sharder.respond_to?(:support_default_shard?) && sharder.support_default_shard?
       end
+      
+      def default_connection
+        @default_connection ||= DbCharmer::Sharding::StubConnection.new(self)
+      end
     end
   end
 end

data/lib/db_charmer/sharding/stub_connection.rb

@@ -0,0 +1,51 @@
+# This is a simple proxy class used as a default connection on sharded models
+#
+# The idea is to proxy all utility method calls to a real connection (set by
+# the +set_real_connection+ method when we switch shards) and fail on real
+# database querying calls forcing users to switch shard connections.
+#
+module DbCharmer
+  module Sharding
+    class StubConnection
+      attr_accessor :sharded_connection
+
+      def initialize(sharded_connection)
+        @sharded_connection = sharded_connection
+        @real_conn = nil
+      end
+
+      def set_real_connection(real_conn)
+        @real_conn = real_conn
+      end
+
+      def real_connection
+        # Return memoized real connection
+        return @real_conn if @real_conn
+
+        # If sharded connection supports shards enumeration, get the first shard
+        @real_conn = sharded_connection.shard_connections.try(:first)
+
+        # If we do not have real connection yet, try to use the default one (if it is supported by the sharder)
+        @real_conn ||= sharded_connection.sharder.shard_for_key(:default) if sharded_connection.support_default_shard?
+
+        # Get connection proxy for our real connection
+        @real_conn && coerce_to_connection_proxy(@real_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!"
+        end
+
+        # Fail if no connection has been established yet
+        unless @real_conn
+          raise ActiveRecord::ConnectionNotEstablished, "No real connection to proxy this method to!"
+        end
+
+        # Proxy the call to our real connection target
+        @real_conn.__send__(meth, *args, &block)
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: db-charmer
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: false
   segments: 
   - 1
   - 6
-  - 16
-  version: 1.6.16
+  - 17
+  version: 1.6.17
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -05:00
+date: 2011-04-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,7 +85,7 @@ files:
 - lib/db_charmer/sharding/method/db_block_map.rb
 - lib/db_charmer/sharding/method/hash_map.rb
 - lib/db_charmer/sharding/method/range.rb
-- lib/db_charmer/stub_connection.rb
+- lib/db_charmer/sharding/stub_connection.rb
 - lib/tasks/databases.rake
 has_rdoc: true
 homepage: http://github.com/kovyrin/db-charmer

data/lib/db_charmer/stub_connection.rb

@@ -1,32 +0,0 @@
-# This is a simple proxy class used as a default connection on sharded models
-#
-# The idea is to proxy all utility method calls to a real connection (set by
-# the +set_real_connection+ method when we switch shards) and fail on real
-# database querying calls forcing users to switch shard connections.
-#
-module DbCharmer
-  class StubConnection
-    def initialize(real_conn = nil)
-      @real_conn = real_conn
-    end
-
-    def set_real_connection(real_conn)
-      @real_conn = real_conn
-    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!"
-      end
-
-      # Fail if no connection has been established yet
-      unless @real_conn
-        raise  ActiveRecord::ConnectionNotEstablished, "No real connection to proxy this method to!"
-      end
-
-      # Proxy the call to our real connection target
-      @real_conn.__send__(meth, *args, &block)
-    end
-  end
-end