ar-octopus 0.0.12 → 0.0.13

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.12"
+    gem.version = "0.0.13"
   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.12"
+  s.version = "0.0.13"
 
   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-06-29}
+  s.date = %q{2010-07-01}
   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 ||= defined?(Rails) ? Rails.env.to_s : "production"      
+    @env ||= 'octopus'
   end
   
   def self.config()

data/lib/octopus/model.rb

@@ -2,15 +2,16 @@ module Octopus::Model
   def self.extended(base) 
     base.send(:include, InstanceMethods)
     base.extend(ClassMethods)
-    base.hijack_connection()
+    base.hijack_connection() unless defined?(::Rails) && (Rails.env == 'test' || Rails.env == 'development')
   end
 
   module SharedMethods
     def clean_table_name
       self.reset_table_name() if self != ActiveRecord::Base && self.respond_to?(:reset_table_name)
     end
-    
+
     def using(shard, &block)
+      return if defined?(::Rails) && (Rails.env == 'test' || Rails.env == 'development')
       hijack_connection()  
       clean_table_name()
 
@@ -23,7 +24,7 @@ module Octopus::Model
         return Octopus::ScopeProxy.new(shard, self)
       end
     end
-    
+
     def hijack_initializer()
       attr_accessor :current_shard
       after_initialize :set_current_shard
@@ -54,7 +55,7 @@ module Octopus::Model
 
   module InstanceMethods
     include SharedMethods
-    
+
     def set_connection(*args)
       if(args.size == 1)
         arg = args.first
@@ -63,7 +64,7 @@ module Octopus::Model
 
       self.connection.current_shard = self.current_shard if have_a_valid_shard?
     end
-    
+
     def have_a_valid_shard?
       self.respond_to?(:current_shard) && self.current_shard != nil
     end

data/lib/octopus/proxy.rb

@@ -13,7 +13,7 @@ class Octopus::Proxy
     @current_shard = :master
     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")
         initialize_adapter(value['adapter'])
@@ -69,7 +69,7 @@ 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

data/lib/octopus/scope_proxy.rb

@@ -15,6 +15,18 @@ class Octopus::ScopeProxy
     return self
   end
   
+  # Transaction Method send all queries to a specified shard.
+  def transaction(options = {}, &block)
+    @klass.connection().current_shard = @shard
+    @klass.connection().block = true
+    
+    begin
+      @klass.connection().transaction(options, &block)
+    ensure
+      @klass.connection().block = false    
+    end
+  end
+    
   def connection
     @klass.connection().current_shard = @shard
     @klass.connection()

data/spec/config/shards.yml

@@ -1,4 +1,4 @@
-production:
+octopus:
   shards:
     alone_shard:
       adapter: mysql

data/spec/octopus/model_spec.rb

@@ -11,6 +11,25 @@ describe Octopus::Model do
       User.using(:canada).count.should == 1
       User.count.should == 0
     end
+    
+    it "should allow selecting the shard using #new" do
+      u = User.using(:canada).new
+      u.name = "Thiago"
+      u.save
+      
+      User.using(:canada).count.should == 1
+      User.using(:brazil).count.should == 0
+      
+      u1 = User.new
+      u1.name = "Joaquim"
+      u2 = User.using(:canada).new
+      u2.name = "Manuel"
+      u1.save()
+      u2.save()
+
+      User.using(:canada).all.should == [u, u2]
+      User.all.should == [u1]
+    end
 
     it "should select the correct shard" do
       #TODO - Investigate this - why we need to set to master!?
@@ -184,6 +203,21 @@ describe Octopus::Model do
       @user2.update_attributes(:name => "Joaquim")  
       User.using(:brazil).where(:name => "Joaquim").first.should_not be_nil
     end
+    
+    it "transaction" do
+      u = User.create!(:name => "Thiago")
+
+      User.using(:brazil).count.should == 0
+      User.using(:master).count.should == 1
+      
+      User.using(:brazil).transaction do
+        User.where(:name => "Thiago").first.should be_nil
+        User.create!(:name => "Brazil")
+      end
+      
+      User.using(:brazil).count.should == 1
+      User.using(:master).count.should == 1
+    end
 
     describe "deleting a record" do
       before(:each) do

data/spec/octopus/octopus_spec.rb

@@ -12,4 +12,10 @@ describe Octopus do
       Octopus.directory().should == File.expand_path(File.dirname(__FILE__) + "/../")
     end
   end
+
+  describe "#env method" do
+    it "should return 'production' when is outside of a rails application" do
+      Octopus.env().should == 'octopus'
+    end
+  end
 end

data/spec/octopus_helper.rb

@@ -25,7 +25,7 @@ def using_enviroment(enviroment, &block)
     clean_connection_proxy()
     yield
   ensure
-    Octopus.instance_variable_set(:@env, 'production')
+    Octopus.instance_variable_set(:@env, 'octopus')
     clean_connection_proxy()
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 -03:00
+date: 2010-07-01 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency