ar-octopus 0.0.24 → 0.0.25

data/README.mkdn

@@ -1,26 +1,26 @@
-<h1> Octopus  - Easy Database Sharding for ActiveRecord</h1>
+# Octopus  - Easy Database Sharding for ActiveRecord
 
-<p> Octopus is a better way to do Database Sharding in ActiveRecord. Sharding allows multiple databases in the same rails application. While there are several projects that implement Sharding (e.g. DbCharmer, DataFabric, MultiDb), each project has its own limitations. The main goal of octopus project is to provide a nice and clean way of doing Database Sharding.</p>
+Octopus is a better way to do Database Sharding in ActiveRecord. Sharding allows multiple databases in the same rails application. While there are several projects that implement Sharding (e.g. DbCharmer, DataFabric, MultiDb), each project has its own limitations. The main goal of octopus project is to provide a nice and clean way of doing Database Sharding.
 
-<h2>Feature list: </h2>
-<p> The design of the api is made to be simple as possible. Octopus is focusing in the end user, giving the power of multiple databases, but with reliable code and flexibility. Octopus is focused on Rails 3, but is compatible with Rails 2.x.</p>
+## Feature list:
+The design of the api is made to be simple as possible. Octopus is focusing in the end user, giving the power of multiple databases, but with reliable code and flexibility. Octopus is focused on Rails 3, but is compatible with Rails 2.x.
 
-<p> Octopus supports: </p>
+Octopus supports:
 
 - Sharding (with multiple shards, and grouped shards).
 - Replication (Master/slave support, with multiple slaves).
 - Moving data between shards with migrations.
 - Tools to manage database configurations. (soon)
 
-<h3> Replication </h3>
-<p> When using replication, all writes queries will be sent to master, and read queries to slaves. More info could be found at: <a href="http://wiki.github.com/tchandy/octopus/replication"> Wiki</a> </p>
+### Replication
+When using replication, all writes queries will be sent to master, and read queries to slaves. More info could be found at: <a href="http://wiki.github.com/tchandy/octopus/replication"> Wiki</a>
 
-<h3> Sharding </h3>
-<p> When using sharding, you need to specify what shard the query will be sent. Octopus support selecting the shard inside a controller, or manually in each object. More could be found at <a href="http://wiki.github.com/tchandy/octopus/sharding"> Wiki</a> </p>
+### Sharding
+ When using sharding, you need to specify what shard the query will be sent. Octopus support selecting the shard inside a controller, or manually in each object. More could be found at <a href="http://wiki.github.com/tchandy/octopus/sharding"> Wiki</a> 
 
-<h2> Install </h2>
+## Install 
 
-<h3> Rails 2.x </h3>
+### Rails 2.x 
 
 Install  the octopus gem:
 <pre> sudo gem install ar-octopus </pre>
@@ -28,7 +28,7 @@ Install  the octopus gem:
 Add this line to enviroment.rb:
 <pre>config.gem 'ar-octopus', :lib => "octopus"</pre>
 
-<h3> Rails 3.x </h3>
+### Rails 3.x 
 
 Add this line to Gemfile:
 <pre>gem 'ar-octopus', :require => "octopus"</pre>
@@ -36,21 +36,23 @@ Add this line to Gemfile:
 Runs a bundle install:
 <pre>bundle install</pre>
 
-<h2> How to use Octopus? </h2>
-<p>First, you need to create a config file, shards.yml, inside your config/ directory. to see the syntax and how this file should look, please checkout <a href="http://wiki.github.com/tchandy/octopus/config-file">this page on wiki</a></p>.
+## How to use Octopus? 
 
-<h3> Syntax </h3>
-<p>Octopus adds a method to each AR Class and object. the using method is used to select the shard, like this: </p>
+First, you need to create a config file, shards.yml, inside your config/ directory. to see the syntax and how this file should look, please checkout <a href="http://wiki.github.com/tchandy/octopus/config-file">this page on wiki</a>.
+
+### Syntax 
+
+Octopus adds a method to each AR Class and object. the using method is used to select the shard, like this: 
 <pre>User.where(:name => "Thiago").limit(3).using(:slave_one) </pre>
 
-<p> Octopus also supports queries inside block. When you pass a block to the using method, all queries inside the block will be sent to the specified shard. </p>
+ Octopus also supports queries inside block. When you pass a block to the using method, all queries inside the block will be sent to the specified shard. 
 <pre>
 User.using(:slave_two) do 
   User.create(:name => "Mike")
 end
 </pre>
 
-<p> Each object knows where is your shard, so you could to thinks like this:</p>
+ Each object knows where is your shard, so you could to thinks like this:
 <pre> 
 # This will find the user in the shard1
 @user = User.using(:shard1).find_by_name("Joao")
@@ -65,7 +67,7 @@ end
 @user.save()
 </pre>
 
-<p> In migrations, you also have access to the using method. The syntax is basically the same. This migration will run in brazil and canada shards.</p>
+ In migrations, you also have access to the using method. The syntax is basically the same. This migration will run in brazil and canada shards.
 <pre>
   class CreateUsersOnBothShards < ActiveRecord::Migration
     using(:brazil, :canada)
@@ -79,7 +81,7 @@ end
     end
   end
 </pre>
-<p> You also could send a migration to a group of shards.  This migration will be sent to all shards that belongs to history_shards group, specified in shards.yml: </p>
+ You also could send a migration to a group of shards.  This migration will be sent to all shards that belongs to history_shards group, specified in shards.yml: 
 <pre>
   class CreateUsersOnMultiplesGroups < ActiveRecord::Migration
     using_group(:history_shards)
@@ -94,14 +96,14 @@ end
   end
 </pre>
 
-<p> To see the complete list of features and syntax, please check out our <a href="http://wiki.github.com/tchandy/octopus/"> Wiki</a></p>
-<p>Wanna see sample rails applications using octopus features? please check it out: <a href="http://github.com/tchandy/octopus_sharding_example">Sharding Example</a> and <a href="http://github.com/tchandy/octopus_replication_example">Replication Example</a> </p>
+ To see the complete list of features and syntax, please check out our <a href="http://wiki.github.com/tchandy/octopus/"> Wiki</a>
+Wanna see sample rails applications using octopus features? please check it out: <a href="http://github.com/tchandy/octopus_sharding_example">Sharding Example</a> and <a href="http://github.com/tchandy/octopus_replication_example">Replication Example</a> 
   
-<h2>Thanks</h2>
+## Thanks
 
 This project is sponsored by the <a href="http://www.rubysoc.org">Ruby Summer of Code</a>,
 and my mentors <a href="http://github.com/mperham">Mike Perham</a> and <a href="http://github.com/amitagarwal">Amit Agarwal</a>.
 
-<h2>Copyright</h2>
+## Copyright
 
 Copyright (c) 2010 Thiago Pradi, released under the MIT license.

data/Rakefile

@@ -26,10 +26,13 @@ begin
     gem.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."
     gem.email = "tchandy@gmail.com"
     gem.homepage = "http://github.com/tchandy/octopus"
-    gem.authors = ["Thiago Pradi", "Mike Perham", "Amit Agarwal"]
+    gem.authors = ["Thiago Pradi", "Mike Perham"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "mysql", ">= 2.8.1"
+    gem.add_development_dependency "pg", ">= 0.9.0"
+    gem.add_development_dependency "sqlite3-ruby", ">= 1.3.1"
     gem.add_dependency('activerecord', '>= 3.0.0beta')
-    gem.version = "0.0.24"
+    gem.version = "0.0.25"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -147,6 +150,12 @@ namespace :db do
       ActiveRecord::Base.using(shard_symbol).connection.create_table(:projects) do |u|
         u.string :name
       end
+      
+      ActiveRecord::Base.using(shard_symbol).connection.create_table(:comments) do |u|
+        u.string :name
+        u.string :commentable_type
+        u.integer :commentable_id
+      end
     end
   end
   

data/ar-octopus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-octopus}
-  s.version = "0.0.24"
+  s.version = "0.0.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Thiago Pradi", "Mike Perham", "Amit Agarwal"]
-  s.date = %q{2010-07-14}
+  s.authors = ["Thiago Pradi", "Mike Perham"]
+  s.date = %q{2010-07-16}
   s.description = %q{This gem allows you to use sharded databases with ActiveRecord. this also provides a interface for replication and for running migrations with multiples shards.}
   s.email = %q{tchandy@gmail.com}
   s.extra_rdoc_files = [
@@ -107,13 +107,22 @@ 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_development_dependency(%q<mysql>, [">= 2.8.1"])
+      s.add_development_dependency(%q<pg>, [">= 0.9.0"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0beta"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<mysql>, [">= 2.8.1"])
+      s.add_dependency(%q<pg>, [">= 0.9.0"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
       s.add_dependency(%q<activerecord>, [">= 3.0.0beta"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<mysql>, [">= 2.8.1"])
+    s.add_dependency(%q<pg>, [">= 0.9.0"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
     s.add_dependency(%q<activerecord>, [">= 3.0.0beta"])
   end
 end

data/lib/octopus.rb

@@ -2,20 +2,20 @@ require "yaml"
 
 module Octopus
   def self.env()
-   @env ||= 'octopus'
+    @env ||= 'octopus'
   end
-  
+
   def self.rails_env()
     @rails_env ||= self.rails? ? Rails.env.to_s : 'shards'
   end
-  
+
   def self.config()
-    @config ||= HashWithIndifferentAccess.new(YAML.load_file(Octopus.directory() + "/config/shards.yml"))
-    
-    if !@config[Octopus.env].nil? && @config[Octopus.env()]['enviroments']
-      self.enviroments = @config[Octopus.env()]['enviroments']
+    @config ||= HashWithIndifferentAccess.new(YAML.load_file(Octopus.directory() + "/config/shards.yml"))[Octopus.env()]
+
+    if @config && @config['enviroments']
+      self.enviroments = @config['enviroments']
     end
-    
+
     @config
   end
 
@@ -24,26 +24,26 @@ module Octopus
   def self.directory()
     @directory ||= defined?(Rails) ?  Rails.root.to_s : Dir.pwd     
   end
-  
+
   # This is the default way to do Octopus Setup
   # Available variables:
   # :enviroments => the enviroments that octopus will run. default: :production
   def self.setup
     yield self
   end
-  
+
   def self.enviroments=(enviroments)
     @enviroments = enviroments.map { |element| element.to_s }
   end
-  
+
   def self.enviroments
     @enviroments || ['production']
   end
-  
+
   def self.rails3?
     ActiveRecord::VERSION::MAJOR == 3
   end
-  
+
   def self.rails?
     defined?(Rails) 
   end

data/lib/octopus/association.rb

@@ -1,4 +1,14 @@
 module Octopus::Association
+  def self.extended(base)
+    base.send(:include, InstanceMethods)
+  end
+
+  module InstanceMethods
+    def set_connection_on_association(record)
+      record.current_shard = self.connection.current_shard = self.current_shard if should_set_current_shard?
+    end
+  end
+
   def has_many(association_id, options = {}, &extension)
     default_octopus_opts(options)
     super
@@ -11,15 +21,19 @@ module Octopus::Association
 
   def default_octopus_opts(options)
     if options[:before_add].is_a?(Array)
-      options[:before_add] << :set_connection
+      options[:before_add] << :set_connection_on_association
+    elsif options[:before_add].is_a?(Symbol)
+      options[:before_add] = [:set_connection_on_association, options[:before_add]]      
     else
-      options[:before_add] = :set_connection
+      options[:before_add] = :set_connection_on_association
     end
 
     if options[:before_remove].is_a?(Array)
-      options[:before_remove] << :set_connection
+      options[:before_remove] << :set_connection_on_association
+    elsif options[:before_remove].is_a?(Symbol)
+      options[:before_remove] = [:set_connection_on_association, options[:before_remove]]      
     else
-      options[:before_remove] = :set_connection
+      options[:before_remove] = :set_connection_on_association
     end
   end
 end

data/lib/octopus/migration.rb

@@ -7,6 +7,7 @@ module Octopus::Migration
       
       alias_method_chain :migrate, :octopus
       alias_method_chain :announce, :octopus
+      attr_accessor :current_shard
     end
   end
 
@@ -17,6 +18,7 @@ module Octopus::Migration
       end
 
       self.connection().block = true
+      self.current_shard = args
       self.connection().current_shard = args        
     end
     
@@ -51,11 +53,12 @@ module Octopus::Migration
 
   def migrate_with_octopus(direction)
     conn = ActiveRecord::Base.connection
+    return migrate_without_octopus(direction) unless conn.is_a?(Octopus::Proxy)
+    self.connection().current_shard = self.current_shard if self.current_shard != nil
+    
     groups = conn.instance_variable_get(:@groups)
     
     begin
-      return migrate_without_octopus(direction) unless conn.is_a?(Octopus::Proxy)
-    
       if conn.current_group.is_a?(Array)
         conn.current_group.each { |group| conn.send_queries_to_multiple_shards(groups[group]) { migrate_without_octopus(direction) } } 
       elsif conn.current_group.is_a?(Symbol)       

data/lib/octopus/model.rb

@@ -33,13 +33,13 @@ module Octopus::Model
     def hijack_initializer()
       attr_accessor :current_shard
       after_initialize :set_current_shard
-      before_save :set_connection
+      before_save :reload_connection
 
       def set_current_shard
         if new_record? || self.connection.block
-          self.current_shard = self.class.connection_proxy.current_shard    
+          self.current_shard = self.connection.current_shard    
         else
-          self.current_shard = self.class.connection_proxy.last_current_shard  
+          self.current_shard = self.connection.last_current_shard  
         end
       end
 
@@ -75,21 +75,12 @@ module Octopus::Model
   module InstanceMethods
     include SharedMethods
 
-    def set_connection(*args)
-      if(args.size == 1)
-        arg = args.first
-        arg.current_shard = self.current_shard if arg.respond_to?(:current_shard) && should_set_current_shard?
-      end
-
-      self.connection.current_shard = self.current_shard if should_set_current_shard?
-    end
-
     def should_set_current_shard?
-      self.respond_to?(:current_shard) && self.current_shard != nil
+      self.respond_to?(:current_shard) && !self.current_shard.nil?
     end
 
     def reload_connection()
-      set_connection() if should_set_current_shard?
+      self.connection.current_shard = self.current_shard() if should_set_current_shard?
     end
   end
 

data/lib/octopus/proxy.rb

@@ -1,9 +1,9 @@
 class Octopus::Proxy
   attr_accessor :current_model, :current_shard, :current_group, :block, :using_enabled, :last_current_shard
 
-  def initialize(config)    
+  def initialize(config)
     initialize_shards(config)
-    initialize_replication(config) if have_config_for_enviroment?(config) && config[Octopus.env()]["replicated"]
+    initialize_replication(config) if !config.nil? && config["replicated"]
   end
 
   def initialize_shards(config)
@@ -12,10 +12,10 @@ class Octopus::Proxy
     @shards[:master] = ActiveRecord::Base.connection_pool()
     @current_shard = :master
     
-    if have_config_for_enviroment?(config) && Octopus.rails?
-      shards_config = config[Octopus.env()][Rails.env().to_s]["shards"]
-    elsif have_config_for_enviroment?(config)
-      shards_config = config[Octopus.env()]["shards"]
+    if !config.nil? && Octopus.rails?
+      shards_config = config[Rails.env().to_s]["shards"]
+    elsif !config.nil?
+      shards_config = config["shards"]
     end
     
     shards_config ||= []
@@ -39,7 +39,7 @@ class Octopus::Proxy
 
   def initialize_replication(config)
     @replicated = true
-    @entire_replicated = config[Octopus.env()]["entire_replicated"]
+    @entire_replicated = config["entire_replicated"]
     @slaves_list = @shards.keys.map {|sym| sym.to_s}.sort 
     @slaves_list.delete('master')   
   end
@@ -135,16 +135,12 @@ class Octopus::Proxy
   end
 
   def should_clean_connection?(method)
-    method.to_s =~ /insert|select|execute/ && !self.current_group && !@replicated && !self.block
+    method.to_s =~ /insert|select|execute/ && !@replicated && !self.block
   end
 
   def should_send_queries_to_replicated_databases?(method)
     @replicated && method.to_s =~ /select/
   end
-  
-  def have_config_for_enviroment?(config)
-    !config[Octopus.env()].nil?
-  end
 
   def send_queries_to_selected_slave(method, *args, &block)        
     old_shard = self.current_shard

data/lib/octopus/rails3/persistence.rb

@@ -1,10 +1,6 @@
 module Octopus
   module Rails3
     module Persistence
-      def reload_connection()
-        set_connection() if should_set_current_shard?
-      end
-
       def update_attribute(name, value)
         reload_connection()
         super

data/spec/config/shards.yml

@@ -15,7 +15,7 @@ octopus:
     #TODO - FIX THIS
     sqlite_shard:
       adapter: sqlite3
-      database: /Users/tchandy/Projetos/octopus/spec/database.sqlite3
+      database: /tmp/database.sqlite3
     
     history_shards:
       aug2009:

data/spec/database_models.rb

@@ -10,6 +10,7 @@ end
 #The client class isn't replicated
 class Client < ActiveRecord::Base
   has_many :items
+  has_many :comments, :as => :commentable
 end
 
 #This class is replicated
@@ -52,4 +53,8 @@ end
 class Project < ActiveRecord::Base
   has_many :assignments
   has_many :programmers, :through => :assignments
+end
+
+class Comment < ActiveRecord::Base
+  belongs_to :commentable, :polymorphic => true
 end

data/spec/octopus/association_spec.rb

@@ -503,4 +503,140 @@ describe Octopus::Association do
       end
     end
   end
+  
+  describe "when you have a 1 x N polymorphic relationship" do
+    before(:each) do
+      @brazil_client = Client.using(:brazil).create!(:name => "Brazil Client")
+      @master_client = Client.create!(:name => "Master Client")
+      @comment_brazil = Comment.using(:brazil).create!(:name => "Brazil Comment", :commentable => @brazil_client)
+      @comment_master = Comment.create!(:name => "Master Comment", :commentable => @master_client)
+      @brazil_client = Client.using(:brazil).find_by_name("Brazil Client")
+      Client.using(:master).create!(:name => "teste")        
+    end
+
+    it "should find all models in the specified shard" do
+      @brazil_client.comment_ids.should == [@comment_brazil.id]
+      @brazil_client.comments().should == [@comment_brazil]
+    end
+
+    it "should finds the client that the comment belongs" do
+      @comment_brazil.commentable.should == @brazil_client
+    end
+
+    it "should update the attribute for the comment" do
+      new_brazil_client = Client.using(:brazil).create!(:name => "new Client")
+      @comment_brazil.commentable = new_brazil_client
+      @comment_brazil.commentable.should == new_brazil_client
+      @comment_brazil.save()
+      @comment_brazil.reload
+      @comment_brazil.commentable_id.should == new_brazil_client.id
+      @comment_brazil.commentable().should == new_brazil_client
+    end
+
+    describe "it should works when using" do
+      before(:each) do
+        @comment_brazil_2 = Comment.using(:brazil).create!(:name => "Brazil Comment 2")
+        @brazil_client.comments.to_set.should == [@comment_brazil].to_set 
+      end
+
+      it "update_attributes" do
+        @brazil_client.update_attributes(:comment_ids => [@comment_brazil_2.id, @comment_brazil.id])
+        @brazil_client.comments.to_set.should == [@comment_brazil, @comment_brazil_2].to_set
+      end
+
+      it "update_attribute" do
+        @brazil_client.update_attribute(:comment_ids, [@comment_brazil_2.id, @comment_brazil.id])
+        @brazil_client.comments.to_set.should == [@comment_brazil, @comment_brazil_2].to_set
+      end
+
+      it "<<" do
+        @brazil_client.comments << @comment_brazil_2
+        @brazil_client.comments.to_set.should == [@comment_brazil, @comment_brazil_2].to_set
+      end
+
+      it "build" do
+        comment = @brazil_client.comments.build(:name => "Builded Comment")
+        comment.save()
+        @brazil_client.comments.to_set.should == [@comment_brazil, comment].to_set
+      end
+
+      it "create" do
+        comment = @brazil_client.comments.create(:name => "Builded Comment")
+        @brazil_client.comments.to_set.should == [@comment_brazil, comment].to_set          
+      end
+
+      it "count" do
+        @brazil_client.comments.count.should == 1
+        comment = @brazil_client.comments.create(:name => "Builded Comment")
+        @brazil_client.comments.count.should == 2
+      end
+
+      it "size" do
+        @brazil_client.comments.size.should == 1          
+        comment = @brazil_client.comments.create(:name => "Builded Comment")
+        @brazil_client.comments.size.should == 2          
+      end
+
+      it "create!" do
+        comment = @brazil_client.comments.create!(:name => "Builded Comment")
+        @brazil_client.comments.to_set.should == [@comment_brazil, comment].to_set                    
+      end
+
+      it "length" do
+        @brazil_client.comments.length.should == 1          
+        comment = @brazil_client.comments.create(:name => "Builded Comment")
+        @brazil_client.comments.length.should == 2                    
+      end
+
+      it "empty?" do
+        @brazil_client.comments.empty?.should be_false
+        c = Client.create!(:name => "Client1")
+        c.comments.empty?.should be_true
+      end
+
+      it "delete" do
+        @brazil_client.comments.empty?.should be_false
+        @brazil_client.comments.delete(@comment_brazil)
+        @brazil_client.reload
+        @comment_brazil.reload
+        @comment_brazil.commentable.should be_nil
+        @brazil_client.comments.should == []
+        @brazil_client.comments.empty?.should be_true
+      end
+
+      it "delete_all" do
+        @brazil_client.comments.empty?.should be_false     
+        @brazil_client.comments.delete_all                
+        @brazil_client.comments.empty?.should be_true
+      end
+
+      it "destroy_all" do
+        @brazil_client.comments.empty?.should be_false     
+        @brazil_client.comments.destroy_all                
+        @brazil_client.comments.empty?.should be_true
+      end
+
+      it "find" do
+        @brazil_client.comments.find(:first).should == @comment_brazil
+        @brazil_client.comments.destroy_all                
+        @brazil_client.comments.find(:first).should be_nil
+      end
+
+      it "exists?" do
+        @brazil_client.comments.exists?(@comment_brazil).should be_true
+        @brazil_client.comments.destroy_all                
+        @brazil_client.comments.exists?(@comment_brazil).should be_false     
+      end
+
+      it "uniq" do
+        @brazil_client.comments.uniq.should == [@comment_brazil]                
+      end        
+
+      it "clear" do
+        @brazil_client.comments.empty?.should be_false     
+        @brazil_client.comments.clear                
+        @brazil_client.comments.empty?.should be_true          
+      end
+    end
+  end
 end

data/spec/octopus/proxy_spec.rb

@@ -19,7 +19,7 @@ describe Octopus::Proxy do
 
     describe "should raise error if you have duplicated shard names" do
       before(:each) do
-        Octopus.stub!(:env).and_return("production_raise_error")        
+        set_octopus_env("production_raise_error")                      
       end
 
       it "should raise the error" do
@@ -29,7 +29,7 @@ describe Octopus::Proxy do
 
     describe "should initialize just the master when you don't have a shards.yml file" do
       before(:each) do
-        Octopus.stub!(:env).and_return("crazy_enviroment")        
+        set_octopus_env("crazy_enviroment")              
       end
 
       it "should initialize just the master shard" do
@@ -48,7 +48,7 @@ describe Octopus::Proxy do
 
   describe "when you have a replicated enviroment" do
     before(:each) do
-      Octopus.stub!(:env).and_return("production_replicated")
+      set_octopus_env("production_replicated")      
     end
 
     it "should have the replicated attribute as true" do
@@ -63,7 +63,7 @@ describe Octopus::Proxy do
   describe "when you have a rails application" do
     before(:each) do
       Rails = mock()
-      Octopus.stub!(:env).and_return("octopus_rails")
+      set_octopus_env("octopus_rails")
     end
     
     it "should initialize correctly octopus common variables for the enviroments" do
@@ -88,6 +88,7 @@ describe Octopus::Proxy do
     
     after(:each) do
       Object.send(:remove_const, :Rails)
+      Octopus.instance_variable_set(:@config, nil)
     end
   end
 

data/spec/octopus_helper.rb

@@ -21,11 +21,16 @@ end
 
 def using_enviroment(enviroment, &block)
   begin
-    Octopus.instance_variable_set(:@env, enviroment.to_s)
+    set_octopus_env(enviroment.to_s)
     clean_connection_proxy()
     yield
   ensure
-    Octopus.instance_variable_set(:@env, 'octopus')
+    set_octopus_env('octopus')
     clean_connection_proxy()
   end
+end
+
+def set_octopus_env(env)
+  Octopus.instance_variable_set(:@config, nil)
+  Octopus.stub!(:env).and_return(env)
 end

metadata

@@ -1,23 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: false
   segments: 
   - 0
   - 0
-  - 24
-  version: 0.0.24
+  - 25
+  version: 0.0.25
 platform: ruby
 authors: 
 - Thiago Pradi
 - Mike Perham
-- Amit Agarwal
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 -03:00
+date: 2010-07-16 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,9 +36,57 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: mysql
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 45
+        segments: 
+        - 2
+        - 8
+        - 1
+        version: 2.8.1
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: pg
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -51,7 +98,7 @@ dependencies:
         - 0beta
         version: 3.0.0beta
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id005
 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: []