ar-octopus 0.3.4 → 0.4.0

data/spec/octopus/octopus_spec.rb

@@ -1,35 +1,64 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Octopus do
-  describe "#config method" do
+  describe "#config" do
     it "should load shards.yml file to start working" do
-      Octopus.config().should be_kind_of(Hash)
+      Octopus.config().should be_kind_of(HashWithIndifferentAccess)
+    end
+
+    describe "when config file doesn't exist" do
+      before(:each) do
+        Octopus.stub!(:directory).and_return('/tmp')
+        Octopus.instance_variable_set(:@config, nil)
+      end
+
+      it "should return an empty HashWithIndifferentAccess" do
+        Octopus.config().should == HashWithIndifferentAccess.new
+      end
     end
   end
 
-  describe "#directory method" do
+  describe "#directory" do
     it "should return the directory that contains the shards.yml file" do
       Octopus.directory().should == File.expand_path(File.dirname(__FILE__) + "/../")
     end
   end
 
-  describe "#env method" do
+  describe "#env" do
     it "should return 'production' when is outside of a rails application" do
       Octopus.env().should == 'octopus'
     end
   end
-  
-  describe "#setup method" do    
+
+
+  describe "#shards=" do
+    after(:each) do
+      Octopus.instance_variable_set(:@config, nil)
+      Thread.current[:connection_proxy] = Octopus::Proxy.new(Octopus.config())
+    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 => ""}}
+      end
+
+      lambda { User.using(:crazy_shard).create!(:name => "Joaquim")  }.should_not raise_error
+    end
+  end
+
+  describe "#setup" do
     it "should have the default octopus environment as production" do
       Octopus.environments.should == ["production"]
     end
-    
+
     it "should allow the user to configure the octopus environments" do
       Octopus.setup do |config|
         config.environments = [:production, :staging]
       end
-      
-      Octopus.environments.should == ['production', 'staging']      
+
+      Octopus.environments.should == ['production', 'staging']
 
       Octopus.setup do |config|
         config.environments = [:production]

data/spec/octopus/proxy_spec.rb

@@ -3,45 +3,75 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe Octopus::Proxy do
   let(:proxy) { Octopus::Proxy.new(Octopus.config()) }
 
-  describe "creating a new instance" do    
+  describe "creating a new instance" do
     it "should initialize all shards and groups" do
-      proxy.instance_variable_get(:@shards).keys.to_set.should == [:postgresql_shard, :alone_shard, :aug2011, :canada, :brazil, :aug2009, :russia, :aug2010, :master, :sqlite_shard].to_set
-      proxy.instance_variable_get(:@groups).should == {:country_shards=>[:canada, :brazil, :russia], :history_shards=>[:aug2009, :aug2010, :aug2011]}
+      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]}
     end
 
     it "should initialize the block attribute as false" do
       proxy.block.should be_false
-    end    
+    end
 
     it "should initialize replicated attribute as false" do
-      proxy.instance_variable_get(:@replicated).should be_false      
+      proxy.instance_variable_get(:@replicated).should be_false
     end
-    
+
     it "should not verify connections for default" do
       proxy.instance_variable_get(:@verify_connection).should be_false
     end
-    
+
     it "should work with thiking sphinx" do
-      proxy.instance_variable_get(:@config).should == {:adapter=>"mysql", :password=>"", :database=>"octopus_shard1", :username=>"root"}
+      proxy.instance_variable_get(:@config).should == {:adapter=>"mysql2", :password=>"", :database=>"octopus_shard1", :username=>"root", :flags=>2}
+    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"]
+    end
+
+    it 'should respond correctly to respond_to?(:pk_and_sequence_for)' do
+      proxy.respond_to?(:pk_and_sequence_for).should be_true
+    end
+
+    it 'should respond correctly to respond_to?(:primary_key)' do
+      proxy.respond_to?(:primary_key).should be_true
+    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
+      end
+
+      context "when using a environment with a single table name" do
+        before(:each) do
+          set_octopus_env("production_replicated")
+        end
+
+        it 'should return false' do
+          proxy.should_clean_table_name?.should be_false
+        end
+      end
     end
 
     describe "should raise error if you have duplicated shard names" do
       before(:each) do
-        set_octopus_env("production_raise_error")                      
+        set_octopus_env("production_raise_error")
       end
 
       it "should raise the error" do
-        lambda { proxy }.should raise_error("You have duplicated shard names!")        
+        lambda { proxy }.should raise_error("You have duplicated shard names!")
       end
     end
 
     describe "should initialize just the master when you don't have a shards.yml file" do
       before(:each) do
-        set_octopus_env("crazy_environment")              
+        set_octopus_env("crazy_environment")
       end
 
       it "should initialize just the master shard" do
-        proxy.instance_variable_get(:@shards).keys.should == [:master]
+        proxy.instance_variable_get(:@shards).keys.should == ["master"]
       end
 
       it "should not initialize the groups variable" do
@@ -56,7 +86,7 @@ describe Octopus::Proxy do
 
   describe "when you have a replicated environment" do
     before(:each) do
-      set_octopus_env("production_replicated")      
+      set_octopus_env("production_replicated")
     end
 
     it "should have the replicated attribute as true" do
@@ -81,24 +111,24 @@ describe Octopus::Proxy do
 
       proxy.instance_variable_get(:@replicated).should be_true
       proxy.instance_variable_get(:@verify_connection).should be_true
-      Octopus.environments.should == ["staging", "production"] 
+      Octopus.environments.should == ["staging", "production"]
     end
 
     it "should initialize correctly the shards for the staging environment" do
       Rails.stub!(:env).and_return('staging')
 
-      proxy.instance_variable_get(:@shards).keys.to_set.should == Set.new([:slave1, :slave2, :master])
+      proxy.instance_variable_get(:@shards).keys.to_set.should == Set.new(["slave1", "slave2", "master"])
     end
 
     it "should initialize correctly the shards for the production environment" do
       Rails.stub!(:env).and_return('production')
 
-      proxy.instance_variable_get(:@shards).keys.to_set.should == Set.new([:slave3, :slave4, :master])
+      proxy.instance_variable_get(:@shards).keys.to_set.should == Set.new(["slave3", "slave4", "master"])
     end
 
     describe "using the master connection" do
       before(:each) do
-        Rails.stub!(:env).and_return('development')        
+        Rails.stub!(:env).and_return('development')
       end
 
       it "should use the master connection" do
@@ -113,9 +143,9 @@ describe Octopus::Proxy do
 
         user.name = "New Thiago"
         user.save()
-        
+
         User.using(:russia).find_by_name("New Thiago").should == user
-        User.find_by_name("New Thiago").should == user    
+        User.find_by_name("New Thiago").should == user
       end
 
       it "should work when using blocks" do
@@ -125,7 +155,7 @@ describe Octopus::Proxy do
 
         User.find_by_name("Thiago").should == @user
       end
-      
+
       it "should work with associations" do
         u = Client.create!(:name => "Thiago")
         i = Item.create(:name => "Item")
@@ -144,29 +174,29 @@ describe Octopus::Proxy do
   describe "returning the correct connection" do
     describe "should return the shard name" do
       it "when current_shard is empty" do
-        proxy.shard_name.should == :master        
+        proxy.shard_name.should == :master
       end
 
       it "when current_shard is a single shard" do
         proxy.current_shard = :canada
-        proxy.shard_name.should == :canada        
+        proxy.shard_name.should == :canada
       end
 
       it "when current_shard is more than one shard" do
         proxy.current_shard = [:russia, :brazil]
-        proxy.shard_name.should == :russia              
+        proxy.shard_name.should == :russia
       end
     end
 
     describe "should return the connection based on shard_name" do
       it "when current_shard is empty" do
-        proxy.select_connection().should == proxy.instance_variable_get(:@shards)[:master].connection()        
+        proxy.select_connection().should == proxy.instance_variable_get(:@shards)[:master].connection()
       end
 
       it "when current_shard is a single shard" do
         proxy.current_shard = :canada
-        proxy.select_connection().should == proxy.instance_variable_get(:@shards)[:canada].connection()       
+        proxy.select_connection().should == proxy.instance_variable_get(:@shards)[:canada].connection()
       end
     end
   end
-end
+end

data/spec/octopus/replication_specs.rb

@@ -68,5 +68,18 @@ describe "when the database is replicated and the entire application is replicat
       k.errors.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
+      Cat.create!(:name => "Slave Cat")
+      Cat.connection.current_shard.should eql(:master)
+      begin
+        Cat.find(:all, :conditions => 'rubbish = true')
+      rescue
+      end
+      Cat.connection.current_shard.should eql(:master)
+    end
+  end
 end
 

data/spec/octopus/scope_proxy_spec.rb

@@ -16,4 +16,4 @@ describe Octopus::ScopeProxy do
   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
-end
+end

data/spec/octopus/sharded_spec.rb

@@ -30,4 +30,4 @@ describe "when the database is not entire sharded" do
     
     Cat.count.should == 1
   end
-end
+end

data/spec/octopus_helper.rb

@@ -1,7 +1,8 @@
 def clean_all_shards()
-  ActiveRecord::Base.using(:master).connection.instance_variable_get(:@shards).keys.each do |shard_symbol|
-    ['schema_migrations', 'users', 'clients', 'cats', 'items', 'keyboards', 'computers', 'permissions_roles', 'roles', 'permissions', 'assignments', 'projects', 'programmers'].each do |tables|
-      ActiveRecord::Base.using(shard_symbol).connection.execute("DELETE FROM #{tables};") 
+  @@shards ||= ActiveRecord::Base.using(:master).connection.instance_variable_get(:@shards).keys
+  @@shards.each do |shard_symbol|
+    ['schema_migrations', 'users', 'clients', 'cats', 'items', 'keyboards', 'computers', 'permissions_roles', 'roles', 'permissions', 'assignments', 'projects', 'programmers', "yummy"].each do |tables|
+      ActiveRecord::Base.using(shard_symbol).connection.execute("DELETE FROM #{tables}") 
     end
   end
 end
@@ -33,4 +34,4 @@ end
 def set_octopus_env(env)
   Octopus.instance_variable_set(:@config, nil)
   Octopus.stub!(:env).and_return(env)
-end
+end

data/spec/spec_helper.rb

@@ -17,8 +17,4 @@ RSpec.configure do |config|
     require "database_models"
     clean_all_shards()
   end
-
-  config.after(:each) do
-    clean_all_shards()
-  end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
   - 4
-  version: 0.3.4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -16,14 +16,44 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-09 00:00:00 -02:00
+date: 2011-07-03 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  name: rspec
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 3
+        - 0
+        - 6
+        version: 3.0.6
+  type: :runtime
+  requirement: *id001
+  name: activerecord
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 3
+        - 0
+        - 6
+        version: 3.0.6
+  type: :runtime
+  requirement: *id002
+  name: actionpack
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -36,28 +66,26 @@ dependencies:
         - beta
         - 19
         version: 2.0.0.beta.19
-  requirement: *id001
+  type: :development
+  requirement: *id003
+  name: rspec
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  name: mysql
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 45
+        hash: 3
         segments: 
-        - 2
-        - 8
-        - 1
-        version: 2.8.1
-  requirement: *id002
+        - 0
+        version: "0"
+  type: :development
+  requirement: *id004
+  name: mysql2
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  name: pg
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -68,12 +96,12 @@ dependencies:
         - 9
         - 0
         version: 0.9.0
-  requirement: *id003
+  type: :development
+  requirement: *id005
+  name: pg
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  name: sqlite3-ruby
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -84,12 +112,12 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  requirement: *id004
+  type: :development
+  requirement: *id006
+  name: sqlite3-ruby
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -99,12 +127,12 @@ dependencies:
         - 1
         - 4
         version: "1.4"
-  requirement: *id005
+  type: :development
+  requirement: *id007
+  name: jeweler
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  name: actionpack
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -114,12 +142,12 @@ dependencies:
         - 2
         - 3
         version: "2.3"
-  requirement: *id006
+  type: :development
+  requirement: *id008
+  name: actionpack
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :runtime
-  name: activerecord
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,7 +157,9 @@ dependencies:
         - 2
         - 3
         version: "2.3"
-  requirement: *id007
+  type: :runtime
+  requirement: *id009
+  name: activerecord
 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: []
@@ -139,7 +169,6 @@ extensions: []
 extra_rdoc_files: 
 - README.mkdn
 files: 
-- .gitignore
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -152,11 +181,13 @@ files:
 - lib/octopus/association.rb
 - lib/octopus/association_collection.rb
 - lib/octopus/has_and_belongs_to_many_association.rb
+- lib/octopus/logger.rb
 - lib/octopus/migration.rb
 - lib/octopus/model.rb
 - lib/octopus/proxy.rb
 - lib/octopus/rails2/association.rb
 - lib/octopus/rails2/persistence.rb
+- lib/octopus/rails3/arel.rb
 - lib/octopus/rails3/association.rb
 - lib/octopus/rails3/persistence.rb
 - lib/octopus/scope_proxy.rb
@@ -244,6 +275,7 @@ files:
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
 - spec/octopus/association_spec.rb
 - spec/octopus/controller_spec.rb
+- spec/octopus/logger_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb
@@ -258,8 +290,8 @@ homepage: http://github.com/tchandy/octopus
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -283,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Easy Database Sharding for ActiveRecord
@@ -305,6 +337,7 @@ test_files:
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
 - spec/octopus/association_spec.rb
 - spec/octopus/controller_spec.rb
+- spec/octopus/logger_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb