connection_manager 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    connection_manager (0.1.3)
+    connection_manager (0.1.4)
       activerecord (~> 3.0)
 
 GEM

data/README.md

@@ -14,7 +14,7 @@ ConnectionManager is available through [Rubygems](https://rubygems.org/gems/conn
 
     $ gem install connection_manager
 
-## Rails 3 setup (Rails 2 untested at this time please let me know if it works for you )
+## Rails 3 setup (No Rails 2 at this time)
 
 ConnectionManager assumes the primary connection for the model is the master. For standard
 models using the default connection this means the main Rails database connection is the master.

data/lib/connection_manager/connection_manager_railtie.rb

@@ -1,9 +1,7 @@
 module ConnectionManager
   class ConnectionManagerRailtie < ::Rails::Railtie
-    initializer "connection_manager.setup" do |app|
-      
+    initializer "connection_manager.setup" do |app|    
       ConnectionManager::Connections.initialize  
-      require 'connection_manager/connections' 
     end
   end
 end

data/lib/connection_manager/connections.rb

@@ -15,10 +15,12 @@ module ConnectionManager
         @env = env
       end
     
-      # Get the current Rails environment if defined
-      # TODO add sinatra
+      # Get the current environment if defined
+      # Check for Rails, check for RACK_ENV, fail back to 'development'
       def fetch_env
-        Rails.env if defined?(Rails)
+        return Rails.env if defined?(Rails)
+        return RACK_ENV if defined?(RACK_ENV)
+        "development"
       end
     
       # Grab only thoses connections that correspond to the current env. If env
@@ -92,18 +94,14 @@ module ConnectionManager
           send("#{k.to_s}=",v)
         end     
         connection_keys.each do |connection|
-          #puts ActiveRecord::Base.configurations["test"]
           new_connection = connection_class_name(connection)  
-          #puts ActiveRecord::Base.configurations["test"]
           add_replication_connection(connection,new_connection)
-          #puts ActiveRecord::Base.configurations["test"]
           build_connection_class(new_connection,connection) 
-          #puts ActiveRecord::Base.configurations["test"]
         end
         all
       end 
     
-      # Addes a conneciton subclass to AvailableConnections using the supplied
+      # Addes a conneciton subclass to Connections using the supplied
       # class name and connection key from database.yml
       def build_connection_class(class_name,connection_key)
         class_eval <<-STR, __FILE__, __LINE__

data/lib/connection_manager/replication_builder.rb

@@ -86,7 +86,10 @@ module ConnectionManager
       class #{class_name} < self
         #{build_replication_associations(class_name)}
         class << self
-          delegate :connection, :to => Connections::#{connection_name}
+          def connection
+            Connections::#{connection_name}.connection
+          end
+
           def model_name
             ActiveModel::Name.new(#{name})
           end

data/lib/connection_manager/version.rb

@@ -1,4 +1,4 @@
 module ConnectionManager
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
 end
 

data/spec/helpers/models_spec_helper.rb

@@ -23,4 +23,3 @@ class Region < ActiveRecord::Base
   has_one :fruit
   #replicated
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: connection_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-04 00:00:00.000000000Z
+date: 2011-12-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70146570412280 !ruby/object:Gem::Requirement
+  requirement: &70145637967540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70146570412280
+  version_requirements: *70145637967540
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70146570411860 !ruby/object:Gem::Requirement
+  requirement: &70145637967120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146570411860
+  version_requirements: *70145637967120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70146570411400 !ruby/object:Gem::Requirement
+  requirement: &70145637966660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146570411400
+  version_requirements: *70145637966660
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70146570410980 !ruby/object:Gem::Requirement
+  requirement: &70145637966240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146570410980
+  version_requirements: *70145637966240
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70146570410560 !ruby/object:Gem::Requirement
+  requirement: &70145637965820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146570410560
+  version_requirements: *70145637965820
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70146570410140 !ruby/object:Gem::Requirement
+  requirement: &70145637965400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146570410140
+  version_requirements: *70145637965400
 description: Simplifies connecting to Muliple and Replication databases with rails
   and active_record
 email: