ar-octopus 0.2.2 → 0.3.0

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.2"
+    gem.version = "0.3.0"
   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.2"
+  s.version = "0.3.0"
 
   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-11-03}
+  s.date = %q{2010-11-08}
   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

@@ -160,7 +160,7 @@ class Octopus::Proxy
   end
 
   def should_send_queries_to_replicated_databases?(method)
-    @replicated && method.to_s =~ /select/
+    @replicated && method.to_s =~ /select/ && !@block
   end
 
   def send_queries_to_selected_slave(method, *args, &block)        

data/spec/octopus/model_spec.rb

@@ -5,6 +5,14 @@ describe Octopus::Model do
     it "should return self after calling the #using method" do
       User.using(:canada).should == Octopus::ScopeProxy.new(:canada, User)
     end
+    
+    it "should allow to send a block to the master shard" do
+      Octopus.using(:master) do 
+        User.create!(:name => "Block test")
+      end
+      
+      User.using(:master).find_by_name("Block test").should_not be_nil
+    end
 
     it "should allow selecting the shards on scope" do
       User.using(:canada).create!(:name => 'oi')

data/spec/octopus/replication_specs.rb

@@ -25,6 +25,14 @@ describe "when the database is replicated" do
       Cat.find_by_name("Slave Cat 2").should be_nil
     end
   end
+  
+  it "should allow #using syntax to send queries to master" do
+    Cat.create!(:name => "Master Cat")    
+    
+    using_enviroment :production_fully_replicated do 
+      Cat.using(:master).find_by_name("Master Cat").should_not be_nil
+    end
+  end
 
   it "should send the count query to a slave" do
     pending()

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -02:00
+date: 2010-11-08 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency