ar-octopus 0.3.1 → 0.3.2

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.3.1"
+    gem.version = "0.3.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.3.1"
+  s.version = "0.3.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-12-02}
+  s.date = %q{2010-12-14}
   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/proxy.rb

@@ -89,13 +89,14 @@ class Octopus::Proxy
   
   def run_queries_on_shard(shard, &block)
     older_shard = self.current_shard
-    self.block = true
-    self.current_shard = shard
+    last_block = self.block
 
     begin
+      self.block = true
+      self.current_shard = shard
       yield
     ensure
-      self.block = false
+      self.block = last_block || false
       self.current_shard = older_shard
     end
   end

data/spec/octopus/model_spec.rb

@@ -271,11 +271,31 @@ describe Octopus::Model do
         @user2.delete
         lambda { User.using(:brazil).find(@user2.id) }.should raise_error(ActiveRecord::RecordNotFound)
       end
+      
+      it "delete within block shouldn't lose shard" do
+        Octopus.using(:brazil) do
+          @user2.delete
+          @user3 = User.create(:name => "User3")
+          
+          User.connection.current_shard.should == :brazil
+          User.find(@user3.id).should == @user3
+        end
+      end
 
       it "destroy" do
         @user2.destroy
         lambda { User.using(:brazil).find(@user2.id) }.should raise_error(ActiveRecord::RecordNotFound)
       end
+      
+      it "destroy within block shouldn't lose shard" do
+        Octopus.using(:brazil) do
+          @user2.destroy
+          @user3 = User.create(:name => "User3")
+          
+          User.connection.current_shard.should == :brazil
+          User.find(@user3.id).should == @user3
+        end
+      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-02 00:00:00 -02:00
+date: 2010-12-14 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency