ar-octopus 0.0.4 → 0.0.5

data/Rakefile

@@ -28,7 +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.version = "0.0.4"
+    gem.add_dependency('activerecord')
+    gem.version = "0.0.5"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/ar-octopus.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-octopus}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Pradi", "Mike Perham", "Amit Agarwal"]
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
      "spec/octopus/model_spec.rb",
      "spec/octopus/octopus_spec.rb",
      "spec/octopus/proxy_spec.rb",
+     "spec/octopus/replication_specs.rb",
      "spec/octopus_helper.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -83,6 +84,7 @@ Gem::Specification.new do |s|
      "spec/octopus/model_spec.rb",
      "spec/octopus/octopus_spec.rb",
      "spec/octopus/proxy_spec.rb",
+     "spec/octopus/replication_specs.rb",
      "spec/octopus_helper.rb",
      "spec/spec_helper.rb"
   ]
@@ -93,11 +95,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"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<activerecord>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<activerecord>, [">= 0"])
   end
 end
 

data/lib/octopus/model.rb

@@ -53,10 +53,7 @@ module Octopus::Model
         end
 
         def connection 
-          if self.respond_to?(:replicated)
-            self.connection_proxy().set_replicated_model(self)
-          end
-
+          self.connection_proxy().current_model = self
           self.connection_proxy()
         end
       end
@@ -98,7 +95,7 @@ module Octopus::Model
   include InstanceMethods
 
   def replicated_model()
-    self.cattr_accessor :replicated
+    write_inheritable_attribute(:replicated, true)
   end
 
   def has_many(association_id, options = {}, &extension)

data/lib/octopus/proxy.rb

@@ -1,17 +1,16 @@
 require "set"
 
 class Octopus::Proxy
-  attr_accessor :shards, :block, :groups, :current_group, :replicated, :slaves_list, :replicated_models, :using_enabled, :last_current_shard
+  attr_accessor :shards, :block, :current_model, :current_shard, :groups, :current_group, :replicated, :slaves_list, :using_enabled, :last_current_shard
 
   delegate :increment_open_transactions, :decrement_open_transactions,  :to => :select_connection
 
   def initialize(config)
     @shards = {}
     @groups = {}
-    @replicated_models = Set.new
     @replicated = config[Octopus.env()]["replicated"]
     @shards[:master] = ActiveRecord::Base.connection_pool()
-    Thread.current[:current_shard] = :master
+    @current_shard = :master
     
     initialize_shards(config)
     
@@ -43,10 +42,7 @@ class Octopus::Proxy
     @slaves_list.delete(:master)
     @slaves_list = @slaves_list.map {|sym| sym.to_s}.sort    
   end
-  
-  def current_shard
-    Thread.current[:current_shard]
-  end
+
   
   def current_shard=(shard_symbol)
     if shard_symbol.is_a?(Array)
@@ -55,7 +51,7 @@ class Octopus::Proxy
       raise "Nonexistent Shard Name: #{shard_symbol}" if @shards[shard_symbol].nil?
     end
 
-    Thread.current[:current_shard] = shard_symbol
+    @current_shard = shard_symbol
   end
 
   def current_group=(group_symbol)
@@ -68,6 +64,14 @@ class Octopus::Proxy
     @current_group = group_symbol
   end
   
+  def current_model=(model)
+    if model.is_a?(ActiveRecord::Base)
+      @current_model = model.class
+    else
+      @current_model = model
+    end
+  end
+  
   def select_connection()
     @shards[shard_name].connection()
   end
@@ -79,11 +83,7 @@ class Octopus::Proxy
       current_shard
     end
   end
-  
-  def set_replicated_model(model)
-    replicated_models << model.to_s
-  end
-  
+    
   def add_transaction_record(record)
     if !select_connection().instance_variable_get(:@_current_transaction_records).nil?
       select_connection().add_transaction_record(record)
@@ -195,10 +195,9 @@ class Octopus::Proxy
   end
 
   def send_queries_to_selected_slave(method, *args, &block)        
-    #TODO: UGLY code, needs refactor
     old_shard = self.current_shard
-
-    if args.last =~ /#{replicated_models.to_a.join('|')}/
+    
+    if current_model.read_inheritable_attribute(:replicated)
       if !using_enabled
         self.current_shard = slaves_list.shift.to_sym
         slaves_list << self.current_shard

data/spec/octopus/model_spec.rb

@@ -11,6 +11,13 @@ 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
+    end
 
     it "should allow scoping dynamically" do
       User.using(:canada).using(:master).using(:canada).create!(:name => 'oi')
@@ -144,8 +151,8 @@ describe Octopus::Model do
 
     it "should mark the Cat model as replicated" do
       using_enviroment :production_replicated do 
-        Cat.all.should == []
-        ActiveRecord::Base.connection_proxy.replicated_models.first.should == "Cat"
+        User.read_inheritable_attribute(:replicated).should be_false
+        Cat.read_inheritable_attribute(:replicated).should be_true
       end
     end
   end

data/spec/octopus/proxy_spec.rb

@@ -57,55 +57,4 @@ describe Octopus::Proxy do
       end
     end
   end
-
-  describe "when the database is replicated" do
-    before(:each) do
-      Octopus.stub!(:env).and_return("production_replicated")
-      @proxy = Octopus::Proxy.new(Octopus.config())
-      clean_connection_proxy()
-    end
-    
-    it "should have the replicated attribute as true" do
-      @proxy.replicated.should be_true
-    end
-
-    it "should initialize the list of shards" do
-      @proxy.slaves_list.should == ["slave1", "slave2", "slave3", "slave4"]
-    end
-
-    it "should send all writes queries to master" do
-      u = User.create!(:name => "Replicated")
-
-      [:slave4, :slave1, :slave2, :slave3].each do |sym|
-        User.using(sym).count.should == 0
-      end
-
-      User.using(:master).count.should == 1
-    end
-
-    it "should send read queries to slaves, 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
-      Cat.find(:first).name.should == "Replicated_slave2"
-      Client.find(:first).should_not be_nil
-      Cat.find(:first).name.should == "Replicated_slave3"
-      Client.find(:first).should_not be_nil
-      Cat.find(:first).name.should == "Replicated_slave4"
-      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
 end

data/spec/octopus/replication_specs.rb

@@ -0,0 +1,46 @@
+describe "when the database is replicated" do
+  before(:each) do
+    Octopus.stub!(:env).and_return("production_replicated")
+    @proxy = Octopus::Proxy.new(Octopus.config())
+    clean_connection_proxy()
+  end
+  
+  it "should have the replicated attribute as true" do
+    @proxy.replicated.should be_true
+  end
+
+  it "should initialize the list of shards" do
+    @proxy.slaves_list.should == ["slave1", "slave2", "slave3", "slave4"]
+  end
+
+  it "should send all writes/reads queries to master when you have a replicated model" do
+    u = User.create!(:name => "Replicated")
+    User.count.should == 1
+    User.find(u.id).should == u
+  end
+
+  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
+    Cat.find(:first).name.should == "Replicated_slave2"
+    Client.find(:first).should_not be_nil
+    Cat.find(:first).name.should == "Replicated_slave3"
+    Client.find(:first).should_not be_nil
+    Cat.find(:first).name.should == "Replicated_slave4"
+    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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -36,6 +36,20 @@ dependencies:
         version: 1.2.9
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  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.
 email: tchandy@gmail.com
 executables: []
@@ -83,6 +97,7 @@ files:
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb
 - spec/octopus/proxy_spec.rb
+- spec/octopus/replication_specs.rb
 - spec/octopus_helper.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -140,5 +155,6 @@ test_files:
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb
 - spec/octopus/proxy_spec.rb
+- spec/octopus/replication_specs.rb
 - spec/octopus_helper.rb
 - spec/spec_helper.rb