ar-octopus 0.0.25 → 0.0.26

data/README.mkdn

@@ -47,7 +47,7 @@ Octopus adds a method to each AR Class and object. the using method is used to s
 
  Octopus also supports queries inside block. When you pass a block to the using method, all queries inside the block will be sent to the specified shard. 
 <pre>
-User.using(:slave_two) do 
+Octopus.using(:slave_two) do 
   User.create(:name => "Mike")
 end
 </pre>
@@ -67,6 +67,8 @@ end
 @user.save()
 </pre>
 
+### Migrations
+
  In migrations, you also have access to the using method. The syntax is basically the same. This migration will run in brazil and canada shards.
 <pre>
   class CreateUsersOnBothShards < ActiveRecord::Migration
@@ -96,6 +98,22 @@ end
   end
 </pre>
 
+
+### Rails Controllers
+
+If you want to send a specified action, or all actions from a controller, to a specific shard,  use this syntax:
+<pre>
+  class ApplicationController < ActionController::Base
+    around_filter :select_shard      
+    
+    def select_shard
+      Octopus.using(:brazil) do
+        yield
+      end
+    end    
+  end
+</pre>
+
  To see the complete list of features and syntax, please check out our <a href="http://wiki.github.com/tchandy/octopus/"> Wiki</a>
 Wanna see sample rails applications using octopus features? please check it out: <a href="http://github.com/tchandy/octopus_sharding_example">Sharding Example</a> and <a href="http://github.com/tchandy/octopus_replication_example">Replication Example</a> 
   

data/Rakefile

@@ -2,8 +2,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
 require 'rubygems'
 require 'rake'
 require "yaml"
-require "active_support"
-require 'active_support/json'
+
 begin
   require 'metric_fu'
   MetricFu::Configuration.run do |config|
@@ -32,7 +31,7 @@ begin
     gem.add_development_dependency "pg", ">= 0.9.0"
     gem.add_development_dependency "sqlite3-ruby", ">= 1.3.1"
     gem.add_dependency('activerecord', '>= 3.0.0beta')
-    gem.version = "0.0.25"
+    gem.version = "0.0.26"
   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.25"
+  s.version = "0.0.26"
 
   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-07-16}
+  s.date = %q{2010-07-19}
   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 = [
@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
      "lib/octopus.rb",
      "lib/octopus/association.rb",
      "lib/octopus/association_collection.rb",
-     "lib/octopus/controller.rb",
      "lib/octopus/has_and_belongs_to_many_association.rb",
      "lib/octopus/migration.rb",
      "lib/octopus/model.rb",

data/lib/octopus.rb

@@ -47,6 +47,11 @@ module Octopus
   def self.rails?
     defined?(Rails) 
   end
+  
+  def self.using(shard, &block)
+    ActiveRecord::Base.hijack_initializer()
+    ActiveRecord::Base.connection.run_queries_on_shard(shard, &block)
+  end  
 end
 
 
@@ -66,5 +71,4 @@ end
 
 require "octopus/proxy"
 require "octopus/scope_proxy"
-require "octopus/controller"
 

data/lib/octopus/association.rb

@@ -5,6 +5,10 @@ module Octopus::Association
 
   module InstanceMethods
     def set_connection_on_association(record)
+      if !record.current_shard.nil? && !self.current_shard.nil? && record.current_shard != self.current_shard
+        raise "Association Error: Records are from different shards" 
+      end
+      
       record.current_shard = self.connection.current_shard = self.current_shard if should_set_current_shard?
     end
   end

data/lib/octopus/association_collection.rb

@@ -5,7 +5,7 @@ module Octopus::AssociationCollection
 
   def count(*args)
     if should_wrap_the_connection?
-      @owner.using(@owner.current_shard) { super } 
+      Octopus.using(@owner.current_shard) { super } 
     else        
       super
     end

data/lib/octopus/has_and_belongs_to_many_association.rb

@@ -11,7 +11,7 @@ module Octopus::HasAndBelongsToManyAssociation
 
   def insert_record_with_octopus(record, force = true, validate = true)
     if should_wrap_the_connection?
-      @owner.using(@owner.current_shard) { insert_record_without_octopus(record, force, validate) } 
+      Octopus.using(@owner.current_shard) { insert_record_without_octopus(record, force, validate) } 
     else 
       insert_record_without_octopus(record, force, validate) 
     end

data/lib/octopus/migration.rb

@@ -11,8 +11,8 @@ module Octopus::Migration
     end
   end
 
-  def using(*args, &block)
-    if self.connection().is_a?(Octopus::Proxy) && !block_given?
+  def using(*args)
+    if self.connection().is_a?(Octopus::Proxy)
       args.each do |shard|
         self.connection().check_schema_migrations(shard)
       end
@@ -21,10 +21,6 @@ module Octopus::Migration
       self.current_shard = args
       self.connection().current_shard = args        
     end
-    
-    if block_given?
-      self.connection.run_queries_on_shard(args, &block)
-    end 
 
     return self
   end

data/lib/octopus/model.rb

@@ -14,20 +14,15 @@ module Octopus::Model
       self.reset_table_name() if self != ActiveRecord::Base && self.respond_to?(:reset_table_name)
     end
 
-    def using(shard, &block)
+    def using(shard)
       return self if defined?(::Rails) && !Octopus.enviroments.include?(Rails.env.to_s)
 
-      hijack_connection()  
       clean_table_name()
+      hijack_initializer()
+        
+      self.connection.using_enabled = true
 
-      if block_given?
-        self.connection.run_queries_on_shard(shard, &block)
-      else
-        hijack_initializer()  
-        self.connection.using_enabled = true
-
-        return Octopus::ScopeProxy.new(shard, self)
-      end
+      return Octopus::ScopeProxy.new(shard, self)
     end
 
     def hijack_initializer()

data/lib/octopus/rails2/persistence.rb

@@ -11,9 +11,7 @@ module Octopus
 
       def delete_with_octopus()
         if should_set_current_shard?
-          self.using(self.current_shard) do
-            delete_without_octopus()
-          end
+          Octopus.using(self.current_shard) { delete_without_octopus() }
         else
           delete_without_octopus()
         end
@@ -21,9 +19,7 @@ module Octopus
 
       def destroy_with_octopus()
         if should_set_current_shard?
-          self.using(self.current_shard) do
-            destroy_without_octopus()
-          end
+          Octopus.using(self.current_shard) { destroy_without_octopus() }
         else
           destroy_without_octopus()
         end
@@ -31,9 +27,7 @@ module Octopus
 
       def reload_with_octopus(options = nil)
         if should_set_current_shard?
-          self.using(self.current_shard) do
-            reload_without_octopus(options)
-          end
+          Octopus.using(self.current_shard) { reload_without_octopus(options) }
         else
           reload_without_octopus(options)
         end

data/lib/octopus/scope_proxy.rb

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

data/spec/database_models.rb

@@ -1,7 +1,7 @@
 #The user class is just sharded, not replicated
 class User < ActiveRecord::Base
   def awesome_queries
-    using(:canada) do
+    Octopus.using(:canada) do
       User.create(:name => "teste")
     end
   end

data/spec/migrations/12_create_users_using_block.rb

@@ -1,22 +1,22 @@
 class CreateUsersUsingBlock < ActiveRecord::Migration
   def self.up
-    using(:brazil) do
+    Octopus.using(:brazil) do
       User.create!(:name => "UsingBlock1")
       User.create!(:name => "UsingBlock2")
     end
     
-    using(:canada) do
+    Octopus.using(:canada) do
       User.create!(:name => "UsingCanada")
       User.create!(:name => "UsingCanada2")
     end
   end
 
   def self.down
-    using(:brazil) do
+    Octopus.using(:brazil) do
       User.delete_all()
     end
     
-    using(:canada) do
+    Octopus.using(:canada) do
       User.delete_all()
     end
   end

data/spec/migrations/13_create_users_using_block_and_using.rb

@@ -2,7 +2,7 @@ class CreateUsersUsingBlockAndUsing < ActiveRecord::Migration
   using(:brazil)
   
   def self.up
-    using(:canada) do
+    Octopus.using(:canada) do
       User.create!(:name => "Canada")
     end
     

data/spec/octopus/association_spec.rb

@@ -377,6 +377,12 @@ describe Octopus::Association do
     it "should finds the client that the item belongs" do
       @item_brazil.client.should == @brazil_client
     end
+    
+    it "should raise error if you try to add a record from a different shard" do
+      lambda do 
+        @brazil_client.items << Item.using(:canada).create!(:name => "New User")
+      end.should raise_error("Association Error: Records are from different shards")
+    end
 
     it "should update the attribute for the item" do
       new_brazil_client = Client.using(:brazil).create!(:name => "new Client")

data/spec/octopus/controller_spec.rb

@@ -1,11 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe Octopus::Controller do
-  it "should have the using method to select the shard" do
-    a = ActionController::Base.new
-    a.respond_to?(:using).should be_true
-  end
-  
+describe "Rails Controllers" do
   it "should use #using method to in all requests" do
     class UsersControllers < ActionController::Base
       around_filter :select_shard      
@@ -15,7 +10,7 @@ describe Octopus::Controller do
       end
       
       def select_shard
-        using(:brazil) do
+        Octopus.using(:brazil) do
           yield
         end
       end

data/spec/octopus/model_spec.rb

@@ -56,7 +56,7 @@ describe Octopus::Model do
     it "should allow find inside blocks" do
       @user = User.using(:brazil).create!(:name => "Thiago")
 
-      User.using(:brazil) do
+      Octopus.using(:brazil) do
         User.first.should == @user
       end
       
@@ -112,7 +112,7 @@ describe Octopus::Model do
 
     describe "passing a block" do
       it "should allow queries be executed inside the block, ponting to a specific shard" do
-        User.using(:canada) do
+        Octopus.using(:canada) do
           User.create(:name => "oi")
         end
 
@@ -197,7 +197,7 @@ describe Octopus::Model do
     end
     
     it "using update_attributes inside a block" do
-      ActiveRecord::Base.using(:brazil) do
+      Octopus.using(:brazil) do
         @user = User.create!(:name => "User1")
         @user2 = User.find(@user.id)
         @user2.update_attributes(:name => "Joaquim")  

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 0
-  - 25
-  version: 0.0.25
+  - 26
+  version: 0.0.26
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-16 00:00:00 -03:00
+date: 2010-07-19 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,7 +121,6 @@ files:
 - lib/octopus.rb
 - lib/octopus/association.rb
 - lib/octopus/association_collection.rb
-- lib/octopus/controller.rb
 - lib/octopus/has_and_belongs_to_many_association.rb
 - lib/octopus/migration.rb
 - lib/octopus/model.rb

data/lib/octopus/controller.rb

@@ -1,7 +0,0 @@
-module Octopus::Controller
-  def using(shard, &block)
-    ActiveRecord::Base.using(shard, &block)
-  end
-end
-
-ActionController::Base.send(:include, Octopus::Controller) if defined?(ActionController)