ar-octopus 0.2.1 → 0.2.2

data/README.mkdn

@@ -127,11 +127,12 @@ Sometimes, when a connection isn't used for much time, this will makes ActiveRec
 This will tell Octopus to verify the connection before sending the query.
 
 ## Mixing Octopus with the Rails multiple database model
-Octopus will respect if you declare some model to use a specific connection, with the rails syntax, like this example:
+If you want to set a custom connection to a specific model, use this syntax:
 
     #This class sets its own connection
+    # establish_connection will not work, use octopus_establish_connection instead.
     class CustomConnection < ActiveRecord::Base
-      establish_connection(:adapter => "mysql", :database => "octopus_shard2")
+      octopus_establish_connection(:adapter => "mysql", :database => "octopus_shard2")
     end
     
 ## Contributing with Octopus

data/Rakefile

@@ -37,7 +37,7 @@ begin
     gem.add_development_dependency "jeweler", ">= 1.4"
     gem.add_development_dependency "actionpack", ">= 2.3"
     gem.add_dependency('activerecord', '>= 2.3')
-    gem.version = "0.2.1"
+    gem.version = "0.2.2"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/ar-octopus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-octopus}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Pradi", "Mike Perham"]
-  s.date = %q{2010-10-31}
+  s.date = %q{2010-11-03}
   s.description = %q{This gem allows you to use sharded databases with ActiveRecord. this also provides a interface for replication and for running migrations with multiples shards.}
   s.email = %q{tchandy@gmail.com}
   s.extra_rdoc_files = [

data/lib/octopus/model.rb

@@ -85,6 +85,11 @@ module Octopus::Model
     def sharded_model()
       write_inheritable_attribute(:sharded, true)      
     end    
+    
+    def octopus_establish_connection(spec = nil)
+      write_inheritable_attribute(:establish_connection, true)      
+      establish_connection(spec)
+    end
   end
 end
 

data/spec/database_models.rb

@@ -21,7 +21,7 @@ end
 
 #This class sets its own connection
 class CustomConnection < ActiveRecord::Base
-  establish_connection(:adapter => "mysql", :database => "octopus_shard2", :username => "root", :password => "")
+  octopus_establish_connection(:adapter => "mysql", :database => "octopus_shard2", :username => "root", :password => "")
 end
 
 #This items belongs to a client

data/spec/octopus/model_spec.rb

@@ -173,8 +173,7 @@ describe Octopus::Model do
 
   describe "AR basic methods" do
     it "establish_connection" do
-      pending("TODO")
-      # CustomConnection.connection.current_database.should == "octopus_shard2" 
+      CustomConnection.connection.current_database.should == "octopus_shard2" 
     end
 
     it "increment" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 -02:00
+date: 2010-11-03 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency