ar-octopus 0.0.11 → 0.0.12

data/Rakefile

@@ -28,8 +28,8 @@ begin
     gem.homepage = "http://github.com/tchandy/octopus"
     gem.authors = ["Thiago Pradi", "Mike Perham", "Amit Agarwal"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency('activerecord')
-    gem.version = "0.0.11"
+    gem.add_dependency('activerecord', '>= 3.0.0beta')
+    gem.version = "0.0.12"
   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.11"
+  s.version = "0.0.12"
 
   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-28}
+  s.date = %q{2010-06-29}
   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 = [
@@ -101,14 +101,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0beta"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 3.0.0beta"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 3.0.0beta"])
   end
 end
 

data/lib/octopus/proxy.rb

@@ -3,7 +3,7 @@ class Octopus::Proxy
 
   def initialize(config)
     initialize_shards(config)
-    initialize_replication() if have_a_valid_configuration?(config) && config[Octopus.env()]["replicated"]
+    initialize_replication(config) if have_a_valid_configuration?(config) && config[Octopus.env()]["replicated"]
   end
 
   def initialize_shards(config)
@@ -31,8 +31,9 @@ class Octopus::Proxy
     end
   end
 
-  def initialize_replication()
+  def initialize_replication(config)
     @replicated = true
+    @entire_replicated = config[Octopus.env()]["entire_replicated"]
     @slaves_list = @shards.keys.map {|sym| sym.to_s}.sort 
     @slaves_list.delete('master')   
   end
@@ -187,7 +188,7 @@ class Octopus::Proxy
   def send_queries_to_selected_slave(method, *args, &block)        
     old_shard = self.current_shard
 
-    if current_model.read_inheritable_attribute(:replicated)
+    if current_model.read_inheritable_attribute(:replicated) || @entire_replicated
       if !using_enabled
         self.current_shard = @slaves_list.shift.to_sym
         @slaves_list << self.current_shard

data/spec/config/shards.yml

@@ -73,4 +73,28 @@ production_replicated:
     slave4:
       adapter: mysql
       host: localhost
-      database: octopus_shard5
+      database: octopus_shard5
+
+
+production_entire_replicated:
+  replicated: true
+  entire_replicated: true
+  shards:
+    slave1:
+      adapter: mysql
+      host: localhost
+      database: octopus_shard2
+    slave2:
+      adapter: mysql
+      host: localhost
+      database: octopus_shard3
+    slave3:
+      adapter: mysql
+      host: localhost
+      database: octopus_shard4
+    slave4:
+      adapter: mysql
+      host: localhost
+      database: octopus_shard5
+      
+  

data/spec/octopus/replication_specs.rb

@@ -6,7 +6,7 @@ describe "when the database is replicated" do
     clean_connection_proxy()
   end
 
-  it "should send all writes/reads queries to master when you have a replicated model" do
+  it "should send all writes/reads queries to master when you have a non replicated model" do
     u = User.create!(:name => "Replicated")
     User.count.should == 1
     User.find(u.id).should == u
@@ -15,11 +15,11 @@ describe "when the database is replicated" do
   it "should send read queries to slaves, when you have a replicated model, using a round robin algorithm" do
     u = Cat.create!(:name => "master")
     c = Client.create!(:name => "client_master")
-    
+
     [:slave4, :slave1, :slave2, :slave3].each do |sym|
       Cat.using(sym).create!(:name => "Replicated_#{sym}")
     end
-    
+
     Client.find(:first).should_not be_nil
     Cat.find(:first).name.should == "Replicated_slave1"
     Client.find(:first).should_not be_nil
@@ -31,9 +31,49 @@ describe "when the database is replicated" do
     Client.find(:first).should_not be_nil
     Cat.find(:first).name.should == "Replicated_slave1"
     Client.find(:first).should_not be_nil
-    
+
     [:slave4, :slave1, :slave2, :slave3].each do |sym|
       Cat.using(sym).find_by_name("master").should be_false
     end
   end
 end
+
+
+describe "when the database is replicated and the entire application is replicated" do
+  before(:each) do
+    Octopus.stub!(:env).and_return("production_entire_replicated")
+    clean_connection_proxy()
+  end
+
+  it "should send read queries to slaves,to all models, using a round robin algorithm" do
+    u = Cat.create!(:name => "master")
+    c = Client.create!(:name => "client_master")
+
+    [:slave4, :slave1, :slave2, :slave3].each do |sym|
+      Cat.using(sym).create!(:name => "Replicated_#{sym}")
+    end
+
+    [:slave4, :slave1, :slave2, :slave3].each do |sym|
+      Client.using(sym).create!(:name => "Replicated_#{sym}")
+    end
+
+    Client.find(:first).name.should == "Replicated_slave1"
+    Cat.find(:first).name.should == "Replicated_slave2"
+    Client.find(:first).name.should == "Replicated_slave3"
+    Cat.find(:first).name.should == "Replicated_slave4"
+    Cat.find(:first).name.should == "Replicated_slave1"
+    Client.find(:first).name.should == "Replicated_slave2"
+    Cat.find(:first).name.should == "Replicated_slave3"
+    Client.find(:first).name.should == "Replicated_slave4"
+
+
+    [:slave4, :slave1, :slave2, :slave3].each do |sym|
+      Cat.using(sym).find_by_name("master").should be_false
+    end
+    
+    [:slave4, :slave1, :slave2, :slave3].each do |sym|
+      Client.using(sym).find_by_name("master").should be_false
+    end
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 -03:00
+date: 2010-06-29 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,10 +44,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: -1139874873
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 0beta
+        version: 3.0.0beta
   type: :runtime
   version_requirements: *id002
 description: This gem allows you to use sharded databases with ActiveRecord. this also provides a interface for replication and for running migrations with multiples shards.