dynashard 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/dynashard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynashard}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Hengeveld"]
-  s.date = %q{2011-02-14}
+  s.date = %q{2011-02-17}
   s.description = %q{Dynashard allows you to shard your ActiveRecord models.  Models can be configured to shard based on context that can be defined dynamically.}
   s.email = %q{nickh@verticalresponse.com}
   s.extra_rdoc_files = [

data/lib/dynashard/connection_handler.rb

@@ -3,7 +3,7 @@ module Dynashard
     def self.included(base)
       base.alias_method_chain :retrieve_connection_pool, :dynashard
     end
-    
+
     # Set an connection pool entry for the model class pointing at
     # the shard class's pool.
     # :nodoc:
@@ -14,27 +14,12 @@ module Dynashard
       @connection_pools[model_class] = @connection_pools[shard_class]
     end
 
-    # Return a connection pool for the specified class.  If sharding
-    # is enabled, the correct pool for the configured sharding context
-    # will be used.
-    #
-    # :nodoc:
-    # Reflection classes generated for an association proxy will
-    # respond to :dynashard_klass and return a class with an
-    # established connection to the correct shard.
-    #
-    # Sharded models will have a dynashard context defined, which
-    # can be used as a key to the Dynashard.shard_context hash to
-    # access the shard's connection specification.
+    # Return a connection pool for the specified class.  If the class
+    # is a Dynashard generated model subclass, return the connection
+    # for its shard class.
     def retrieve_connection_pool_with_dynashard(klass)
       if klass.respond_to?(:dynashard_klass)
         retrieve_connection_pool_without_dynashard(klass.dynashard_klass)
-      elsif klass.sharding_enabled?
-        spec = Dynashard.shard_context[klass.dynashard_context]
-        raise "Missing #{klass.dynashard_context} shard context for #{klass.name}" if spec.nil?
-        spec = spec.call if spec.respond_to?(:call)
-        shard_klass = Dynashard.class_for(spec)
-        retrieve_connection_pool_without_dynashard(shard_klass)
       else
         retrieve_connection_pool_without_dynashard(klass)
       end

data/lib/dynashard/model.rb

@@ -8,6 +8,7 @@ module Dynashard
         alias_method_chain :instantiate, :dynashard
         alias_method_chain :create,      :dynashard
         alias_method_chain :arel_engine, :dynashard
+        alias_method_chain :connection,  :dynashard
       end
     end
 
@@ -124,6 +125,19 @@ module Dynashard
           create_without_dynashard(attributes, &block)
         end
       end
+
+      # For sharded models, return the shard class's connection
+      #
+      #   > conn = Dynashard.with_context(:owner => 'shard1'){ShardedModel.connection}
+      #   > conn == Dynashard::Shard0.connection
+      #   => true
+      def connection_with_dynashard
+        if sharding_enabled?
+          dynashard_sharded_subclass.connection
+        else
+          connection_without_dynashard
+        end
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynashard
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Nick Hengeveld
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -08:00
+date: 2011-02-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency