ar-octopus 0.4.0 → 0.5.0

data/spec/octopus/log_subscriber_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+if Octopus.rails3?
+  describe Octopus::LogSubscriber, :shards => [:canada] do
+
+    before :each do
+      @out = StringIO.new
+      @log = Logger.new(@out)
+      ActiveRecord::Base.logger = @log
+      ActiveRecord::Base.logger.level = Logger::DEBUG
+    end
+
+    after :each do
+      ActiveRecord::Base.logger = nil
+    end
+
+    it "should add to the default logger the shard name the query was sent to" do
+      User.using(:canada).create!(:name => "test")
+      @out.string.should =~ /Shard: canada/
+    end
+  end
+end

data/spec/octopus/logger_spec.rb

@@ -1,19 +1,32 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "spec_helper"
 
-describe Octopus::Logger do 
+describe Octopus::Logger, :shards => [:canada] do
+  before :each do
+    @out = StringIO.new
+    @log = Octopus::Logger.new(@out)
+    ActiveRecord::Base.logger = @log
+  end
+
+  after :each do
+    ActiveRecord::Base.logger = nil
+  end
 
-	before :each do
-		@out = StringIO.new
-		@log = Octopus::Logger.new(@out)
-		ActiveRecord::Base.logger = @log
-	end
-	
-	after :each do 
-		ActiveRecord::Base.logger = nil  
+  if Octopus.rails3?
+    it "should add to the default logger what shard the query was sent" do
+      User.using(:canada).create!(:name => "test")
+      @out.string.should =~ /Shard: canada/
+    end
   end
 
-	it "should add to the default logger what shard the query was sent" do
-    User.using(:canada).create!(:name => "test")
-		@out.string.should =~ /Shard: canada/
-	end
-end
+  it "should be deprecated" do
+    @last_message = nil
+    ActiveSupport::Deprecation.behavior = Proc.new { |message| @last_message = message }
+    @log = Octopus::Logger.new(@out)
+
+    if @last_message.is_a?(Array)
+      @last_message.first.should =~ /DEPRECATION WARNING: Octopus::Logger is deprecated and will be removed in Octopus 0\.6\.x\./
+    else
+      @last_message.should =~ /DEPRECATION WARNING: Octopus::Logger is deprecated and will be removed in Octopus 0\.6\.x\./
+    end
+  end
+end

data/spec/octopus/migration_spec.rb

@@ -1,91 +1,73 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "spec_helper"
 
-describe Octopus::Migration do    
+describe Octopus::Migration do
   it "should run just in the master shard" do
-    migrating_to_version 1 do 
-      User.using(:master).find_by_name("Master").should_not be_nil    
+    OctopusHelper.migrating_to_version 1 do
+      User.using(:master).find_by_name("Master").should_not be_nil
       User.using(:canada).find_by_name("Master").should be_nil
     end
   end
 
   it "should run on specific shard" do
-    migrating_to_version 2 do 
-      User.using(:master).find_by_name("Sharding").should be_nil    
+    OctopusHelper.migrating_to_version 2 do
+      User.using(:master).find_by_name("Sharding").should be_nil
       User.using(:canada).find_by_name("Sharding").should_not be_nil
     end
   end
 
   it "should run on specifieds shards" do
-    migrating_to_version 3 do 
-      User.using(:brazil).find_by_name("Both").should_not be_nil    
+    OctopusHelper.migrating_to_version 3 do
+      User.using(:brazil).find_by_name("Both").should_not be_nil
       User.using(:canada).find_by_name("Both").should_not be_nil
     end
   end
 
   it "should run on specified group" do
-    migrating_to_version 4 do 
+    OctopusHelper.migrating_to_version 4 do
       User.using(:canada).find_by_name("Group").should_not be_nil
-      User.using(:brazil).find_by_name("Group").should_not be_nil    
+      User.using(:brazil).find_by_name("Group").should_not be_nil
       User.using(:russia).find_by_name("Group").should_not be_nil
     end
   end
 
-  it "should run on multiples groups" do
-    migrating_to_version 5 do 
-      User.using(:canada).find(:all, {:conditions => {:name => "MultipleGroup"}}).size.should == 2
-      User.using(:brazil).find(:all, {:conditions => {:name => "MultipleGroup"}}).size.should == 2
-      User.using(:russia).find(:all, {:conditions => {:name => "MultipleGroup"}}).size.should == 2
+  it "should run once per shard" do
+    OctopusHelper.migrating_to_version 5 do
+      User.using(:canada).find(:all, {:conditions => {:name => "MultipleGroup"}}).size.should == 1
+      User.using(:brazil).find(:all, {:conditions => {:name => "MultipleGroup"}}).size.should == 1
+      User.using(:russia).find(:all, {:conditions => {:name => "MultipleGroup"}}).size.should == 1
     end
   end
 
   it "should create users inside block" do
-    migrating_to_version 12 do 
+    OctopusHelper.migrating_to_version 12 do
       User.using(:brazil).find(:all, :conditions => {:name => "UsingBlock1"}).size.should == 1
       User.using(:brazil).find(:all, :conditions => {:name => "UsingBlock2"}).size.should == 1
       User.using(:canada).find(:all, :conditions => {:name => "UsingCanada"}).size.should == 1
       User.using(:canada).find(:all, :conditions => {:name => "UsingCanada2"}).size.should == 1
     end
   end
-  
+
   it "should send the query to the correct shard" do
-    migrating_to_version 13 do 
+    OctopusHelper.migrating_to_version 13 do
       User.using(:brazil).find(:all, :conditions => {:name => "Brazil"}).size.should == 1
       User.using(:brazil).find(:all, :conditions => {:name => "Canada"}).size.should == 0
       User.using(:canada).find(:all, :conditions => {:name => "Brazil"}).size.should == 0
       User.using(:canada).find(:all, :conditions => {:name => "Canada"}).size.should == 1
-    end    
-  end
-
-  describe "should raise a exception when" do
-    it "you specify a invalid shard name" do
-      lambda { ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT, 6) }.should raise_error("Nonexistent Shard Name: amazing_shard")
-    end
-
-    it "you specify a invalid shard name, even if you have multiple shards, and one of them are right" do
-      lambda { ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT, 7) }.should raise_error("Nonexistent Shard Name: invalid_shard")
     end
+  end
 
-    it "you specify a invalid group name" do
-      lambda { ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT, 8) }.should raise_error("Nonexistent Group Name: invalid_group")
-    end
-
-    it "you specify a invalid group name, even if you have multiple groups, and one of them are right" do
-      lambda { ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT, 9) }.should raise_error("Nonexistent Group Name: invalid_group")
-    end
-  end 
-
-  describe "when using replication" do    
+  describe "when using replication" do
     it "should run writes on master when you use replication" do
-      using_environment :production_replicated do 
-        migrating_to_version 10 do 
+      OctopusHelper.using_environment :production_replicated do
+        OctopusHelper.migrating_to_version 10 do
           Cat.find_by_name("Replication").should be_nil
         end
       end
     end
 
     it "should run in all shards, master or another shards" do
-      using_environment :production_replicated do 
-        migrating_to_version 11 do 
+      OctopusHelper.using_environment :production_replicated do
+        OctopusHelper.migrating_to_version 11 do
           [:slave4, :slave1, :slave2, :slave3].each do |sym|
             Cat.find_by_name("Slaves").should_not be_nil
           end
@@ -93,5 +75,27 @@ describe Octopus::Migration do
       end
     end
   end
-end
 
+  it "should store the migration versions in each shard" do
+    class SchemaMigration < ActiveRecord::Base; end
+
+    OctopusHelper.migrating_to_version 14 do
+      Octopus.using(:canada) { ActiveRecord::Migrator.get_all_versions }.should include(14)
+      Octopus.using(:brazil) { ActiveRecord::Migrator.get_all_versions }.should include(14)
+      Octopus.using(:russia) { ActiveRecord::Migrator.get_all_versions }.should include(14)
+    end
+  end
+
+  it "should run the migrations on shards that are missing them" do
+    class SchemaMigration < ActiveRecord::Base; end
+
+    Octopus.using(:master) { SchemaMigration.create(:version => 14) }
+    Octopus.using(:canada) { SchemaMigration.create(:version => 14) }
+
+    OctopusHelper.migrating_to_version 14 do
+      Octopus.using(:canada) { ActiveRecord::Migrator.get_all_versions }.should include(14)
+      Octopus.using(:brazil) { ActiveRecord::Migrator.get_all_versions }.should include(14)
+      Octopus.using(:russia) { ActiveRecord::Migrator.get_all_versions }.should include(14)
+    end
+  end
+end

data/spec/octopus/model_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "spec_helper"
 
 describe Octopus::Model do
   describe "#using method" do
     it "should return self after calling the #using method" do
-      User.using(:canada).should == Octopus::ScopeProxy.new(:canada, User)
+      User.using(:canada).should be_a(Octopus::ScopeProxy)
     end
 
     it "should allow to send a block to the master shard" do
@@ -53,6 +53,21 @@ describe Octopus::Model do
       User.all.should == [u1]
     end
 
+    describe "multiple calls to the same scope" do
+      it "works with nil response" do
+        scope = User.using(:canada)
+        scope.count.should == 0
+        scope.first.should be_nil
+      end
+
+      it "works with non-nil response" do
+        user = User.using(:canada).create!(:name => 'oi')
+        scope = User.using(:canada)
+        scope.count.should == 1
+        scope.first.should == user
+      end
+    end
+
     it "should select the correct shard" do
       User.using(:canada)
       User.create!(:name => 'oi')
@@ -85,8 +100,8 @@ describe Octopus::Model do
     end
 
     it "should clean #current_shard from proxy when using execute" do
-      ActiveRecord::Base.using(:canada).connection().execute("select * from users limit 1;")
-      ActiveRecord::Base.connection.current_shard.should == :master
+      User.using(:canada).connection().execute("select * from users limit 1;")
+      User.connection.current_shard.should == :master
     end
 
     it "should allow scoping dynamically" do
@@ -118,6 +133,17 @@ describe Octopus::Model do
       User.count.should == 0
     end
 
+    it "should work with named scopes" do
+      u = User.using(:brazil).create!(:name => "Thiago")
+
+      User.thiago.using(:brazil).first.should eq(u)
+      User.using(:brazil).thiago.first.should eq(u)
+
+      Octopus.using(:brazil) do
+        User.thiago.first.should eq(u)
+      end
+    end
+
     describe "#current_shard attribute" do
       it "should store the attribute when you create or find an object" do
         u = User.using(:alone_shard).create!(:name => "Alone")
@@ -183,13 +209,54 @@ describe Octopus::Model do
         lambda { User.using(:crazy_shard).create!(:name => 'Thiago') }.should raise_error("Nonexistent Shard Name: crazy_shard")
       end
     end
+
+    describe "equality" do
+      let(:canada1) do
+        u = User.new
+        u.id = 1
+        u.current_shard = :canada
+        u
+      end
+
+      let(:canada1_dup) do
+        u = User.new
+        u.id = 1
+        u.current_shard = :canada
+        u
+      end
+
+      let(:brazil1) do
+        u = User.new
+        u.id = 1
+        u.current_shard = :brazil
+        u
+      end
+
+      it "should work with persisted objects" do
+        u = User.using(:brazil).create(:name => "Mike")
+        User.using(:brazil).find_by_name("Mike").should == u
+      end
+
+      if Octopus.rails31? || Octopus.rails32?
+        # Rails <= 3.0 doesn't support equality checks on non-persisted objects
+        it "should check current_shard when determining equality" do
+          canada1.should_not == brazil1
+          canada1.should == canada1_dup
+        end
+
+        it "delegates equality check on scopes" do
+          u = User.using(:brazil).create!(:name => "Mike")
+          User.using(:brazil).where(:name => "Mike").should == [u]
+        end
+      end
+    end
   end
 
   describe "using a postgresql shard" do
     it "should update the Arel Engine" do
       if ActiveRecord::VERSION::STRING > '2.4.0'
         User.using(:postgresql_shard).arel_engine.connection.adapter_name.should == "PostgreSQL"
-        User.using(:alone_shard).arel_engine.connection.adapter_name.should == "Mysql2"
+        User.using(:alone_shard).arel_engine.connection.adapter_name.should == "MySQL"
       end
     end
 
@@ -202,8 +269,13 @@ describe Octopus::Model do
   end
 
   describe "AR basic methods" do
-    it "octopus_establish_connection" do
-      CustomConnection.connection.current_database.should == "octopus_shard2"
+    it "establish_connection" do
+      CustomConnection.connection.current_database.should == "octopus_shard_2"
+    end
+
+    it "should not mess with custom connection table names" do
+      Advert.connection.current_database.should == "octopus_shard_1"
+      Advert.create!(:name => "Teste")
     end
 
     it "increment" do
@@ -221,6 +293,21 @@ describe Octopus::Model do
       u = User.using(:brazil).find_by_number(11).should_not be_nil
     end
 
+    it "decrement" do
+      u = User.using(:brazil).create!(:name => "Teste", :number => 10)
+      u = User.using(:brazil).find_by_number(10)
+      u.decrement(:number)
+      u.save()
+      u = User.using(:brazil).find_by_number(9).should_not be_nil
+    end
+
+    it "decrement!" do
+      u = User.using(:brazil).create!(:name => "Teste", :number => 10)
+      u = User.using(:brazil).find_by_number(10)
+      u.decrement!(:number)
+      u = User.using(:brazil).find_by_number(9).should_not be_nil
+    end
+
     it "toggle" do
       u = User.using(:brazil).create!(:name => "Teste", :admin => false)
       u = User.using(:brazil).find_by_name('Teste')
@@ -243,6 +330,73 @@ describe Octopus::Model do
       User.using(:brazil).find(:all, :conditions => {:name => "User2"}).count.should == 1
     end
 
+    it "maximum" do
+      u1 = User.using(:brazil).create!(:name => "Teste", :number => 11)
+      u2 = User.using(:master).create!(:name => "Teste", :number => 12)
+
+      User.using(:brazil).maximum(:number).should == 11
+      User.using(:master).maximum(:number).should == 12
+    end
+
+    if Octopus.rails3?
+      describe "any?" do
+        before { User.using(:brazil).create!(:name => "User1") }
+
+        it "works when true" do
+          scope = User.using(:brazil).where(:name => "User1")
+          scope.any?.should be_true
+        end
+
+        it "works when false" do
+          scope = User.using(:brazil).where(:name => "User2")
+          scope.any?.should be_false
+        end
+      end
+
+      it "exists?" do
+        @user = User.using(:brazil).create!(:name => "User1")
+
+        User.using(:brazil).where(:name => "User1").exists?.should be_true
+        User.using(:brazil).where(:name => "User2").exists?.should be_false
+      end
+
+      describe "touch" do
+        it "updates updated_at by default" do
+          @user = User.using(:brazil).create!(:name => "User1")
+          User.using(:brazil).update_all({:updated_at => Time.now - 3.months}, {:id => @user.id})
+          @user.touch
+          @user.reload.updated_at.to_date.should eq(Date.today)
+        end
+
+        it "updates passed in attribute name" do
+          @user = User.using(:brazil).create!(:name => "User1")
+          User.using(:brazil).update_all({:created_at => Time.now - 3.months}, {:id => @user.id})
+          @user.touch(:created_at)
+          @user.reload.created_at.to_date.should eq(Date.today)
+        end
+      end
+
+    end
+
+    if Octopus.rails32?
+      describe "#pluck" do
+        before { User.using(:brazil).create!(:name => "User1") }
+
+        it "should works from scope proxy" do
+          names = User.using(:brazil).pluck(:name)
+          names.should eq(["User1"])
+          User.using(:master).pluck(:name).should eq([])
+        end
+      end
+
+      it "update_column" do
+        @user = User.using(:brazil).create!(:name => "User1")
+        @user2 = User.using(:brazil).find(@user.id)
+        @user2.update_column(:name, "Joaquim Shard Brazil")
+        User.using(:brazil).find_by_name("Joaquim Shard Brazil").should_not be_nil
+      end
+    end
+
     it "update_attributes" do
       @user = User.using(:brazil).create!(:name => "User1")
       @user2 = User.using(:brazil).find(@user.id)
@@ -325,13 +479,25 @@ describe Octopus::Model do
     it 'should work correctly' do
       Bacon.using(:brazil).create!(:name => "YUMMMYYYY")
     end
+
+    it 'should work correctly with a block' do
+      Cheese.using(:brazil).create!(:name => "YUMMMYYYY")
+    end
+  end
+
+  if Octopus.rails32?
+    describe "when using table_name=" do
+      it 'should work correctly' do
+        Ham.using(:brazil).create!(:name => "YUMMMYYYY")
+      end
+    end
   end
 
   describe "when using a environment with a single adapter" do
     it 'should not clean the table name' do
-      using_environment :production_fully_replicated do
+      OctopusHelper.using_environment :production_fully_replicated do
         Keyboard.should_not_receive(:reset_table_name)
-        Keyboard.using(:master).create!("Master Cat")
+        Keyboard.using(:master).create!(:name => "Master Cat")
       end
     end
   end
@@ -407,15 +573,15 @@ describe Octopus::Model do
 
   describe "#replicated_model method" do
     it "should be replicated" do
-      using_environment :production_replicated do
+      OctopusHelper.using_environment :production_replicated do
         ActiveRecord::Base.connection_proxy.instance_variable_get(:@replicated).should be_true
       end
     end
 
     it "should mark the Cat model as replicated" do
-      using_environment :production_replicated do
-        User.read_inheritable_attribute(:replicated).should be_false
-        Cat.read_inheritable_attribute(:replicated).should be_true
+      OctopusHelper.using_environment :production_replicated do
+        User.replicated.should be_false
+        Cat.replicated.should be_true
       end
     end
   end