ar-octopus 0.0.27 → 0.0.28

data/Rakefile

@@ -32,7 +32,7 @@ begin
     gem.add_development_dependency "pg", ">= 0.9.0"
     gem.add_development_dependency "sqlite3-ruby", ">= 1.3.1"
     gem.add_dependency('activerecord', '>= 2.3')
-    gem.version = "0.0.27"
+    gem.version = "0.0.28"
   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.0.27"
+  s.version = "0.0.28"
 
   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-07-23}
+  s.date = %q{2010-07-26}
   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.rb

@@ -50,7 +50,12 @@ module Octopus
   
   def self.using(shard, &block)
     ActiveRecord::Base.hijack_initializer()
-    ActiveRecord::Base.connection.run_queries_on_shard(shard, &block)
+
+    if ActiveRecord::Base.connection.is_a?(Octopus::Proxy)
+      ActiveRecord::Base.connection.run_queries_on_shard(shard, &block)
+    else
+      yield
+    end
   end  
 end
 

data/lib/octopus/model.rb

@@ -15,8 +15,8 @@ module Octopus::Model
 
       clean_table_name()
       hijack_initializer()
-        
-      self.connection.using_enabled = true
+
+      self.connection_proxy.using_enabled = true
 
       return Octopus::ScopeProxy.new(shard, self)
     end
@@ -27,10 +27,10 @@ module Octopus::Model
       before_save :reload_connection
 
       def set_current_shard
-        if new_record? || self.connection.block
-          self.current_shard = self.connection.current_shard    
+        if new_record? || self.class.connection_proxy.block
+          self.current_shard = self.class.connection_proxy.current_shard    
         else
-          self.current_shard = self.connection.last_current_shard  
+          self.current_shard = self.class.connection_proxy.last_current_shard  
         end
       end
 
@@ -46,14 +46,18 @@ module Octopus::Model
         Thread.current[:connection_proxy] ||= Octopus::Proxy.new(Octopus.config())
       end
 
-      def self.connection()
-        if defined?(::Rails) && Octopus.config() && !Octopus.enviroments.include?(Rails.env.to_s)
-          return super 
+      def self.connection_with_octopus()
+        if defined?(Rails) && Octopus.config() && !Octopus.enviroments.include?(Rails.env.to_s)
+          return connection_without_octopus() 
         end
 
         self.connection_proxy().current_model = self
         self.connection_proxy()
       end
+
+      class << self
+        alias_method_chain :connection, :octopus
+      end
     end
   end
 
@@ -65,7 +69,7 @@ module Octopus::Model
     end
 
     def reload_connection()
-      self.connection.current_shard = self.current_shard() if should_set_current_shard?
+      self.class.connection_proxy.current_shard = self.current_shard() if should_set_current_shard?
     end
   end
 

data/spec/octopus/proxy_spec.rb

@@ -65,28 +65,59 @@ describe Octopus::Proxy do
       Rails = mock()
       set_octopus_env("octopus_rails")
     end
-    
+
     it "should initialize correctly octopus common variables for the enviroments" do
       Rails.stub!(:env).and_return('staging')
       Octopus.instance_variable_set(:@rails_env, nil)
       Octopus.config()
-      
+
       proxy.instance_variable_get(:@replicated).should be_true
       Octopus.enviroments.should == ["staging", "production"] 
     end
-    
+
     it "should initialize correctly the shards for the staging enviroment" do
       Rails.stub!(:env).and_return('staging')
 
       proxy.instance_variable_get(:@shards).keys.to_set.should == Set.new([:slave1, :slave2, :master])
     end
-    
+
     it "should initialize correctly the shards for the production enviroment" do
       Rails.stub!(:env).and_return('production')
 
       proxy.instance_variable_get(:@shards).keys.to_set.should == Set.new([:slave3, :slave4, :master])
     end
-    
+
+    describe "using the master connection" do
+      before(:each) do
+        Rails.stub!(:env).and_return('development')        
+      end
+
+      it "should use the master connection" do
+        user = User.create!(:name =>"Thiago")
+        user.name = "New Thiago"
+        user.save()
+        User.find_by_name("New Thiago").should_not be_nil
+      end
+
+      it "should work when using using syntax" do
+        user = User.using(:russia).create!(:name =>"Thiago")
+
+        user.name = "New Thiago"
+        user.save()
+        
+        User.using(:russia).find_by_name("New Thiago").should == user
+        User.find_by_name("New Thiago").should == user    
+      end
+
+      it "should work when using blocks" do
+        Octopus.using(:russia) do
+          @user = User.create!(:name =>"Thiago")
+        end
+
+        User.find_by_name("Thiago").should == @user
+      end
+    end
+
     after(:each) do
       Object.send(:remove_const, :Rails)
       Octopus.instance_variable_set(:@config, nil)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 39
   prerelease: false
   segments: 
   - 0
   - 0
-  - 27
-  version: 0.0.27
+  - 28
+  version: 0.0.28
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 -03:00
+date: 2010-07-26 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency