ar-octopus 0.0.8 → 0.0.9

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.8"
+    gem.version = "0.0.9"
   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.8"
+  s.version = "0.0.9"
 
   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-24}
+  s.date = %q{2010-06-28}
   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 = [
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
      "spec/database_models.rb",
      "spec/migrations/10_create_users_using_replication.rb",
      "spec/migrations/11_add_field_in_all_slaves.rb",
+     "spec/migrations/12_create_users_using_block.rb",
      "spec/migrations/1_create_users_on_master.rb",
      "spec/migrations/2_create_users_on_canada.rb",
      "spec/migrations/3_create_users_on_both_shards.rb",
@@ -57,6 +58,7 @@ Gem::Specification.new do |s|
      "spec/octopus/octopus_spec.rb",
      "spec/octopus/proxy_spec.rb",
      "spec/octopus/replication_specs.rb",
+     "spec/octopus/scope_proxy_spec.rb",
      "spec/octopus_helper.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -71,6 +73,7 @@ Gem::Specification.new do |s|
      "spec/database_models.rb",
      "spec/migrations/10_create_users_using_replication.rb",
      "spec/migrations/11_add_field_in_all_slaves.rb",
+     "spec/migrations/12_create_users_using_block.rb",
      "spec/migrations/1_create_users_on_master.rb",
      "spec/migrations/2_create_users_on_canada.rb",
      "spec/migrations/3_create_users_on_both_shards.rb",
@@ -87,6 +90,7 @@ Gem::Specification.new do |s|
      "spec/octopus/octopus_spec.rb",
      "spec/octopus/proxy_spec.rb",
      "spec/octopus/replication_specs.rb",
+     "spec/octopus/scope_proxy_spec.rb",
      "spec/octopus_helper.rb",
      "spec/spec_helper.rb"
   ]

data/lib/octopus/association.rb

@@ -84,13 +84,13 @@ module Octopus::Association
 
   def association_accessor_methods(reflection, association_proxy_class)
     define_method(reflection.name) do |*params|
-      reload_connection() 
+      reload_connection()
       force_reload = params.first unless params.empty?
       association = association_instance_get(reflection.name)
 
       if association.nil? || force_reload
         association = association_proxy_class.new(self, reflection)
-        retval = have_a_valid_shard? ? reflection.klass.uncached { self.class.connection_proxy.run_queries_on_shard(self.current_shard) { association.reload } } : association.reload
+        retval = force_reload ? reflection.klass.uncached { association.reload } : association.reload
         if retval.nil? and association_proxy_class == ActiveRecord::Associations::BelongsToAssociation
           association_instance_set(reflection.name, nil)
           return nil
@@ -98,8 +98,7 @@ module Octopus::Association
         association_instance_set(reflection.name, association)
       end
 
-      association
-      #association.target.nil? ? nil : association
+      association.target.nil? ? nil : association
     end
 
     define_method("loaded_#{reflection.name}?") do

data/lib/octopus/migration.rb

@@ -1,19 +1,13 @@
-module Octopus::Migration
-  def self.extended(base)
-    class << base
-      def connection
-        ActiveRecord::Base.connection_proxy()
-      end
-    end
-  end
-
-  def using(*args)
+module Octopus::Migration  
+  def using(*args, &block)
     if args.size == 1
       self.connection().block = true
       self.connection().current_shard = args.first
     else
       self.connection().current_shard = args        
     end
+    
+    yield if block_given?
 
     return self
   end

data/lib/octopus/proxy.rb

@@ -78,6 +78,7 @@ class Octopus::Proxy
       self.send_transaction_to_multiple_shards(current_shard, options, &block)
     elsif should_send_queries_to_multiple_groups?
       self.send_transaction_to_multiple_groups(options, &block)
+      @current_group = nil      
     elsif should_send_queries_to_a_group_of_shards?
       self.send_transaction_to_multiple_shards(@groups[current_group], options, &block)
       @current_group = nil      

data/lib/octopus/scope_proxy.rb

@@ -20,9 +20,13 @@ class Octopus::ScopeProxy
     @klass.connection()
   end
   
+  #TODO - THIS IS UGLY, NEEDS REFACTOR!
   def method_missing(method, *args, &block)
     @klass.connection().current_shard = @shard
-    @klass.send(method, *args, &block)
+    @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 self
   end
   
   def ==(other)

data/spec/migrations/12_create_users_using_block.rb

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

data/spec/octopus/association_spec.rb

@@ -48,15 +48,16 @@ describe Octopus::Association do
     end
 
     it "should works when using create!" do
-      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
+      # 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
 

data/spec/octopus/migration_spec.rb

@@ -38,6 +38,15 @@ describe Octopus::Migration do
     end
   end
 
+  it "should create users inside block" do
+    migrating_to_version 12 do 
+      User.using(:brazil).where(:name => "UsingBlock1").all.size.should == 1
+      User.using(:brazil).where(:name => "UsingBlock2").all.size.should == 1
+      User.using(:canada).where(:name => "UsingCanada").all.size.should == 1
+      User.using(:canada).where(:name => "UsingCanada2").all.size.should == 1
+    end
+  end
+
   describe "should raise a exception when" do
     it "you specify a invalid shard name" do
       lambda { ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT, 6) }.should raise_error("Nonexistent Shard Name: amazing_shard")
@@ -72,7 +81,7 @@ describe Octopus::Migration do
           [:slave4, :slave1, :slave2, :slave3].each do |sym|
             Cat.using(sym).find_by_name("Slaves").should_not be_nil
           end
-          
+
           Cat.using(:master).find_by_name("Slaves").should be_nil
         end
       end

data/spec/octopus/model_spec.rb

@@ -25,6 +25,18 @@ describe Octopus::Model do
       User.using(:canada).using(:master).count.should == 0
       User.using(:master).using(:canada).count.should == 1
     end
+    
+    
+    it "should allow find inside blocks" do
+      @user = User.using(:brazil).create!(:name => "Thiago")
+
+      User.using(:brazil) do
+        User.first.should == @user
+      end
+      
+      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")
@@ -93,8 +105,7 @@ describe Octopus::Model do
 
     describe "raising errors" do
       it "should raise a error when you specify a shard that doesn't exist" do
-        pending()
-        #lambda { User.using(:crazy_shard) }.should raise_error("Nonexistent Shard Name: crazy_shard")
+        lambda { User.using(:crazy_shard).create!(:name => 'Thiago') }.should raise_error("Nonexistent Shard Name: crazy_shard")
       end
     end
   end

data/spec/octopus/replication_specs.rb

@@ -1,3 +1,5 @@
+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")

data/spec/octopus/scope_proxy_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Octopus::ScopeProxy do
+  it "should allow nested queries" do
+    @user1 = User.using(:brazil).create!(:name => "Thiago P", :number => 3)
+    @user2 = User.using(:brazil).create!(:name => "Thiago", :number => 1)
+    @user3 = User.using(:brazil).create!(:name => "Thiago", :number => 2)
+    
+    User.using(:brazil).where(:name => "Thiago").where(:number => 4).order(:number).all.should == []
+    User.using(:brazil).where(:name => "Thiago").using(:canada).where(:number => 2).using(:brazil).order(:number).all.should == [@user3]
+    User.using(:brazil).where(:name => "Thiago").using(:canada).where(:number => 4).using(:brazil).order(:number).all.should == []
+  end
+end

data/spec/spec_helper.rb

@@ -2,14 +2,11 @@ MIGRATIONS_ROOT = File.expand_path(File.join(File.dirname(__FILE__),  'migration
 require 'spec'
 require 'spec/autorun'
 require "spec/database_connection"
-require "action_pack"
 require "action_controller"
 require 'octopus'
 require "octopus_helper"
 
 Spec::Runner.configure do |config|  
-  config.mock_with :rspec
-
   config.before(:each) do
     Octopus.stub!(:directory).and_return(File.dirname(__FILE__))
     require "database_models"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 -03:00
+date: 2010-06-28 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,7 @@ files:
 - spec/database_models.rb
 - spec/migrations/10_create_users_using_replication.rb
 - spec/migrations/11_add_field_in_all_slaves.rb
+- spec/migrations/12_create_users_using_block.rb
 - spec/migrations/1_create_users_on_master.rb
 - spec/migrations/2_create_users_on_canada.rb
 - spec/migrations/3_create_users_on_both_shards.rb
@@ -100,6 +101,7 @@ files:
 - spec/octopus/octopus_spec.rb
 - spec/octopus/proxy_spec.rb
 - spec/octopus/replication_specs.rb
+- spec/octopus/scope_proxy_spec.rb
 - spec/octopus_helper.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -142,6 +144,7 @@ test_files:
 - spec/database_models.rb
 - spec/migrations/10_create_users_using_replication.rb
 - spec/migrations/11_add_field_in_all_slaves.rb
+- spec/migrations/12_create_users_using_block.rb
 - spec/migrations/1_create_users_on_master.rb
 - spec/migrations/2_create_users_on_canada.rb
 - spec/migrations/3_create_users_on_both_shards.rb
@@ -158,5 +161,6 @@ test_files:
 - spec/octopus/octopus_spec.rb
 - spec/octopus/proxy_spec.rb
 - spec/octopus/replication_specs.rb
+- spec/octopus/scope_proxy_spec.rb
 - spec/octopus_helper.rb
 - spec/spec_helper.rb