activerecord-connections 0.0.2 → 0.0.3

data/README.markdown

@@ -1,4 +1,4 @@
-# ActiveRecord::Connections - Easy multiple databases for ActiveRecord
+# ActiveRecord::Connections
 
 ActiveRecord::Connections provides a new way to manage multi-tenant applications based on multiples databases.
 
@@ -47,7 +47,6 @@ If you are using Rails, you could use this way:
 
 ### Known issues
 
-* Do not work with multi-threads
 * Do not manage activerecord migrations for different databases
 * Similar objects of different connections do not differ
 * Coverage is not the best of the world (you could help easily)

data/activerecord-connections.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "activerecord-connections"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.authors     = ["Gabriel Sobrinho"]
   s.email       = ["gabriel.sobrinho@gmail.com"]
   s.homepage    = "https://github.com/sobrinho/activerecord-connections"

data/lib/active_record/connections.rb

@@ -1,65 +1,64 @@
 require 'active_support'
-require 'active_support/concern'
 
 module ActiveRecord
   module Connections
     autoload :ConnectionProxy, 'active_record/connections/connection_proxy'
 
-    extend ActiveSupport::Concern
+    # Using on ApplicationController:
+    #
+    #   class ApplicationController < ActionController::Base
+    #     before_filter :handle_customer
+    #
+    #     protected
+    #
+    #     def handle_customer(&block)
+    #       customer = Customer.find_by_domain!(request.domain)
+    #       ActiveRecord::Base.using_connection(customer.id, customer.connection_spec, &block)
+    #     end
+    #   end
+    #
+    # Using directly on models:
+    #
+    #   customer = Customer.first
+    #
+    #   ActiveRecord::Base.using_connection(customer.id, customer.connection_spec) do
+    #     User.count # => 3
+    #   end
+    #
+    def using_connection(connection_name, connection_spec)
+      self.proxy_connection = ConnectionProxy.new(connection_name, connection_spec)
 
-    included do
-      cattr_accessor :proxy_connection
-    end
+      def self.connection_pool
+        connection_handler.retrieve_connection_pool(proxy_connection)
+      end
 
-    module ClassMethods
-      # Using on ApplicationController:
-      #
-      #   class ApplicationController < ActionController::Base
-      #     before_filter :handle_customer
-      #
-      #     protected
-      #
-      #     def handle_customer(&block)
-      #       customer = Customer.find_by_domain!(request.domain)
-      #       ActiveRecord::Base.using_connection(customer.id, customer.connection_spec, &block)
-      #     end
-      #   end
-      #
-      # Using directly on models:
-      #
-      #   customer = Customer.first
-      #
-      #   ActiveRecord::Base.using_connection(customer.id, customer.connection_spec) do
-      #     User.count # => 3
-      #   end
-      #
-      def using_connection(connection_name, connection_spec)
-        self.proxy_connection = ConnectionProxy.new(connection_name, connection_spec)
+      def self.retrieve_connection
+        connection_handler.retrieve_connection(proxy_connection)
+      end
 
-        def self.connection_pool
-          connection_handler.retrieve_connection_pool(proxy_connection)
-        end
+      yield
+    ensure
+      self.proxy_connection = nil
 
-        def self.retrieve_connection
-          connection_handler.retrieve_connection(proxy_connection)
-        end
+      def self.connection_pool
+        connection_handler.retrieve_connection_pool(self)
+      end
 
-        yield
-      ensure
-        self.proxy_connection = nil
+      def self.retrieve_connection
+        connection_handler.retrieve_connection(self)
+      end
+    end
 
-        def self.connection_pool
-          connection_handler.retrieve_connection_pool(self)
-        end
+    def proxy_connection
+      Thread.current["ActiveRecord::Connections.proxy_connection"]
+    end
 
-        def self.retrieve_connection
-          connection_handler.retrieve_connection(self)
-        end
-      end
+    def proxy_connection=(proxy_connection)
+      Thread.current["ActiveRecord::Connections.proxy_connection"] = proxy_connection
     end
   end
 end
 
 ActiveSupport.on_load(:active_record) do
-  include ActiveRecord::Connections
+  extend ActiveRecord::Connections
 end

data/test/active_record/connections_test.rb

@@ -66,6 +66,14 @@ class ActiveRecord::ConnectionsTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_proxy_connection
+    Thread.new do
+      ActiveRecord::Base.proxy_connection = 'proxy connection from another thread'
+    end.join
+
+    assert_nil ActiveRecord::Base.proxy_connection
+  end
+
   protected
 
   def each_customer(&block)

metadata

@@ -1,94 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activerecord-connections
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Gabriel Sobrinho
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-24 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70157427173000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70157427173000
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70157427172480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70157427172480
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70157427171940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70157427171940
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70157427171400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: minitest-colorize
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70157427171400
+- !ruby/object:Gem::Dependency
+  name: minitest-colorize
+  requirement: &70157427170660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.4
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70157427170660
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70157427169760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.4
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70157427169760
 description: A new way to manage multi-tenant applications based on multiples databases
-email: 
+email:
 - gabriel.sobrinho@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -104,35 +99,31 @@ files:
 - test/support/contact.rb
 - test/support/customer.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/sobrinho/activerecord-connections
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A new way to manage multi-tenant applications based on multiples databases
-test_files: 
+test_files:
 - test/active_record/connections_test.rb
 - test/db/migrate/20110822114329_create_customers.rb
 - test/db/migrate/20110822114413_create_contacts.rb