ar-octopus 0.0.21 → 0.0.22

data/Rakefile

@@ -29,7 +29,7 @@ begin
     gem.authors = ["Thiago Pradi", "Mike Perham", "Amit Agarwal"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_dependency('activerecord', '>= 3.0.0beta')
-    gem.version = "0.0.21"
+    gem.version = "0.0.22"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/ar-octopus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-octopus}
-  s.version = "0.0.21"
+  s.version = "0.0.22"
 
   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-08}
+  s.date = %q{2010-07-09}
   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 = [

data/lib/octopus.rb

@@ -2,7 +2,11 @@ require "yaml"
 
 module Octopus
   def self.env()
-    @env ||= defined?(Rails) ? Rails.env.to_s : 'octopus'
+   @env ||= 'octopus'
+  end
+  
+  def self.rails_env()
+    @rails_env ||= self.rails? ? Rails.env.to_s : 'shards'
   end
   
   def self.config()
@@ -39,6 +43,10 @@ module Octopus
   def self.rails3?
     ActiveRecord::VERSION::MAJOR == 3
   end
+  
+  def self.rails?
+    defined?(Rails) 
+  end
 end
 
 

data/lib/octopus/migration.rb

@@ -2,19 +2,29 @@ module Octopus::Migration
   def self.extended(base)
     class << base
       alias_method_chain :migrate, :octopus
+      
+      def announce(message)
+        version = defined?(@version) ? @version : nil
+
+        text = "#{version} #{name}: #{message} - #{get_current_shard}"
+        length = [0, 75 - text.length].max
+        write "== %s %s" % [text, "=" * length]
+      end
     end
   end
 
   def using(*args, &block)
     Octopus.config()
+    
+    unless defined?(::Rails) && Octopus.excluded_enviroments.include?(Rails.env.to_s)
+      args.each do |shard|
+        self.connection().check_schema_migrations(shard)
+      end
 
-    args.each do |shard|
-      self.connection().check_schema_migrations(shard)
+      self.connection().block = true
+      self.connection().current_shard = args        
     end
-
-    self.connection().block = true
-    self.connection().current_shard = args        
-
+    
     yield if block_given?
 
     return self
@@ -23,24 +33,31 @@ module Octopus::Migration
   def using_group(*args)
     Octopus.config()
     
-    args.each do |group_shard|
-      shards = self.connection().instance_variable_get(:@groups)[group_shard] || []
+    unless defined?(::Rails) && Octopus.excluded_enviroments.include?(Rails.env.to_s)
+      args.each do |group_shard|
+        shards = self.connection().instance_variable_get(:@groups)[group_shard] || []
 
-      shards.each do |shard|
-        self.connection().check_schema_migrations(shard)
+        shards.each do |shard|
+          self.connection().check_schema_migrations(shard)
+        end
       end
-    end
-
-    self.connection().block = true
-    self.connection().current_group = args
 
+      self.connection().block = true
+      self.connection().current_group = args
+    end
+    
     return self
   end
+  
+  def get_current_shard
+    "Shard: #{ActiveRecord::Base.connection.current_shard()}" if ActiveRecord::Base.connection.respond_to?(:current_shard)
+  end
+
 
   def migrate_with_octopus(direction)
     conn = ActiveRecord::Base.connection
     groups = conn.instance_variable_get(:@groups)
-    
+
     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/proxy.rb

@@ -12,7 +12,12 @@ class Octopus::Proxy
     @shards[:master] = ActiveRecord::Base.connection_pool()
     @current_shard = :master
     
-    shards_config = config[Octopus.env()]["shards"] if have_config_for_enviroment?(config)
+    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"]
+    end
+    
     shards_config ||= []
 
     shards_config.each do |key, value|

data/spec/config/shards.yml

@@ -106,4 +106,34 @@ production_entire_replicated:
       host: localhost
       database: octopus_shard5
       
+octopus_rails:
+  excluded_enviroments:
+    - test
+    - cucumber
+
+  replicated: true
+
+  staging:
+    shards:
+      slave1:
+        adapter: mysql
+        host: localhost
+        database: octopus_shard2
+      slave2:
+        adapter: mysql
+        host: localhost
+        database: octopus_shard3
+
+  production:
+    shards:
+      slave3:
+        adapter: mysql
+        host: localhost
+        database: octopus_shard4
+      slave4:
+        adapter: mysql
+        host: localhost
+        database: octopus_shard5
+      
+      
   

data/spec/octopus/proxy_spec.rb

@@ -2,7 +2,7 @@ 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    
     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
@@ -12,7 +12,7 @@ describe Octopus::Proxy do
     it "should initialize the block attribute as false" do
       proxy.block.should be_false
     end    
-    
+
     it "should initialize replicated attribute as false" do
       proxy.instance_variable_get(:@replicated).should be_false      
     end
@@ -31,26 +31,26 @@ describe Octopus::Proxy do
       before(:each) do
         Octopus.stub!(:env).and_return("crazy_enviroment")        
       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
     end
   end
-  
+
   describe "when you have a replicated enviroment" do
     before(:each) do
       Octopus.stub!(:env).and_return("production_replicated")
     end
-    
+
     it "should have the replicated attribute as true" do
       proxy.instance_variable_get(:@replicated).should be_true
     end
@@ -60,6 +60,37 @@ describe Octopus::Proxy do
     end
   end
 
+  describe "when you have a rails application" do
+    before(:each) do
+      Rails = mock()
+      Octopus.stub!(:env).and_return("octopus_rails")
+    end
+    
+    it "should initialize correctly octopus common variables for the enviroments" do
+      Rails.stub!(:env).and_return('staging')
+      Octopus.config()
+      
+      proxy.instance_variable_get(:@replicated).should be_true
+      Octopus.excluded_enviroments.should == ["test", "cucumber"] 
+    end
+    
+    it "should initialize correctly the shards for the staging enviroment" do
+      Rails.stub!(:env).and_return('staging')
+
+      proxy.instance_variable_get(:@shards).keys.to_set.should == Set.new([:slave1, :slave2, :master])
+    end
+    
+    it "should initialize correctly the shards for the production enviroment" do
+      Rails.stub!(:env).and_return('production')
+
+      proxy.instance_variable_get(:@shards).keys.to_set.should == Set.new([:slave3, :slave4, :master])
+    end
+    
+    after(:each) do
+      Object.send(:remove_const, :Rails)
+    end
+  end
+
   describe "returning the correct connection" do
     describe "should return the shard name" do
       it "when current_shard is empty" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 0
-  - 21
-  version: 0.0.21
+  - 22
+  version: 0.0.22
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -03:00
+date: 2010-07-09 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency