ar-octopus 0.0.22 → 0.0.23

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.22"
+    gem.version = "0.0.23"
   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.22"
+  s.version = "0.0.23"
 
   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-09}
+  s.date = %q{2010-07-14}
   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

@@ -12,8 +12,8 @@ module Octopus
   def self.config()
     @config ||= HashWithIndifferentAccess.new(YAML.load_file(Octopus.directory() + "/config/shards.yml"))
     
-    if !@config[Octopus.env].nil? && @config[Octopus.env()]['excluded_enviroments']
-      self.excluded_enviroments = @config[Octopus.env()]['excluded_enviroments']
+    if !@config[Octopus.env].nil? && @config[Octopus.env()]['octopus_enviroments']
+      self.octopus_enviroments = @config[Octopus.env()]['octopus_enviroments']
     end
     
     @config
@@ -32,12 +32,12 @@ module Octopus
     yield self
   end
   
-  def self.excluded_enviroments=(excluded_enviroments)
-    @excluded_enviroments = excluded_enviroments.map { |element| element.to_s }
+  def self.octopus_enviroments=(octopus_enviroments)
+    @octopus_enviroments = octopus_enviroments.map { |element| element.to_s }
   end
   
-  def self.excluded_enviroments
-    @excluded_enviroments || ['development',"cucumber", "test"]
+  def self.octopus_enviroments
+    @octopus_enviroments || ['production']
   end
   
   def self.rails3?

data/lib/octopus/migration.rb

@@ -14,9 +14,7 @@ module Octopus::Migration
   end
 
   def using(*args, &block)
-    Octopus.config()
-    
-    unless defined?(::Rails) && Octopus.excluded_enviroments.include?(Rails.env.to_s)
+    if self.connection().is_a?(Octopus::Proxy)
       args.each do |shard|
         self.connection().check_schema_migrations(shard)
       end
@@ -31,9 +29,8 @@ module Octopus::Migration
   end
 
   def using_group(*args)
-    Octopus.config()
     
-    unless defined?(::Rails) && Octopus.excluded_enviroments.include?(Rails.env.to_s)
+    if self.connection().is_a?(Octopus::Proxy)
       args.each do |group_shard|
         shards = self.connection().instance_variable_get(:@groups)[group_shard] || []
 
@@ -57,7 +54,9 @@ module Octopus::Migration
   def migrate_with_octopus(direction)
     conn = ActiveRecord::Base.connection
     groups = conn.instance_variable_get(:@groups)
-
+    
+    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

@@ -2,7 +2,11 @@ module Octopus::Model
   def self.extended(base) 
     base.send(:include, InstanceMethods)
     base.extend(ClassMethods)
-    base.hijack_connection() unless defined?(::Rails) && Octopus.excluded_enviroments.include?(Rails.env.to_s)
+    base.hijack_connection()
+    
+    class << base
+      alias_method_chain :connection, :octopus
+    end
   end
 
   module SharedMethods
@@ -11,8 +15,8 @@ module Octopus::Model
     end
 
     def using(shard, &block)
-      return self if defined?(::Rails) && Octopus.excluded_enviroments.include?(Rails.env.to_s)
-      
+      return self if defined?(::Rails) && !Octopus.octopus_enviroments.include?(Rails.env.to_s)
+
       hijack_connection()  
       clean_table_name()
 
@@ -38,7 +42,7 @@ module Octopus::Model
           self.current_shard = self.class.connection_proxy.last_current_shard  
         end
       end
-      
+
       if !Octopus.rails3?
         def after_initialize
           set_current_shard()
@@ -47,14 +51,22 @@ module Octopus::Model
     end
 
     def hijack_connection()
-      class << self
-        def connection_proxy
-          Thread.current[:connection_proxy] ||= Octopus::Proxy.new(Octopus.config())
-        end
+      def self.connection_proxy
+        Thread.current[:connection_proxy] ||= Octopus::Proxy.new(Octopus.config())
+      end
 
-        def connection 
+      def self.connection_with_octopus()
+        if defined?(::Rails) 
+          Octopus.config()
+          if Octopus.octopus_enviroments.include?(Rails.env.to_s)
+            self.connection_proxy().current_model = self
+            return self.connection_proxy()
+          else
+            self.connection_without_octopus()
+          end
+        else
           self.connection_proxy().current_model = self
-          self.connection_proxy()
+          return self.connection_proxy()
         end
       end
     end
@@ -75,7 +87,7 @@ module Octopus::Model
     def should_set_current_shard?
       self.respond_to?(:current_shard) && self.current_shard != nil
     end
-    
+
     def reload_connection()
       set_connection() if should_set_current_shard?
     end

data/lib/octopus/proxy.rb

@@ -128,14 +128,9 @@ class Octopus::Proxy
 
   def initialize_adapter(adapter)
     begin
-      gem "activerecord-#{adapter}-adapter"
       require "active_record/connection_adapters/#{adapter}_adapter"
     rescue LoadError
-      begin
-        require "active_record/connection_adapters/#{adapter}_adapter"
-      rescue LoadError
-        raise "Please install the #{adapter} adapter: `gem install activerecord-#{adapter}-adapter` (#{$!})"
-      end
+      raise "Please install the #{adapter} adapter: `gem install activerecord-#{adapter}-adapter` (#{$!})"
     end
   end
 

data/spec/config/shards.yml

@@ -1,8 +1,4 @@
 octopus:
-  excluded_enviroments: 
-    - cucumber 
-    - test
-    - staging
   shards:
     alone_shard:
       adapter: mysql
@@ -107,11 +103,10 @@ production_entire_replicated:
       database: octopus_shard5
       
 octopus_rails:
-  excluded_enviroments:
-    - test
-    - cucumber
-
   replicated: true
+  octopus_enviroments:
+    - staging
+    - production
 
   staging:
     shards:

data/spec/database_models.rb

@@ -23,6 +23,7 @@ class Item < ActiveRecord::Base
 end
 
 class Keyboard < ActiveRecord::Base
+  validates_uniqueness_of :name
   belongs_to :computer
 end
 

data/spec/octopus/model_spec.rb

@@ -246,6 +246,20 @@ describe Octopus::Model do
       end
     end
   end
+  
+  describe "ActiveRecord::Base Validations" do
+    it "should work correctly when using validations" do
+      @key = Keyboard.create!(:name => "Key")
+      lambda { Keyboard.using(:brazil).create!(:name => "Key") }.should_not raise_error()
+      lambda { Keyboard.create!(:name => "Key") }.should raise_error()
+    end
+    
+    it "should work correctly when using validations with using syntax" do
+      @key = Keyboard.using(:brazil).create!(:name => "Key")
+      lambda { Keyboard.create!(:name => "Key") }.should_not raise_error()
+      lambda { Keyboard.using(:brazil).create!(:name => "Key") }.should raise_error()
+    end
+  end
 
   describe "#replicated_model method" do
     it "should be replicated" do

data/spec/octopus/octopus_spec.rb

@@ -19,25 +19,20 @@ describe Octopus do
     end
   end
   
-  describe "#setup method" do
-    it "should load from YAML" do
-      Octopus.excluded_enviroments.should == ["cucumber", "test", "staging"]       
+  describe "#setup method" do    
+    it "should have the default octopus enviroment as production" do
+      Octopus.octopus_enviroments.should == ["production"]
     end
     
-    it "should have the default excluded enviroments" do
-      Octopus.instance_variable_set(:@excluded_enviroments, nil)
-      Octopus.excluded_enviroments.should == ["development", "cucumber", "test"]
-    end
-    
-    it "should configure the excluded enviroments" do
+    it "should allow the user to configure the octopus enviroments" do
       Octopus.setup do |config|
-        config.excluded_enviroments = [:cucumber, :test]
+        config.octopus_enviroments = [:production, :staging]
       end
       
-      Octopus.excluded_enviroments.should == ['cucumber', 'test']      
+      Octopus.octopus_enviroments.should == ['production', 'staging']      
 
       Octopus.setup do |config|
-        config.excluded_enviroments = [:cucumber, :test, :staging]
+        config.octopus_enviroments = [:production]
       end
     end
   end

data/spec/octopus/proxy_spec.rb

@@ -71,7 +71,7 @@ describe Octopus::Proxy do
       Octopus.config()
       
       proxy.instance_variable_get(:@replicated).should be_true
-      Octopus.excluded_enviroments.should == ["test", "cucumber"] 
+      Octopus.octopus_enviroments.should == ["staging", "production"] 
     end
     
     it "should initialize correctly the shards for the staging enviroment" do

metadata

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