ar-octopus 0.4.0 → 0.5.0

data/spec/octopus/octopus_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "spec_helper"
 
-describe Octopus do
+describe Octopus, :shards => [] do
   describe "#config" do
     it "should load shards.yml file to start working" do
       Octopus.config().should be_kind_of(HashWithIndifferentAccess)
@@ -34,14 +34,14 @@ describe Octopus do
   describe "#shards=" do
     after(:each) do
       Octopus.instance_variable_set(:@config, nil)
-      Thread.current[:connection_proxy] = Octopus::Proxy.new(Octopus.config())
+      Octopus::Model.send(:class_variable_set, :@@connection_proxy, nil)
     end
 
     it "should permit users to configure shards on initializer files, instead of on a yml file." do
       lambda { User.using(:crazy_shard).create!(:name => "Joaquim") }.should raise_error
 
       Octopus.setup do |config|
-        config.shards = {:crazy_shard => {:adapter => "mysql2", :database => "octopus_shard5", :username => "root", :password => ""}}
+        config.shards = {:crazy_shard => {:adapter => "mysql", :database => "octopus_shard_5", :username => "root", :password => ""}}
       end
 
       lambda { User.using(:crazy_shard).create!(:name => "Joaquim")  }.should_not raise_error
@@ -65,4 +65,26 @@ describe Octopus do
       end
     end
   end
+
+  describe "#enabled?" do
+    before do
+      Rails = mock()
+    end
+
+    after do
+      Object.send(:remove_const, :Rails)
+    end
+
+    it "should be if octopus is configured and should hook into current environment" do
+      Rails.stub!(:env).and_return('production')
+
+      Octopus.should be_enabled
+    end
+
+    it "should not be if octopus should not hook into current environment" do
+      Rails.stub!(:env).and_return('staging')
+
+      Octopus.should_not be_enabled
+    end
+  end
 end

data/spec/octopus/proxy_spec.rb

@@ -1,12 +1,21 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "spec_helper"
 
 describe Octopus::Proxy do
-  let(:proxy) { Octopus::Proxy.new(Octopus.config()) }
+  let(:proxy) { subject }
 
-  describe "creating a new instance" do
+  describe "creating a new instance", :shards => [] do
     it "should initialize all shards and groups" do
-      proxy.instance_variable_get(:@shards).keys.to_set.should == ["canada", "brazil", "master", "sqlite_shard", "russia", "alone_shard", "aug2009", "postgresql_shard", "aug2010", "aug2011"].to_set
-      proxy.instance_variable_get(:@groups).should == {"country_shards" => [:canada, :brazil, :russia], "history_shards" => [:aug2009, :aug2010, :aug2011]}
+      # FIXME: Don't test implementation details
+      proxy.instance_variable_get(:@shards).should include("canada", "brazil", "master", "sqlite_shard", "russia", "alone_shard",
+                                                           "aug2009", "postgresql_shard", "aug2010", "aug2011")
+
+      proxy.instance_variable_get(:@shards).should include("protocol_shard") if Octopus.rails32?
+
+      proxy.has_group?("country_shards").should be_true
+      proxy.shards_for_group("country_shards").should include(:canada, :brazil, :russia)
+
+      proxy.has_group?("history_shards").should be_true
+      proxy.shards_for_group("history_shards").should include(:aug2009, :aug2010, :aug2011)
     end
 
     it "should initialize the block attribute as false" do
@@ -22,13 +31,16 @@ describe Octopus::Proxy do
     end
 
     it "should work with thiking sphinx" do
-      proxy.instance_variable_get(:@config).should == {:adapter=>"mysql2", :password=>"", :database=>"octopus_shard1", :username=>"root", :flags=>2}
+      config = proxy.instance_variable_get(:@config)
+      config[:adapter].should == "mysql"
+      config[:database].should == "octopus_shard_1"
+      config[:username].should == "root"
     end
 
     it 'should create a set with all adapters, to ensure that is needed to clean the table name.' do
       adapters = proxy.instance_variable_get(:@adapters)
       adapters.should be_kind_of(Set)
-      adapters.to_a.should == ["sqlite3", "mysql2", "postgresql"]
+      adapters.to_a.should =~ ["sqlite3", "mysql", "postgresql"]
     end
 
     it 'should respond correctly to respond_to?(:pk_and_sequence_for)' do
@@ -39,6 +51,19 @@ describe Octopus::Proxy do
       proxy.respond_to?(:primary_key).should be_true
     end
 
+    context 'when an adapter that modifies the config' do
+      before(:all) { OctopusHelper.set_octopus_env("modify_config") }
+      after(:all)  { OctopusHelper.set_octopus_env("octopus")       }
+
+      it 'should not fail with missing adapter second time round' do
+        Thread.current["octopus.current_shard"] = :modify_config_read
+
+        lambda { Octopus::Proxy.new(Octopus.config()) }.should_not raise_error("Please install the  adapter: `gem install activerecord--adapter` (cannot load such file -- active_record/connection_adapters/_adapter)")
+
+        Thread.current["octopus.current_shard"] = nil
+      end
+    end
+
     describe "#should_clean_table_name?" do
       it 'should return true when you have a environment with multiple database types' do
         proxy.should_clean_table_name?.should be_true
@@ -46,7 +71,7 @@ describe Octopus::Proxy do
 
       context "when using a environment with a single table name" do
         before(:each) do
-          set_octopus_env("production_replicated")
+          OctopusHelper.set_octopus_env("production_replicated")
         end
 
         it 'should return false' do
@@ -57,7 +82,7 @@ describe Octopus::Proxy do
 
     describe "should raise error if you have duplicated shard names" do
       before(:each) do
-        set_octopus_env("production_raise_error")
+        OctopusHelper.set_octopus_env("production_raise_error")
       end
 
       it "should raise the error" do
@@ -67,17 +92,13 @@ describe Octopus::Proxy do
 
     describe "should initialize just the master when you don't have a shards.yml file" do
       before(:each) do
-        set_octopus_env("crazy_environment")
+        OctopusHelper.set_octopus_env("crazy_environment")
       end
 
       it "should initialize just the master shard" do
         proxy.instance_variable_get(:@shards).keys.should == ["master"]
       end
 
-      it "should not initialize the groups variable" do
-        proxy.instance_variable_get(:@groups).should == {}
-      end
-
       it "should not initialize replication" do
         proxy.instance_variable_get(:@replicated).should be_nil
       end
@@ -86,7 +107,7 @@ describe Octopus::Proxy do
 
   describe "when you have a replicated environment" do
     before(:each) do
-      set_octopus_env("production_replicated")
+      OctopusHelper.set_octopus_env("production_replicated")
     end
 
     it "should have the replicated attribute as true" do
@@ -101,12 +122,20 @@ describe Octopus::Proxy do
   describe "when you have a rails application" do
     before(:each) do
       Rails = mock()
-      set_octopus_env("octopus_rails")
+      OctopusHelper.set_octopus_env("octopus_rails")
+    end
+
+    after(:each) do
+      Object.send(:remove_const, :Rails)
+      Octopus.instance_variable_set(:@config, nil)
+      Octopus.instance_variable_set(:@rails_env, nil)
+      OctopusHelper.clean_connection_proxy()
     end
 
     it "should initialize correctly octopus common variables for the environments" do
       Rails.stub!(:env).and_return('staging')
       Octopus.instance_variable_set(:@rails_env, nil)
+      Octopus.instance_variable_set(:@environments, nil)
       Octopus.config()
 
       proxy.instance_variable_get(:@replicated).should be_true
@@ -116,17 +145,32 @@ describe Octopus::Proxy do
 
     it "should initialize correctly the shards for the staging environment" do
       Rails.stub!(:env).and_return('staging')
+      Octopus.instance_variable_set(:@rails_env, nil)
+      Octopus.instance_variable_set(:@environments, nil)
+      Octopus.config()
 
       proxy.instance_variable_get(:@shards).keys.to_set.should == Set.new(["slave1", "slave2", "master"])
     end
 
+    it "should initialize correctly the shard octopus_shard value for logging" do
+      Rails.stub!(:env).and_return('staging')
+      Octopus.instance_variable_set(:@rails_env, nil)
+      Octopus.instance_variable_set(:@environments, nil)
+      Octopus.config()
+
+      proxy.instance_variable_get(:@shards)['slave1'].spec.config.should have_key :octopus_shard
+    end
+
     it "should initialize correctly the shards for the production environment" do
       Rails.stub!(:env).and_return('production')
+      Octopus.instance_variable_set(:@rails_env, nil)
+      Octopus.instance_variable_set(:@environments, nil)
+      Octopus.config()
 
       proxy.instance_variable_get(:@shards).keys.to_set.should == Set.new(["slave3", "slave4", "master"])
     end
 
-    describe "using the master connection" do
+    describe "using the master connection", :shards => [:russia, :master]  do
       before(:each) do
         Rails.stub!(:env).and_return('development')
       end
@@ -163,12 +207,6 @@ describe Octopus::Proxy do
         u.save()
       end
     end
-
-    after(:each) do
-      Object.send(:remove_const, :Rails)
-      Octopus.instance_variable_set(:@config, nil)
-      Octopus.instance_variable_set(:@rails_env, nil)
-    end
   end
 
   describe "returning the correct connection" do

data/spec/octopus/{replication_specs.rb → replication_spec.rb}

@@ -1,8 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "spec_helper"
 
 describe "when the database is replicated" do
   it "should send all writes/reads queries to master when you have a non replicated model" do
-    using_environment :production_replicated do 
+    OctopusHelper.using_environment :production_replicated do
       u = User.create!(:name => "Replicated")
       User.count.should == 1
       User.find(u.id).should == u
@@ -10,8 +10,8 @@ describe "when the database is replicated" do
   end
 
   it "should send all writes queries to master" do
-    using_environment :production_replicated do 
-      Cat.create!(:name => "Slave Cat")    
+    OctopusHelper.using_environment :production_replicated do
+      Cat.create!(:name => "Slave Cat")
       Cat.find_by_name("Slave Cat").should be_nil
       Client.create!(:name => "Slave Client")
       Client.find_by_name("Slave Client").should_not be_nil
@@ -19,27 +19,26 @@ describe "when the database is replicated" do
   end
 
   it "should allow to create multiple models on the master" do
-    using_environment :production_replicated do 
-      Cat.create!([{:name => "Slave Cat 1"}, {:name => "Slave Cat 2"}])  
+    OctopusHelper.using_environment :production_replicated do
+      Cat.create!([{:name => "Slave Cat 1"}, {:name => "Slave Cat 2"}])
       Cat.find_by_name("Slave Cat 1").should be_nil
       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_environment :production_fully_replicated do 
+    Cat.create!(:name => "Master Cat")
+
+    OctopusHelper.using_environment :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()
-    # using_environment :production_replicated do 
-    #       Cat.create!(:name => "Slave Cat")    
-    #       Cat.count.should == 0
-    #     end
+    OctopusHelper.using_environment :production_replicated do
+      Cat.create!(:name => "Slave Cat")
+      Cat.count.should == 0
+    end
   end
 end
 
@@ -47,31 +46,39 @@ end
 describe "when the database is replicated and the entire application is replicated" do
   before(:each) do
     Octopus.stub!(:env).and_return("production_fully_replicated")
-    clean_connection_proxy()
+    OctopusHelper.clean_connection_proxy()
+  end
+
+  it "should send all writes queries to master" do
+    OctopusHelper.using_environment :production_fully_replicated do
+      Cat.create!(:name => "Slave Cat")
+      Cat.find_by_name("Slave Cat").should be_nil
+      Client.create!(:name => "Slave Client")
+      Client.find_by_name("Slave Client").should be_nil
+    end
   end
 
   it "should send all writes queries to master" do
-    using_environment :production_fully_replicated do 
-      Cat.create!(:name => "Slave Cat")    
+    OctopusHelper.using_environment :production_fully_replicated do
+      Cat.create!(:name => "Slave Cat")
       Cat.find_by_name("Slave Cat").should be_nil
       Client.create!(:name => "Slave Client")
       Client.find_by_name("Slave Client").should be_nil
     end
-  end  
-  
+  end
+
   it "should work with validate_uniquess_of" do
     Keyboard.create!(:name => "thiago")
-    
-    using_environment :production_fully_replicated do 
+
+    OctopusHelper.using_environment :production_fully_replicated do
       k = Keyboard.new(:name => "thiago")
       k.save.should be_false
-      k.errors.should == {:name=>["has already been taken"]}
+      k.errors.full_messages.should == ["Name has already been taken"]
     end
   end
-  
+
   it "should reset current shard if slave throws an exception" do
-  
-    using_environment :production_fully_replicated do
+    OctopusHelper.using_environment :production_fully_replicated do
       Cat.create!(:name => "Slave Cat")
       Cat.connection.current_shard.should eql(:master)
       begin

data/spec/octopus/scope_proxy_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "spec_helper"
 
 describe Octopus::ScopeProxy do
   it "should allow nested queries" do
@@ -6,13 +6,13 @@ describe Octopus::ScopeProxy do
       @user1 = User.using(:brazil).create!(:name => "Thiago P", :number => 3)
       @user2 = User.using(:brazil).create!(:name => "Thiago", :number => 1)
       @user3 = User.using(:brazil).create!(:name => "Thiago", :number => 2)
-    
+
       User.using(:brazil).where(:name => "Thiago").where(:number => 4).order(:number).all.should == []
       User.using(:brazil).where(:name => "Thiago").using(:canada).where(:number => 2).using(:brazil).order(:number).all.should == [@user3]
       User.using(:brazil).where(:name => "Thiago").using(:canada).where(:number => 4).using(:brazil).order(:number).all.should == []
     end
   end
-  
+
   it "should raise a exception when trying to send a query to a shard that don't exists" do
     lambda { User.using(:dont_exists).all }.should raise_exception("Nonexistent Shard Name: dont_exists")
   end

data/spec/octopus/sharded_spec.rb

@@ -1,33 +1,33 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "spec_helper"
 
 describe "when the database is not entire sharded" do
   before(:each) do
     Octopus.stub!(:env).and_return("not_entire_sharded")
-    clean_connection_proxy()
+    OctopusHelper.clean_connection_proxy()
   end
- 
+
   it "should not send all queries to the specified slave" do
     pending()
     # User.create!(:name => "Thiago")
-    # 
-    # using_environment :not_entire_sharded do 
+    #
+    # using_environment :not_entire_sharded do
     #   Octopus.using(:russia) do
     #     User.create!(:name => "Thiago")
     #   end
     # end
-    # 
+    #
     # User.count.should == 2
   end
-  
+
   it "should pick the shard based on current_shard when you have a sharded model" do
     Cat.create!(:name => "Thiago")
 
-    using_environment :not_entire_sharded do 
+    OctopusHelper.using_environment :not_entire_sharded do
       Octopus.using(:russia) do
         Cat.create!(:name => "Thiago")
       end
     end
-    
+
     Cat.count.should == 1
   end
 end

data/spec/spec_helper.rb

@@ -1,20 +1,18 @@
 require "rubygems"
-require "bundler"
-
-Bundler.setup()
-
-require File.expand_path(File.dirname(__FILE__)) + "/database_connection"
+require "pry"
+require "bundler/setup"
 require "octopus"
-require "octopus_helper"
-require "action_controller"
-require 'rspec/core'
 
-MIGRATIONS_ROOT = File.expand_path(File.join(File.dirname(__FILE__),  'migrations'))
+Octopus.instance_variable_set(:@directory, File.dirname(__FILE__))
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
   config.before(:each) do
-    Octopus.stub!(:directory).and_return(File.dirname(__FILE__))
-    require "database_models"
-    clean_all_shards()
+    OctopusHelper.clean_all_shards(example.metadata[:shards])
   end
 end
+
+$: << File.expand_path(File.join(File.dirname(__FILE__), "support"))

data/spec/support/active_record/connection_adapters/modify_config_adapter.rb

@@ -0,0 +1,17 @@
+module ActiveRecord
+  class Base
+    def self.modify_config_connection(config)
+      ConnectionAdapters::ModifyConfigAdapter.new(config)
+    end
+  end
+  
+  module ConnectionAdapters
+    class ModifyConfigAdapter < AbstractAdapter
+      
+      def initialize(config)
+        config.replace(config.symbolize_keys)
+      end
+      
+    end
+  end
+end