ar-octopus 0.3.4 → 0.4.0

data/sample_app/config/shards.yml

@@ -1,5 +1,5 @@
 octopus:
-  enviroments:
+  environments:
     - development
     - test
   development:

data/sample_app/features/migrate.feature

@@ -39,6 +39,7 @@ Feature: rake db:migrate
     When I run inside my Rails project "rake db:abort_if_pending_migrations" with enviroment "development"  
     Then the output should contain "pending migrations"
     When I run inside my Rails project "rake db:migrate" with enviroment "development"  
-    When I run inside my Rails project "rake db:abort_if_pending_migrations" with enviroment "development"  
+    When I run inside my Rails project "rake db:abort_if_pending_migrations RAILS_ENV=development" with enviroment "development"  
     Then the output should not contain "pending migrations"
+    
   

data/sample_app/features/step_definitions/seeds_steps.rb

@@ -1,6 +1,4 @@
 Then /^the "([^"]*)" shard should have one user named "([^"]*)"$/ do |shard_name, user_name|
-  # TODO - WTF?! - Why we need to instantiate a new proxy?
-  Thread.current[:connection_proxy] = nil
   User.using(shard_name.to_sym).where(:name => user_name).count.should == 1
 end
 
@@ -11,5 +9,5 @@ Then /^the version of "([^"]*)" shard should be "([^"]*)"$/ do |shard_name, vers
 end
 
 When /^I run inside my Rails project "([^"]*)" with enviroment "([^"]*)"$/ do |command, enviroment|
-  run(unescape("cd #{Rails.root.to_s} && RAILS_ENV=#{enviroment} #{command}"), false)
+  run("cd #{Rails.root.to_s} && RAILS_ENV=#{enviroment} #{command}")
 end

data/sample_app/features/support/env.rb

@@ -17,6 +17,7 @@ require 'capybara/rails'
 require 'capybara/cucumber'
 require 'capybara/session'
 require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript
+require 'aruba/cucumber'
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
 # order to ease the transition to Capybara we set the default here. If you'd
 # prefer to use XPath just remove this line and adjust any selectors in your
@@ -57,6 +58,13 @@ if defined?(ActiveRecord::Base)
   end
 end
 
+After do 
+  `rm #{Rails.root.to_s}/db/america.sqlite3`
+  `rm #{Rails.root.to_s}/db/asia.sqlite3`
+  `rm #{Rails.root.to_s}/db/development.sqlite3`
+  `rm #{Rails.root.to_s}/db/europe.sqlite3`
+end
+
 Before do 
   `rm #{Rails.root.to_s}/db/america.sqlite3`
   `rm #{Rails.root.to_s}/db/asia.sqlite3`

data/spec/config/shards.yml

@@ -1,5 +1,5 @@
 mysql: &mysql
-  adapter: <%= 'mysql' %>
+  adapter: <%= 'mysql2' %>
   host: localhost
 
 octopus:
@@ -7,18 +7,18 @@ octopus:
     alone_shard:
       database: octopus_shard5
       <<: *mysql
-    
+
     postgresql_shard:
       adapter: postgresql
-      username: postgres
+      username: <%= ENV['POSTGRES_USER'] || 'postgres'%>
       password:
       database: octopus_shard1
       encoding: unicode
-    
+
     sqlite_shard:
       adapter: sqlite3
       database: /tmp/database.sqlite3
-    
+
     history_shards:
       aug2009:
         database: octopus_shard2
@@ -29,7 +29,7 @@ octopus:
       aug2011:
         database: octopus_shard4
         <<: *mysql
-    
+
     country_shards:
       canada:
         database: octopus_shard2
@@ -40,24 +40,24 @@ octopus:
       russia:
         database: octopus_shard4
         <<: *mysql
-        
-        
+
+
 production_raise_error:
   shards:
     history_shards:
       duplicated_shard_name:
         database: octopus_shard5
         <<: *mysql
-    
+
     country_shards:
       duplicated_shard_name:
         database: octopus_shard4
         <<: *mysql
-        
+
 production_replicated:
   replicated: true
   fully_replicated: false
-  
+
   shards:
     slave1:
       database: octopus_shard2
@@ -88,7 +88,7 @@ production_fully_replicated:
     slave4:
       database: octopus_shard5
       <<: *mysql
-      
+
 octopus_rails:
   replicated: true
   verify_connection: true
@@ -127,5 +127,3 @@ not_entire_sharded:
     russia:
       database: octopus_shard5
       <<: *mysql
-  
-      

data/spec/database_connection.rb

@@ -1,4 +1,4 @@
 require 'rubygems'
 require 'active_record'
 
-ActiveRecord::Base.establish_connection(:adapter => "mysql", :database => "octopus_shard1", :username => "root", :password => "")
+ActiveRecord::Base.establish_connection(:adapter => "mysql2", :database => "octopus_shard1", :username => "root", :password => "")

data/spec/database_models.rb

@@ -21,7 +21,7 @@ end
 
 #This class sets its own connection
 class CustomConnection < ActiveRecord::Base
-  octopus_establish_connection(:adapter => "mysql", :database => "octopus_shard2", :username => "root", :password => "")
+  octopus_establish_connection(:adapter => "mysql2", :database => "octopus_shard2", :username => "root", :password => "")
 end
 
 #This items belongs to a client
@@ -58,7 +58,7 @@ class Assignment < ActiveRecord::Base
 end
 
 class Programmer < ActiveRecord::Base
-  has_many :assignments 
+  has_many :assignments
   has_many :projects, :through => :assignments
 end
 
@@ -70,3 +70,8 @@ end
 class Comment < ActiveRecord::Base
   belongs_to :commentable, :polymorphic => true
 end
+
+
+class Bacon < ActiveRecord::Base
+  octopus_set_table_name "yummy"
+end

data/spec/migrations/5_create_users_on_multiples_groups.rb

@@ -1,5 +1,5 @@
 class CreateUsersOnMultiplesGroups < ActiveRecord::Migration
-  using_group(:country_shards, :history_shards)
+  using_group('country_shards', 'history_shards')
   
   def self.up
     User.create!(:name => "MultipleGroup")
@@ -8,4 +8,4 @@ class CreateUsersOnMultiplesGroups < ActiveRecord::Migration
   def self.down
     User.delete_all()
   end
-end
+end

data/spec/octopus/association_spec.rb

@@ -654,4 +654,4 @@ describe Octopus::Association do
       end
     end
   end
-end
+end

data/spec/octopus/controller_spec.rb

@@ -22,7 +22,7 @@ describe "Rails Controllers" do
 
     if Octopus.rails3?
       a = UsersControllers.new
-      a.stub!(:request).and_return(mock({:fullpath => "", :filtered_parameters => {}, :formats => ["xml"], :method => "GET"}))
+      a.stub!(:request).and_return(mock({:fullpath => "", :filtered_parameters => {}, :formats => [mock(:to_sym => :xml, :ref => "xml")], :method => "GET"}))
       a.instance_variable_set(:@_response, mock(:content_type => "xml", :body= => "", :status => 401))
       a.process(:create)
       User.using(:brazil).find_by_name("ActionController").should_not be_nil
@@ -31,4 +31,4 @@ describe "Rails Controllers" do
       pending()
     end
   end
-end
+end

data/spec/octopus/logger_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Octopus::Logger 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
+
+	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

data/spec/octopus/model_spec.rb

@@ -5,15 +5,29 @@ 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 
+      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 to pass a string as the shard name to a AR subclass' do
+      User.using('canada').create!(:name => 'Rafael Pilha')
+
+      User.using('canada').find_by_name('Rafael Pilha').should_not be_nil
+    end
+
+    it 'should allow to pass a string as the shard name to a block' do
+      Octopus.using('canada') do
+        User.create!(:name => 'Rafael Pilha')
+      end
+
+      User.using('canada').find_by_name('Rafael Pilha').should_not be_nil
+    end
+
     it "should allow selecting the shards on scope" do
       User.using(:canada).create!(:name => 'oi')
       User.using(:canada).count.should == 1
@@ -44,11 +58,11 @@ describe Octopus::Model do
       User.create!(:name => 'oi')
       User.count.should == 1
     end
-    
+
     it "should ensure that the connection will be cleaned" do
       ActiveRecord::Base.connection.current_shard.should == :master
       begin
-        Octopus.using(:canada) do 
+        Octopus.using(:canada) do
           raise "Some Exception"
         end
       rescue
@@ -61,7 +75,7 @@ describe Octopus::Model do
       User.using(:canada).create([{ :name => 'America User 1' }, { :name => 'America User 2' }])
       User.create!(:name => "Thiago")
       User.using(:canada).find_by_name("America User 1").should_not be_nil
-      User.using(:canada).find_by_name("America User 2").should_not be_nil      
+      User.using(:canada).find_by_name("America User 2").should_not be_nil
       User.using(:master).find_by_name("Thiago").should_not be_nil
     end
 
@@ -110,7 +124,7 @@ describe Octopus::Model do
         u.current_shard.should == :alone_shard
         User.using(:canada).create!(:name => 'oi')
         u = User.using(:canada).find_by_name("oi")
-        u.current_shard.should == :canada      
+        u.current_shard.should == :canada
       end
 
       it "should store the attribute when you find multiple instances" do
@@ -136,7 +150,7 @@ describe Octopus::Model do
         u.reload
         u.name.should == "Alone"
       end
-      
+
       it "should work passing some arguments to reload method" do
         User.using(:alone_shard).create!(:name => "Alone")
         u = User.using(:alone_shard).find_by_name("Alone")
@@ -153,7 +167,7 @@ describe Octopus::Model do
 
         User.using(:canada).count.should == 1
         User.using(:master).count.should == 0
-        User.count.should == 0      
+        User.count.should == 0
       end
 
       it "should allow execute queries inside a model" do
@@ -175,20 +189,21 @@ describe Octopus::Model 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 == "MySQL"
+        User.using(:alone_shard).arel_engine.connection.adapter_name.should == "Mysql2"
       end
     end
 
     it "should works with writes and reads" do
-      u = User.using(:postgresql_shard).create!(:name => "PostgreSQL User")      
-      User.using(:postgresql_shard).find(:all).should == [u]      
+      u = User.using(:postgresql_shard).create!(:name => "PostgreSQL User")
+      User.using(:postgresql_shard).find(:all).should == [u]
       User.using(:alone_shard).find(:all).should == []
+      User.connection_handler.connection_pools["ActiveRecord::Base"] = User.connection.instance_variable_get(:@shards)[:master]
     end
   end
 
   describe "AR basic methods" do
-    it "establish_connection" do
-      CustomConnection.connection.current_database.should == "octopus_shard2" 
+    it "octopus_establish_connection" do
+      CustomConnection.connection.current_database.should == "octopus_shard2"
     end
 
     it "increment" do
@@ -196,7 +211,7 @@ describe Octopus::Model do
       u = User.using(:brazil).find_by_number(10)
       u.increment(:number)
       u.save()
-      u = User.using(:brazil).find_by_number(11).should_not be_nil        
+      u = User.using(:brazil).find_by_number(11).should_not be_nil
     end
 
     it "increment!" do
@@ -231,15 +246,15 @@ describe Octopus::Model do
     it "update_attributes" do
       @user = User.using(:brazil).create!(:name => "User1")
       @user2 = User.using(:brazil).find(@user.id)
-      @user2.update_attributes(:name => "Joaquim")  
-      User.using(:brazil).find_by_name("Joaquim").should_not be_nil    
+      @user2.update_attributes(:name => "Joaquim")
+      User.using(:brazil).find_by_name("Joaquim").should_not be_nil
     end
 
     it "using update_attributes inside a block" do
       Octopus.using(:brazil) do
         @user = User.create!(:name => "User1")
         @user2 = User.find(@user.id)
-        @user2.update_attributes(:name => "Joaquim")  
+        @user2.update_attributes(:name => "Joaquim")
       end
 
       User.find_by_name("Joaquim").should be_nil
@@ -249,7 +264,7 @@ describe Octopus::Model do
     it "update_attribute" do
       @user = User.using(:brazil).create!(:name => "User1")
       @user2 = User.using(:brazil).find(@user.id)
-      @user2.update_attribute(:name, "Joaquim")  
+      @user2.update_attribute(:name, "Joaquim")
       User.using(:brazil).find_by_name("Joaquim").should_not be_nil
     end
 
@@ -278,12 +293,12 @@ describe Octopus::Model do
         @user2.delete
         lambda { User.using(:brazil).find(@user2.id) }.should raise_error(ActiveRecord::RecordNotFound)
       end
-      
+
       it "delete within block shouldn't lose shard" do
         Octopus.using(:brazil) do
           @user2.delete
           @user3 = User.create(:name => "User3")
-          
+
           User.connection.current_shard.should == :brazil
           User.find(@user3.id).should == @user3
         end
@@ -293,12 +308,12 @@ describe Octopus::Model do
         @user2.destroy
         lambda { User.using(:brazil).find(@user2.id) }.should raise_error(ActiveRecord::RecordNotFound)
       end
-      
+
       it "destroy within block shouldn't lose shard" do
         Octopus.using(:brazil) do
           @user2.destroy
           @user3 = User.create(:name => "User3")
-          
+
           User.connection.current_shard.should == :brazil
           User.find(@user3.id).should == @user3
         end
@@ -306,11 +321,26 @@ describe Octopus::Model do
     end
   end
 
-  describe "when you have joins/include" do 
+  describe "when using set_table_name" do
+    it 'should work correctly' do
+      Bacon.using(:brazil).create!(:name => "YUMMMYYYY")
+    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
+        Keyboard.should_not_receive(:reset_table_name)
+        Keyboard.using(:master).create!("Master Cat")
+      end
+    end
+  end
+
+  describe "when you have joins/include" do
     before(:each) do
       @client1 = Client.using(:brazil).create(:name => "Thiago")
-      
-      Octopus.using(:canada) do 
+
+      Octopus.using(:canada) do
         @client2 = Client.create(:name => "Mike")
         @client3 = Client.create(:name => "Joao")
         @item1 = Item.create(:client => @client2, :name => "Item 1")
@@ -320,24 +350,24 @@ describe Octopus::Model do
         @part2 = Part.create(:item => @item1, :name => "Part 2")
         @part3 = Part.create(:item => @item2, :name => "Part 3")
       end
-      
+
       @item4 = Item.using(:brazil).create(:client => @client1, :name => "Item 4")
     end
-    
+
     it "should work with the rails 2.x syntax" do
-      items = Item.using(:canada).find(:all, :joins => :client, :conditions => { :clients => { :id => @client2.id } })      
+      items = Item.using(:canada).find(:all, :joins => :client, :conditions => { :clients => { :id => @client2.id } })
       items.should == [@item1, @item2]
     end
-    
+
     it "should work using the rails 3.x syntax" do
       if Octopus.rails3?
         items = Item.using(:canada).joins(:client).where("clients.id = #{@client2.id}").all
-        items.should == [@item1, @item2]      
+        items.should == [@item1, @item2]
       end
     end
-    
+
     it "should work for include also, rails 2.x syntax" do
-      items = Item.using(:canada).find(:all, :include => :client, :conditions => { :clients => { :id => @client2.id } })      
+      items = Item.using(:canada).find(:all, :include => :client, :conditions => { :clients => { :id => @client2.id } })
       items.should == [@item1, @item2]
     end
 
@@ -347,13 +377,13 @@ describe Octopus::Model do
         items.should == [@item1, @item2]
       end
     end
-    
+
     it "should work for multiple includes, with rails 2.x syntax" do
       parts = Part.using(:canada).find(:all, :include => {:item => :client}, :conditions => {:clients => { :id => @client2.id}})
       parts.should == [@part1, @part2, @part3]
       parts.first.item.client.should == @client2
     end
-    
+
     it "should work for multiple join, with rails 2.x syntax" do
       parts = Part.using(:canada).find(:all, :joins => {:item => :client}, :conditions => {:clients => { :id => @client2.id}})
       parts.should == [@part1, @part2, @part3]
@@ -377,13 +407,13 @@ describe Octopus::Model do
 
   describe "#replicated_model method" do
     it "should be replicated" do
-      using_environment :production_replicated do 
+      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 
+      using_environment :production_replicated do
         User.read_inheritable_attribute(:replicated).should be_false
         Cat.read_inheritable_attribute(:replicated).should be_true
       end