ar-octopus 0.0.14 → 0.0.15

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

@@ -2,7 +2,7 @@ require "yaml"
 
 module Octopus
   def self.env()
-    @env ||= 'octopus'
+    @env ||= defined?(Rails) ? Rails.env.to_s : 'octopus'
   end
   
   def self.config()
@@ -23,7 +23,7 @@ module Octopus
   end
   
   def self.excluded_enviroments=(excluded_enviroments)
-    @excluded_enviroments = excluded_enviroments.map {|element| element.to_s }
+    @excluded_enviroments = excluded_enviroments.map { |element| element.to_s }
   end
   
   def self.excluded_enviroments

data/lib/octopus/model.rb

@@ -32,7 +32,7 @@ module Octopus::Model
       before_save :set_connection
 
       def set_current_shard
-        if new_record?
+        if new_record? || self.connection.block
           self.current_shard = self.class.connection_proxy.current_shard    
         else
           self.current_shard = self.class.connection_proxy.last_current_shard  

data/lib/octopus/proxy.rb

@@ -151,7 +151,7 @@ class Octopus::Proxy
   end
 
   def should_clean_connection?(method)
-    method.to_s =~ /insert|select/ && !should_send_queries_to_multiple_shards? && !self.current_group && !@replicated && !self.block
+    method.to_s =~ /insert|select|execute/ && !should_send_queries_to_multiple_shards? && !self.current_group && !@replicated && !self.block
   end
 
   def should_send_queries_to_multiple_shards?

data/lib/octopus/scope_proxy.rb

@@ -33,12 +33,10 @@ class Octopus::ScopeProxy
     @klass.connection()
   end
   
-  #TODO - THIS IS UGLY, NEEDS REFACTOR!
   def method_missing(method, *args, &block)
     @klass.connection().current_shard = @shard
     @klass = @klass.send(method, *args, &block)
-    return nil if @klass.nil?
-    return @klass if @klass.is_a?(ActiveRecord::Base) or @klass.is_a?(Array) or @klass.is_a?(Fixnum)
+    return @klass if @klass.is_a?(ActiveRecord::Base) or @klass.is_a?(Array) or @klass.is_a?(Fixnum) or @klass.nil?
     return self
   end
   

data/spec/octopus/association_spec.rb

@@ -46,19 +46,6 @@ describe Octopus::Association do
       k.computer_id.should == c.id
       k.computer.should == c
     end
-
-    it "should works when using create!" do
-      # TODO - This works without octopus?!
-      # c = Computer.using(:brazil).create!(:name => "Computer Brazil")
-      #      k = c.keyboard.create!(:name => "New Keyboard")    
-      #      c.save()
-      #      k.save()
-      #      c.reload()
-      #      k.reload()  
-      #      c.keyboard.should == k
-      #      k.computer_id.should == c.id
-      #      k.computer.should == c
-    end
   end
 
   describe "when you have a N x N reliationship" do

data/spec/octopus/model_spec.rb

@@ -32,8 +32,6 @@ describe Octopus::Model do
     end
 
     it "should select the correct shard" do
-      #TODO - Investigate this - why we need to set to master!?
-      ActiveRecord::Base.connection_proxy.current_shard = :master
       User.using(:canada)
       User.create!(:name => 'oi')
       User.count.should == 1
@@ -45,7 +43,6 @@ describe Octopus::Model do
       User.using(:master).using(:canada).count.should == 1
     end
     
-    
     it "should allow find inside blocks" do
       @user = User.using(:brazil).create!(:name => "Thiago")
 
@@ -55,7 +52,6 @@ describe Octopus::Model do
       
       User.using(:brazil).where(:name => "Thiago").first.should == @user
     end
-    
 
     it "should clean the current_shard after executing the current query" do
       User.using(:canada).create!(:name => "oi")
@@ -188,12 +184,13 @@ describe Octopus::Model do
     end
     
     it "using update_attributes inside a block" do
-      ActiveRecord::Base.connection.run_queries_on_shard :brazil do
+      ActiveRecord::Base.using(:brazil) do
         @user = User.create!(:name => "User1")
         @user2 = User.find(@user.id)
         @user2.update_attributes(:name => "Joaquim")  
       end
       
+      User.where(:name => "Joaquim").first.should be_nil      
       User.using(:brazil).where(:name => "Joaquim").first.should_not be_nil
     end
 
@@ -205,8 +202,6 @@ 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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -03:00
+date: 2010-07-02 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency