active_shard 0.2.0 → 0.2.1

data/README.md

@@ -3,43 +3,6 @@ ActiveShard - Multi-schema sharding for ActiveRecord
 
 ActiveShard is a library built primarily for sharding in ActiveRecord. It also supports multiple databases with differing schemas. As with the other sharding libraries for ActiveRecord (there are a few), this library represents the best solution to the authors' sharding needs. If you've been unhappy with other options, ActiveShard might be for you.
 
-
-## CAVEATS ##
-
-### Railtie isn't finished ... ###
-
-... so there are some additional steps you'll need to take to get this working. Specifically:
-
-Add the following to the end of your config/application.rb:
-
-    ActiveShard.config do |c|
-      definitions = ActiveShard::ShardDefinition.from_yaml_file( File.expand_path( '../shards.yml', __FILE__ ) )
-
-      definitions[ Rails.env.to_sym ].each do |shard|
-        c.add_shard( shard )
-      end
-    end
-
-    require 'active_shard/active_record'
-
-    ActiveRecord::Base.send( :include, ActiveShard::ActiveRecord::ShardSupport )
-
-    ActiveRecord::Base.connection_handler =
-      ActiveShard::ActiveRecord::ConnectionHandler.new(
-        ActiveShard.config.shard_definitions,
-        :shard_lookup => ActiveShard::ShardLookupHandler.new( :scope => ActiveShard.scope, :config => ActiveShard.config )
-      )
-    
-Once we complete the ActiveShard Railtie, these lines will not be necessary.
-
-
-### Where are the specs? ###
-
-Good eye. This library is being extracted from an existing project where application-specific tests were written to test the sharding functionality.
-
-Generic and more detailed specs are being written and will be added shortly.
-
-
 ## Design goals ##
 
 The fundamental purpose of ActiveShard is to provide a framework that allows ActiveRecord to connect to multiple databases with multiple different schemas. All other features are a subset of this framework (sharding, replication, etc).
@@ -74,7 +37,7 @@ Install bundle:
     
 Add to config/application.rb, right under "require 'rails/all'":
 
-    require 'active_shard/active_record/railtie'
+    require 'active_shard/railtie'
 
 
 ## Most common usage ##

data/lib/active_shard.rb

@@ -146,16 +146,18 @@ module ActiveShard
     # @return the return value from the provided block
     #
     def with( scopes={}, &block )
-      ret = nil
+      ret     = nil
+      memento = nil
 
       begin
-        activate_shards( scopes )
+        memento = activate_shards( scopes )
 
         ret = block.call()
       ensure
-        pop_to( scopes )
-        ret
+        pop_to( memento )
       end
+
+      ret
     end
 
     # Pushes active shards onto the scope without a block.

data/lib/active_shard/active_record/connection_handler.rb

@@ -12,7 +12,6 @@ module ActiveShard
 
       # Initializes a new ConnectionHandler
       #
-      # @param [Array<ShardDefinition>] shard_definitions
       # @param [Hash] options
       # @option options [ShardLookupHandler, #lookup_active_shard] :shard_lookup
       #
@@ -20,7 +19,7 @@ module ActiveShard
         @shard_lookup = options[ :shard_lookup ]
 
         @shard_definitions = []
-        @connection_pools = {}
+        @connection_pools = ConnectionPoolHash.new( self )
         @schema_pools     = {}
       end
 
@@ -118,9 +117,41 @@ module ActiveShard
           schema_name = definition.nil? ? args.shift : definition.schema
           shard_name  = definition.nil? ? args.shift : definition.name
 
-          "#{schema_name.to_s}+#{shard_name.to_s}".to_sym
+          PoolKey.new( schema_name, shard_name )
         end
 
+        class PoolKey
+          attr_reader :schema, :shard
+          
+          def initialize( schema, shard )
+            @schema = schema.nil? ? nil : schema.to_sym
+            @shard  = shard.nil? ? nil : shard.to_sym
+          end
+
+          def hash
+            [self.schema, self.shard].hash
+          end
+
+          def eql?(other)
+            (self.schema == other.schema &&
+              self.shard  == other.shard)
+          end
+        end
+
+        class ConnectionPoolHash < Hash
+          def initialize( connection_handler )
+            @connection_handler = connection_handler
+          end
+
+          def [](val)
+            case val
+            when PoolKey
+              super
+            else
+              @connection_handler.retrieve_connection_pool( val.constantize )
+            end
+          end
+        end
 
     end
   end

data/lib/active_shard/active_record/connection_specification_adapter.rb

@@ -17,6 +17,12 @@ module ActiveShard
         shard_definition.connection_spec
       end
 
+      ##### non-connection_spec related methods #####
+
+      def shard_name
+        shard_definition.name
+      end
+
       private
 
         attr_reader :shard_definition

data/lib/active_shard/scope.rb

@@ -33,8 +33,12 @@ module ActiveShard
     # eg: scope.push( :directory => :dir1, :user_data => :db1 )
     #
     # @param [Hash] active_shards
+    # @return [Scope::Memento] memento object to pass back to pop() to
+    #   revert scope state.
     #
     def push( active_shards )
+      previous_state_memento = to_memento()
+
       scope_crumbs << active_shards
 
       # shortcutting #build_current_shards for performance reasons
@@ -44,10 +48,11 @@ module ActiveShard
           current_shards[schema] = active_shards
         end
         current_shards[AnyShard] = active_shards
-
       else
         current_shards.merge!( normalize_keys( active_shards ) )
       end
+
+      previous_state_memento
     end
 
     # Remove the last scope from the stack
@@ -55,16 +60,14 @@ module ActiveShard
     # FIXME: Symbols (for AnySchema) may not roll back properly if multiple
     #        the same symbol is on the stack several times
     #
-    def pop( pop_until=nil )
-      if pop_until.nil?
+    def pop( memento=nil )
+      if memento.nil?
         scope_crumbs.pop
+
+        build_current_shards( scope_crumbs )
       else
-        (scope_crumbs.size - scope_crumbs.index(pop_until)).times do
-          scope_crumbs.pop
-        end
+        restore_from_memento!( memento )
       end
-
-      build_current_shards( scope_crumbs )
     end
 
     # Returns the name of the active shard by the provided schema name.
@@ -115,7 +118,25 @@ module ActiveShard
         ret
       end
 
+      def to_memento
+        Memento.new( scope_crumbs, current_shards )
+      end
+
+      def restore_from_memento!( memento )
+        @scope_crumbs   = memento.scope_crumbs
+        @current_shards = memento.current_shards
+      end
+
       class AnyShard; end
 
+      class Memento
+        attr_reader :scope_crumbs, :current_shards
+
+        def initialize( scope_crumbs, current_shards )
+          @scope_crumbs   = scope_crumbs.dup
+          @current_shards = current_shards.dup
+        end
+      end
+
   end
 end

data/lib/active_shard/version.rb

@@ -1,3 +1,3 @@
 module ActiveShard
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -2,7 +2,7 @@
 name: active_shard
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Brasten Sager
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 Z
+date: 2011-09-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport