ar-octopus 0.3.0 → 0.3.1

data/Rakefile

@@ -37,7 +37,7 @@ begin
     gem.add_development_dependency "jeweler", ">= 1.4"
     gem.add_development_dependency "actionpack", ">= 2.3"
     gem.add_dependency('activerecord', '>= 2.3')
-    gem.version = "0.3.0"
+    gem.version = "0.3.1"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/TODO.txt

@@ -3,4 +3,6 @@
 - Automatic configuration file for shards.
 - Support specifics cases of sharding/replication.
 - Basic algorithm to do load balancing between slaves server (handling servers down)
-- Support replication + sharding
+- Support replication + sharding
+- Wiki about validation
+- Show where the query is sent in the log

data/ar-octopus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-octopus}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Pradi", "Mike Perham"]
-  s.date = %q{2010-11-08}
+  s.date = %q{2010-12-02}
   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

@@ -13,8 +13,8 @@ module Octopus
   def self.config()
     @config ||= HashWithIndifferentAccess.new(YAML.load(ERB.new(File.open(Octopus.directory() + "/config/shards.yml").read()).result))[Octopus.env()]
 
-    if @config && @config['enviroments']
-      self.enviroments = @config['enviroments']
+    if @config && @config['environments']
+      self.environments = @config['environments']
     end
 
     @config
@@ -33,12 +33,12 @@ module Octopus
     yield self
   end
 
-  def self.enviroments=(enviroments)
-    @enviroments = enviroments.map { |element| element.to_s }
+  def self.environments=(environments)
+    @environments = environments.map { |element| element.to_s }
   end
 
-  def self.enviroments
-    @enviroments || ['production']
+  def self.environments
+    @environments || ['production']
   end
 
   def self.rails3?

data/lib/octopus/model.rb

@@ -11,7 +11,7 @@ module Octopus::Model
     end
 
     def using(shard)
-      return self if defined?(::Rails) && !Octopus.enviroments.include?(Rails.env.to_s)
+      return self if defined?(::Rails) && !Octopus.environments.include?(Rails.env.to_s)
       
       clean_table_name()
       hijack_initializer()
@@ -43,7 +43,7 @@ module Octopus::Model
 
     def hijack_connection()
       def self.should_use_normal_connection?
-        (defined?(Rails) && Octopus.config() && !Octopus.enviroments.include?(Rails.env.to_s)) || self.read_inheritable_attribute(:establish_connection)
+        (defined?(Rails) && Octopus.config() && !Octopus.environments.include?(Rails.env.to_s)) || self.read_inheritable_attribute(:establish_connection)
       end
       
       def self.connection_proxy

data/spec/config/shards.yml

@@ -92,7 +92,7 @@ production_fully_replicated:
 octopus_rails:
   replicated: true
   verify_connection: true
-  enviroments:
+  environments:
     - staging
     - production
 

data/spec/database_models.rb

@@ -35,6 +35,7 @@ class Part < ActiveRecord::Base
 end
 
 class Keyboard < ActiveRecord::Base
+  replicated_model
   validates_uniqueness_of :name
   belongs_to :computer
 end

data/spec/octopus/migration_spec.rb

@@ -76,7 +76,7 @@ describe Octopus::Migration do
 
   describe "when using replication" do    
     it "should run writes on master when you use replication" do
-      using_enviroment :production_replicated do 
+      using_environment :production_replicated do 
         migrating_to_version 10 do 
           Cat.find_by_name("Replication").should be_nil
         end
@@ -84,7 +84,7 @@ describe Octopus::Migration do
     end
 
     it "should run in all shards, master or another shards" do
-      using_enviroment :production_replicated do 
+      using_environment :production_replicated do 
         migrating_to_version 11 do 
           [:slave4, :slave1, :slave2, :slave3].each do |sym|
             Cat.find_by_name("Slaves").should_not be_nil

data/spec/octopus/model_spec.rb

@@ -350,13 +350,13 @@ describe Octopus::Model do
 
   describe "#replicated_model method" do
     it "should be replicated" do
-      using_enviroment :production_replicated do 
+      using_environment :production_replicated do 
         ActiveRecord::Base.connection_proxy.instance_variable_get(:@replicated).should be_true
       end
     end
 
     it "should mark the Cat model as replicated" do
-      using_enviroment :production_replicated do 
+      using_environment :production_replicated do 
         User.read_inheritable_attribute(:replicated).should be_false
         Cat.read_inheritable_attribute(:replicated).should be_true
       end

data/spec/octopus/octopus_spec.rb

@@ -20,19 +20,19 @@ describe Octopus do
   end
   
   describe "#setup method" do    
-    it "should have the default octopus enviroment as production" do
-      Octopus.enviroments.should == ["production"]
+    it "should have the default octopus environment as production" do
+      Octopus.environments.should == ["production"]
     end
     
-    it "should allow the user to configure the octopus enviroments" do
+    it "should allow the user to configure the octopus environments" do
       Octopus.setup do |config|
-        config.enviroments = [:production, :staging]
+        config.environments = [:production, :staging]
       end
       
-      Octopus.enviroments.should == ['production', 'staging']      
+      Octopus.environments.should == ['production', 'staging']      
 
       Octopus.setup do |config|
-        config.enviroments = [:production]
+        config.environments = [:production]
       end
     end
   end

data/spec/octopus/proxy_spec.rb

@@ -37,7 +37,7 @@ describe Octopus::Proxy do
 
     describe "should initialize just the master when you don't have a shards.yml file" do
       before(:each) do
-        set_octopus_env("crazy_enviroment")              
+        set_octopus_env("crazy_environment")              
       end
 
       it "should initialize just the master shard" do
@@ -54,7 +54,7 @@ describe Octopus::Proxy do
     end
   end
 
-  describe "when you have a replicated enviroment" do
+  describe "when you have a replicated environment" do
     before(:each) do
       set_octopus_env("production_replicated")      
     end
@@ -74,23 +74,23 @@ describe Octopus::Proxy do
       set_octopus_env("octopus_rails")
     end
 
-    it "should initialize correctly octopus common variables for the enviroments" do
+    it "should initialize correctly octopus common variables for the environments" do
       Rails.stub!(:env).and_return('staging')
       Octopus.instance_variable_set(:@rails_env, nil)
       Octopus.config()
 
       proxy.instance_variable_get(:@replicated).should be_true
       proxy.instance_variable_get(:@verify_connection).should be_true
-      Octopus.enviroments.should == ["staging", "production"] 
+      Octopus.environments.should == ["staging", "production"] 
     end
 
-    it "should initialize correctly the shards for the staging enviroment" do
+    it "should initialize correctly the shards for the staging environment" 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
+    it "should initialize correctly the shards for the production environment" do
       Rails.stub!(:env).and_return('production')
 
       proxy.instance_variable_get(:@shards).keys.to_set.should == Set.new([:slave3, :slave4, :master])

data/spec/octopus/replication_specs.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "when the database is replicated" do
   it "should send all writes/reads queries to master when you have a non replicated model" do
-    using_enviroment :production_replicated do 
+    using_environment :production_replicated do 
       u = User.create!(:name => "Replicated")
       User.count.should == 1
       User.find(u.id).should == u
@@ -10,7 +10,7 @@ describe "when the database is replicated" do
   end
 
   it "should send all writes queries to master" do
-    using_enviroment :production_replicated do 
+    using_environment :production_replicated do 
       Cat.create!(:name => "Slave Cat")    
       Cat.find_by_name("Slave Cat").should be_nil
       Client.create!(:name => "Slave Client")
@@ -19,7 +19,7 @@ describe "when the database is replicated" do
   end
 
   it "should allow to create multiple models on the master" do
-    using_enviroment :production_replicated do 
+    using_environment :production_replicated do 
       Cat.create!([{:name => "Slave Cat 1"}, {:name => "Slave Cat 2"}])  
       Cat.find_by_name("Slave Cat 1").should be_nil
       Cat.find_by_name("Slave Cat 2").should be_nil
@@ -29,14 +29,14 @@ describe "when the database is replicated" do
   it "should allow #using syntax to send queries to master" do
     Cat.create!(:name => "Master Cat")    
     
-    using_enviroment :production_fully_replicated do 
+    using_environment :production_fully_replicated do 
       Cat.using(:master).find_by_name("Master Cat").should_not be_nil
     end
   end
 
   it "should send the count query to a slave" do
     pending()
-    # using_enviroment :production_replicated do 
+    # using_environment :production_replicated do 
     #       Cat.create!(:name => "Slave Cat")    
     #       Cat.count.should == 0
     #     end
@@ -51,12 +51,22 @@ describe "when the database is replicated and the entire application is replicat
   end
 
   it "should send all writes queries to master" do
-    using_enviroment :production_fully_replicated do 
+    using_environment :production_fully_replicated do 
       Cat.create!(:name => "Slave Cat")    
       Cat.find_by_name("Slave Cat").should be_nil
       Client.create!(:name => "Slave Client")
       Client.find_by_name("Slave Client").should be_nil
     end
   end  
+  
+  it "should work with validate_uniquess_of" do
+    Keyboard.create!(:name => "thiago")
+    
+    using_environment :production_fully_replicated do 
+      k = Keyboard.new(:name => "thiago")
+      k.save.should be_false
+      k.errors.should == {:name=>["has already been taken"]}
+    end
+  end
 end
 

data/spec/octopus/sharded_spec.rb

@@ -10,7 +10,7 @@ describe "when the database is not entire sharded" do
     pending()
     # User.create!(:name => "Thiago")
     # 
-    # using_enviroment :not_entire_sharded do 
+    # using_environment :not_entire_sharded do 
     #   Octopus.using(:russia) do
     #     User.create!(:name => "Thiago")
     #   end
@@ -22,7 +22,7 @@ describe "when the database is not entire sharded" do
   it "should pick the shard based on current_shard when you have a sharded model" do
     Cat.create!(:name => "Thiago")
 
-    using_enviroment :not_entire_sharded do 
+    using_environment :not_entire_sharded do 
       Octopus.using(:russia) do
         Cat.create!(:name => "Thiago")
       end

data/spec/octopus_helper.rb

@@ -19,9 +19,9 @@ def migrating_to_version(version, &block)
   end
 end
 
-def using_enviroment(enviroment, &block)
+def using_environment(environment, &block)
   begin
-    set_octopus_env(enviroment.to_s)
+    set_octopus_env(environment.to_s)
     clean_connection_proxy()
     yield
   ensure

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 -02:00
+date: 2010-12-02 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency