ar-octopus 0.0.13 → 0.0.14

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.13"
+    gem.version = "0.0.14"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/ar-octopus.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-octopus}
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Pradi", "Mike Perham", "Amit Agarwal"]

data/lib/octopus.rb

@@ -14,6 +14,21 @@ 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:
+  # :excluded_enviroments => the enviroments that octopus will not run. default: :development, :cucumber and :test
+  def self.setup
+    yield self
+  end
+  
+  def self.excluded_enviroments=(excluded_enviroments)
+    @excluded_enviroments = excluded_enviroments.map {|element| element.to_s }
+  end
+  
+  def self.excluded_enviroments
+    @excluded_enviroments || ['development',"cucumber", "test"]
+  end
 end
 
 require "octopus/proxy"

data/lib/octopus/model.rb

@@ -2,7 +2,7 @@ module Octopus::Model
   def self.extended(base) 
     base.send(:include, InstanceMethods)
     base.extend(ClassMethods)
-    base.hijack_connection() unless defined?(::Rails) && (Rails.env == 'test' || Rails.env == 'development')
+    base.hijack_connection() unless defined?(::Rails) && Octopus.excluded_enviroments.include?(Rails.env.to_s)
   end
 
   module SharedMethods
@@ -11,7 +11,8 @@ module Octopus::Model
     end
 
     def using(shard, &block)
-      return if defined?(::Rails) && (Rails.env == 'test' || Rails.env == 'development')
+      return self if defined?(::Rails) && Octopus.excluded_enviroments.include?(Rails.env.to_s)
+      
       hijack_connection()  
       clean_table_name()
 

data/lib/octopus/proxy.rb

@@ -1,7 +1,7 @@
 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_a_valid_configuration?(config) && config[Octopus.env()]["replicated"]
   end
@@ -11,6 +11,11 @@ class Octopus::Proxy
     @groups = {}
     @shards[:master] = ActiveRecord::Base.connection_pool()
     @current_shard = :master
+    
+    if have_a_valid_configuration?(config) && config[Octopus.env()]['excluded_enviroments']
+      Octopus.excluded_enviroments = config[Octopus.env()]['excluded_enviroments']
+    end
+    
     shards_config = config[Octopus.env()]["shards"] if have_a_valid_configuration?(config)
     shards_config ||= []
 

data/lib/octopus/scope_proxy.rb

@@ -8,6 +8,7 @@ class Octopus::ScopeProxy
   
   def using(shard, &block)
     @shard = shard
+    
     if block_given?
       @klass.connection.run_queries_on_shard(@shard, &block)
     end

data/spec/config/shards.yml

@@ -1,4 +1,8 @@
 octopus:
+  excluded_enviroments: 
+    - cucumber 
+    - test
+    - staging
   shards:
     alone_shard:
       adapter: mysql

data/spec/octopus/model_spec.rb

@@ -205,6 +205,8 @@ describe Octopus::Model do
     end
     
     it "transaction" do
+      #TODO - Investigate this - why we need to set to master!? 
+      ActiveRecord::Base.connection_proxy.current_shard = :master
       u = User.create!(:name => "Thiago")
 
       User.using(:brazil).count.should == 0

data/spec/octopus/octopus_spec.rb

@@ -18,4 +18,27 @@ describe Octopus do
       Octopus.env().should == 'octopus'
     end
   end
+  
+  describe "#setup method" do
+    it "should load from YAML" do
+      Octopus.excluded_enviroments.should == ["cucumber", "test", "staging"]       
+    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
+      Octopus.setup do |config|
+        config.excluded_enviroments = [:cucumber, :test]
+      end
+      
+      Octopus.excluded_enviroments.should == ['cucumber', 'test']      
+
+      Octopus.setup do |config|
+        config.excluded_enviroments = [:cucumber, :test, :staging]
+      end
+    end
+  end
 end

data/spec/octopus/replication_specs.rb

@@ -11,6 +11,14 @@ describe "when the database is replicated" do
     User.count.should == 1
     User.find(u.id).should == u
   end
+  
+  it "should send all writes queries to master" do
+    u = Cat.using(:slave4).create!(:name => "Slave Cat")    
+    u1 = Cat.using(:slave4).first
+    u1.name = "Miau"
+    u1.save()
+    Cat.using(:slave4).first.name.should == "Slave Cat"
+  end
 
   it "should send read queries to slaves, when you have a replicated model, using a round robin algorithm" do
     u = Cat.create!(:name => "master")
@@ -44,6 +52,14 @@ describe "when the database is replicated and the entire application is replicat
     Octopus.stub!(:env).and_return("production_entire_replicated")
     clean_connection_proxy()
   end
+  
+  it "should send all writes queries to master" do
+    u = Client.using(:slave4).create!(:name => "Slave Client")    
+    u1 = Client.using(:slave4).first
+    u1.name = "Client"
+    u1.save()
+    Client.using(:slave4).first.name.should == "Slave Client"
+  end
 
   it "should send read queries to slaves,to all models, using a round robin algorithm" do
     u = Cat.create!(:name => "master")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Thiago Pradi