ar-octopus 0.0.10 → 0.0.11

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')
-    gem.version = "0.0.10"
+    gem.version = "0.0.11"
   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.10"
+  s.version = "0.0.11"
 
   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/proxy.rb

@@ -3,7 +3,7 @@ class Octopus::Proxy
 
   def initialize(config)
     initialize_shards(config)
-    initialize_replication() if config[Octopus.env()] && config[Octopus.env()]["replicated"]
+    initialize_replication() if have_a_valid_configuration?(config) && config[Octopus.env()]["replicated"]
   end
 
   def initialize_shards(config)
@@ -11,7 +11,8 @@ class Octopus::Proxy
     @groups = {}
     @shards[:master] = ActiveRecord::Base.connection_pool()
     @current_shard = :master
-    shards_config = config[Octopus.env()]["shards"] || []
+    shards_config = config[Octopus.env()]["shards"] if have_a_valid_configuration?(config)
+    shards_config ||= []
     
     shards_config.each do |key, value|
       if value.has_key?("adapter")
@@ -67,6 +68,10 @@ class Octopus::Proxy
   def shard_name
     current_shard.is_a?(Array) ? current_shard.first : current_shard
   end
+  
+  def have_a_valid_configuration?(config)
+    !config[Octopus.env()].nil?
+  end
 
   def add_transaction_record(record)
     if !select_connection().instance_variable_get(:@_current_transaction_records).nil?

data/spec/octopus/proxy_spec.rb

@@ -1,21 +1,20 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Octopus::Proxy do
-  before(:each) do
-    @proxy = Octopus::Proxy.new(Octopus.config())
-  end
-
+  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].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 == [:postgresql_shard, :alone_shard, :aug2011, :canada, :brazil, :aug2009, :russia, :aug2010, :master].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
+      proxy.block.should be_false
     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
 
     describe "should raise error if you have duplicated shard names" do
@@ -24,36 +23,68 @@ describe Octopus::Proxy do
       end
 
       it "should raise the error" do
-        lambda { Octopus::Proxy.new(Octopus.config()) }.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
+        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
+
+    it "should initialize the list of shards" do
+      proxy.instance_variable_get(:@slaves_list).should == ["slave1", "slave2", "slave3", "slave4"]
     end
   end
 
   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.current_shard = :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.current_shard = [:russia, :brazil]
+        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.current_shard = :canada
+        proxy.select_connection().should == proxy.instance_variable_get(:@shards)[:canada].connection()       
       end
     end
   end

data/spec/octopus/replication_specs.rb

@@ -3,17 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe "when the database is replicated" do
   before(:each) do
     Octopus.stub!(:env).and_return("production_replicated")
-    @proxy = Octopus::Proxy.new(Octopus.config())
     clean_connection_proxy()
   end
-  
-  it "should have the replicated attribute as true" do
-    @proxy.replicated.should be_true
-  end
-
-  it "should initialize the list of shards" do
-    @proxy.instance_variable_get(:@slaves_list).should == ["slave1", "slave2", "slave3", "slave4"]
-  end
 
   it "should send all writes/reads queries to master when you have a replicated model" do
     u = User.create!(:name => "Replicated")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Thiago Pradi