ar-octopus 0.0.6 → 0.0.7

data/Rakefile

@@ -29,7 +29,7 @@ begin
     gem.authors = ["Thiago Pradi", "Mike Perham", "Amit Agarwal"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_dependency('activerecord')
-    gem.version = "0.0.6"
+    gem.version = "0.0.7"
   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.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Pradi", "Mike Perham", "Amit Agarwal"]
-  s.date = %q{2010-06-23}
+  s.date = %q{2010-06-24}
   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

@@ -29,7 +29,6 @@ module Octopus::Model
       attr_accessor :current_shard
       after_initialize :set_current_shard
       before_save :set_connection
-      before_destroy :set_connection
 
       def set_current_shard
         if new_record?

data/lib/octopus/persistence.rb

@@ -22,6 +22,16 @@ module Octopus::Persistence
     reload_connection()
     super
   end
+  
+  def delete
+    reload_connection()
+    super
+  end
+  
+  def destroy
+    reload_connection()
+    super
+  end
 end
 
 ActiveRecord::Base.send(:include, Octopus::Persistence)

data/lib/octopus/proxy.rb

@@ -138,7 +138,7 @@ class Octopus::Proxy
   end
 
   def should_clean_connection?(method)
-    method.to_s =~ /insert|select/ && !should_send_queries_to_multiple_shards? && !self.current_group && !@replicated
+    method.to_s =~ /insert|select/ && !should_send_queries_to_multiple_shards? && !self.current_group && !@replicated && !self.block
   end
 
   def should_send_queries_to_multiple_shards?

data/spec/octopus/model_spec.rb

@@ -11,12 +11,12 @@ describe Octopus::Model do
       User.using(:canada).count.should == 1
       User.count.should == 0
     end
-    
+
     it "should select the correct shard" do
       pending()
       # User.using(:canada)
       # User.create!(:name => 'oi')
-      # User.using(:master).count.should == 1
+      # User.count.should == 1
     end
 
     it "should allow scoping dynamically" do
@@ -109,7 +109,7 @@ describe Octopus::Model do
       User.using(:alone_shard).find(:all).should == []
     end
   end
-  
+
   describe "AR basic methods" do
     it "increment" do
       u = User.using(:brazil).create!(:name => "Teste", :number => 10)
@@ -140,8 +140,56 @@ describe Octopus::Model do
       u.toggle!(:admin)
       u = User.using(:brazil).find_by_name('Teste').admin.should be_true
     end
+
+    it "count" do
+      u = User.using(:brazil).create!(:name => "User1")
+      u2 = User.using(:brazil).create!(:name => "User2")
+      u3 = User.using(:brazil).create!(:name => "User3")
+      User.using(:brazil).where(:name => "User2").count.should == 1
+    end
+
+    it "update_attributes" do
+      @user = User.using(:brazil).create!(:name => "User1")
+      @user2 = User.using(:brazil).find(@user.id)
+      @user2.update_attributes(:name => "Joaquim")  
+      User.using(:brazil).where(:name => "Joaquim").first.should_not be_nil    
+    end
+    
+    it "using update_attributes inside a block" do
+      ActiveRecord::Base.connection.run_queries_on_shard :brazil do
+        @user = User.create!(:name => "User1")
+        @user2 = User.find(@user.id)
+        @user2.update_attributes(:name => "Joaquim")  
+      end
+      
+      User.using(:brazil).where(:name => "Joaquim").first.should_not be_nil
+    end
+
+    it "update_attribute" do
+      @user = User.using(:brazil).create!(:name => "User1")
+      @user2 = User.using(:brazil).find(@user.id)
+      @user2.update_attributes(:name => "Joaquim")  
+      User.using(:brazil).where(:name => "Joaquim").first.should_not be_nil
+    end
+
+    describe "deleting a record" do
+      before(:each) do
+        @user = User.using(:brazil).create!(:name => "User1")
+        @user2 = User.using(:brazil).find(@user.id)
+      end
+
+      it "delete" do
+        @user2.delete
+        lambda { User.using(:brazil).find(@user2.id) }.should raise_error(ActiveRecord::RecordNotFound)
+      end
+
+      it "destroy" do
+        @user2.destroy
+        lambda { User.using(:brazil).find(@user2.id) }.should raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
   end
-  
+
   describe "#replicated_model method" do
     it "should be replicated" do
       using_enviroment :production_replicated do 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 -03:00
+date: 2010-06-24 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency