ar-octopus 0.0.28 → 0.0.29

data/.gitignore

@@ -2,3 +2,4 @@ pkg/*.*
 tmp/*
 *.sqlite3
 .rvmrc
+.bundle/*

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format=documentation

data/Gemfile

@@ -0,0 +1,9 @@
+source :gemcutter
+
+gem "rspec", "2.0.0.beta.19"
+gem "mysql", ">= 2.8.1"
+gem "pg", ">= 0.9.0"
+gem "sqlite3-ruby", ">= 1.3.1"
+gem 'activerecord', '>= 3.0.0.rc'
+gem 'actionpack', '>= 3.0.0.rc'
+gem "jeweler", ">= 1.4"

data/Gemfile.lock

@@ -0,0 +1,69 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionpack (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.9)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.22)
+    activemodel (3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      arel (~> 0.4.0)
+      tzinfo (~> 0.3.22)
+    activesupport (3.0.0.rc)
+    arel (0.4.0)
+      activesupport (>= 3.0.0.beta)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    gemcutter (0.6.1)
+    git (1.2.5)
+    i18n (0.4.1)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.3)
+    mysql (2.8.1)
+    pg (0.9.0)
+    rack (1.2.1)
+    rack-mount (0.6.9)
+      rack (>= 1.0.0)
+    rack-test (0.5.4)
+      rack (>= 1.0)
+    rspec (2.0.0.beta.19)
+      rspec-core (= 2.0.0.beta.19)
+      rspec-expectations (= 2.0.0.beta.19)
+      rspec-mocks (= 2.0.0.beta.19)
+    rspec-core (2.0.0.beta.19)
+    rspec-expectations (2.0.0.beta.19)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.19)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    sqlite3-ruby (1.3.1)
+    tzinfo (0.3.22)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (>= 3.0.0.rc)
+  activerecord (>= 3.0.0.rc)
+  jeweler (>= 1.4)
+  mysql (>= 2.8.1)
+  pg (>= 0.9.0)
+  rspec (= 2.0.0.beta.19)
+  sqlite3-ruby (>= 1.3.1)

data/README.mkdn

@@ -116,7 +116,29 @@ If you want to send a specified action, or all actions from a controller, to a s
 
  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> 
-  
+
+
+## Contributing with Octopus
+Contributors are welcome! To run the test suite, you need mysql, postgresql and sqlite3 installed. In order to install necessary gems, this is what you need to setup your Octopus development environment:
+
+<pre>
+  git clone http://github.com/tchandy/octopus.git
+  cd octopus
+  bundle install
+  rake db:prepare
+  rake spec
+</pre>
+
+To run our integrations tests inside sample_app, you need to following commands:
+
+<pre>
+  cd sample_app
+  bundle install
+  cucumber
+</pre>
+
+If you are having issues with octopus spec suite, check all databases password inside the config files, and make sure that your passwords/permissions are right.
+
 ## Thanks
 
 This project is sponsored by the <a href="http://www.rubysoc.org">Ruby Summer of Code</a>,

data/Rakefile

@@ -2,7 +2,10 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
 $LOAD_PATH << (File.dirname(__FILE__) + '/spec')
 require 'rubygems'
 require 'rake'
+require 'rake/tasklib'
 require "yaml"
+require "bundler"
+Bundler.setup()
 
 begin
   require 'metric_fu'
@@ -27,43 +30,33 @@ begin
     gem.email = "tchandy@gmail.com"
     gem.homepage = "http://github.com/tchandy/octopus"
     gem.authors = ["Thiago Pradi", "Mike Perham"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rspec", ">= 2.0.0.beta.19"
     gem.add_development_dependency "mysql", ">= 2.8.1"
     gem.add_development_dependency "pg", ">= 0.9.0"
     gem.add_development_dependency "sqlite3-ruby", ">= 1.3.1"
+    gem.add_development_dependency "jeweler", ">= 1.4"
+    gem.add_development_dependency "actionpack", ">= 2.3"
     gem.add_dependency('activerecord', '>= 2.3')
-    gem.version = "0.0.28"
+    gem.version = "0.0.29"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+RSpec::Core::RakeTask.new(:rcov) do |spec|
 end
 
 task :spec => :check_dependencies
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "octopus #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
 
 namespace :db do
   desc 'Build the databases for tests'

data/ar-octopus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-octopus}
-  s.version = "0.0.28"
+  s.version = "0.0.29"
 
   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-26}
+  s.date = %q{2010-07-30}
   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 = [
@@ -17,6 +17,9 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     ".rspec",
+     "Gemfile",
+     "Gemfile.lock",
      "README.mkdn",
      "Rakefile",
      "VERSION",
@@ -128,8 +131,8 @@ Gem::Specification.new do |s|
      "spec/octopus/proxy_spec.rb",
      "spec/octopus/replication_specs.rb",
      "spec/octopus/scope_proxy_spec.rb",
+     "spec/octopus/sharded_spec.rb",
      "spec/octopus_helper.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/tchandy/octopus}
@@ -161,6 +164,7 @@ Gem::Specification.new do |s|
      "spec/octopus/proxy_spec.rb",
      "spec/octopus/replication_specs.rb",
      "spec/octopus/scope_proxy_spec.rb",
+     "spec/octopus/sharded_spec.rb",
      "spec/octopus_helper.rb",
      "spec/spec_helper.rb"
   ]
@@ -170,23 +174,29 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
       s.add_development_dependency(%q<mysql>, [">= 2.8.1"])
       s.add_development_dependency(%q<pg>, [">= 0.9.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.4"])
+      s.add_development_dependency(%q<actionpack>, [">= 2.3"])
       s.add_runtime_dependency(%q<activerecord>, [">= 2.3"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
       s.add_dependency(%q<mysql>, [">= 2.8.1"])
       s.add_dependency(%q<pg>, [">= 0.9.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
+      s.add_dependency(%q<jeweler>, [">= 1.4"])
+      s.add_dependency(%q<actionpack>, [">= 2.3"])
       s.add_dependency(%q<activerecord>, [">= 2.3"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
     s.add_dependency(%q<mysql>, [">= 2.8.1"])
     s.add_dependency(%q<pg>, [">= 0.9.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
+    s.add_dependency(%q<jeweler>, [">= 1.4"])
+    s.add_dependency(%q<actionpack>, [">= 2.3"])
     s.add_dependency(%q<activerecord>, [">= 2.3"])
   end
 end

data/lib/octopus.rb

@@ -27,7 +27,7 @@ module Octopus
 
   # This is the default way to do Octopus Setup
   # Available variables:
-  # :enviroments => the enviroments that octopus will run. default: :production
+  # :enviroments => the enviroments that octopus will run. default: 'production'
   def self.setup
     yield self
   end

data/lib/octopus/association.rb

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

data/lib/octopus/model.rb

@@ -42,14 +42,17 @@ module Octopus::Model
     end
 
     def hijack_connection()
+      
+      def self.should_use_normal_connection?
+        defined?(Rails) && Octopus.config() && !Octopus.enviroments.include?(Rails.env.to_s)
+      end
+      
       def self.connection_proxy
         Thread.current[:connection_proxy] ||= Octopus::Proxy.new(Octopus.config())
       end
 
       def self.connection_with_octopus()
-        if defined?(Rails) && Octopus.config() && !Octopus.enviroments.include?(Rails.env.to_s)
-          return connection_without_octopus() 
-        end
+        return connection_without_octopus() if should_use_normal_connection?
 
         self.connection_proxy().current_model = self
         self.connection_proxy()
@@ -79,6 +82,10 @@ module Octopus::Model
     def replicated_model()
       write_inheritable_attribute(:replicated, true)
     end
+    
+    def sharded_model()
+      write_inheritable_attribute(:sharded, true)      
+    end
   end
 end
 

data/lib/octopus/proxy.rb

@@ -11,8 +11,11 @@ class Octopus::Proxy
     @groups = {}
     @shards[:master] = ActiveRecord::Base.connection_pool()
     @current_shard = :master
+    if !config.nil?
+      @entire_sharded = config['entire_sharded']  
+      shards_config = config[Octopus.rails_env()] 
+    end
     
-    shards_config = config[Octopus.rails_env()] if !config.nil?
     shards_config ||= []
 
     shards_config.each do |key, value|

data/sample_app/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.0.beta4'
+gem 'rails', '3.0.0.rc'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -17,6 +17,6 @@ group :test do
   gem 'spork'
   gem 'launchy'   
   gem "rspec-rails", ">= 2.0.0.beta.16"
-  gem 'ruby-debug'
+  gem 'ruby-debug' if RUBY_VERSION < "1.9"
   gem "aruba"
 end

data/sample_app/Gemfile.lock

@@ -1,40 +1,40 @@
 GIT
   remote: git://github.com/tchandy/octopus.git
-  revision: 65b5bcf
+  revision: 074e64f
   specs:
-    ar-octopus (0.0.26)
-      activerecord (>= 3.0.0beta)
+    ar-octopus (0.0.28)
+      activerecord (>= 2.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
-      mail (~> 2.2.3)
-    actionpack (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
+    actionmailer (3.0.0.rc)
+      actionpack (= 3.0.0.rc)
+      mail (~> 2.2.5)
+    actionpack (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
       builder (~> 2.1.2)
-      erubis (~> 2.6.5)
+      erubis (~> 2.6.6)
       i18n (~> 0.4.1)
-      rack (~> 1.1.0)
-      rack-mount (~> 0.6.3)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.9)
       rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.16)
-    activemodel (3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
+      tzinfo (~> 0.3.22)
+    activemodel (3.0.0.rc)
+      activesupport (= 3.0.0.rc)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
+    activerecord (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
       arel (~> 0.4.0)
-      tzinfo (~> 0.3.16)
-    activeresource (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-    activesupport (3.0.0.beta4)
+      tzinfo (~> 0.3.22)
+    activeresource (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+    activesupport (3.0.0.rc)
     arel (0.4.0)
       activesupport (>= 3.0.0.beta)
     aruba (0.2.1)
@@ -78,55 +78,55 @@ GEM
     mime-types (1.16)
     nokogiri (1.4.2)
     polyglot (0.3.1)
-    rack (1.1.0)
+    rack (1.2.1)
     rack-mount (0.6.9)
       rack (>= 1.0.0)
     rack-test (0.5.4)
       rack (>= 1.0)
-    rails (3.0.0.beta4)
-      actionmailer (= 3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
-      activerecord (= 3.0.0.beta4)
-      activeresource (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      bundler (>= 0.9.26)
-      railties (= 3.0.0.beta4)
-    railties (3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
+    rails (3.0.0.rc)
+      actionmailer (= 3.0.0.rc)
+      actionpack (= 3.0.0.rc)
+      activerecord (= 3.0.0.rc)
+      activeresource (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      bundler (>= 1.0.0.rc.1)
+      railties (= 3.0.0.rc)
+    railties (3.0.0.rc)
+      actionpack (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
       rake (>= 0.8.3)
-      thor (~> 0.13.6)
+      thor (~> 0.14.0)
     rake (0.8.7)
-    rspec (2.0.0.beta.18)
-      rspec-core (= 2.0.0.beta.18)
-      rspec-expectations (= 2.0.0.beta.18)
-      rspec-mocks (= 2.0.0.beta.18)
-    rspec-core (2.0.0.beta.18)
-    rspec-expectations (2.0.0.beta.18)
+    rspec (2.0.0.beta.19)
+      rspec-core (= 2.0.0.beta.19)
+      rspec-expectations (= 2.0.0.beta.19)
+      rspec-mocks (= 2.0.0.beta.19)
+    rspec-core (2.0.0.beta.19)
+    rspec-expectations (2.0.0.beta.19)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.18)
-    rspec-rails (2.0.0.beta.18)
-      rspec (>= 2.0.0.beta.14)
-      webrat (>= 0.7.0)
+    rspec-mocks (2.0.0.beta.19)
+    rspec-rails (2.0.0.beta.19)
+      rspec (= 2.0.0.beta.19)
+      webrat (>= 0.7.2.beta.1)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.3.0)
     ruby-debug-base (0.10.3)
       linecache (>= 0.3)
     rubyzip (0.9.4)
-    selenium-webdriver (0.0.26)
+    selenium-webdriver (0.0.27)
       ffi (>= 0.6.1)
       json_pure
       rubyzip
     spork (0.8.4)
     sqlite3-ruby (1.3.1)
     term-ansicolor (1.0.5)
-    thor (0.13.8)
+    thor (0.14.0)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     trollop (1.16.2)
     tzinfo (0.3.22)
-    webrat (0.7.1)
+    webrat (0.7.2.beta.1)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
@@ -142,7 +142,7 @@ DEPENDENCIES
   cucumber-rails
   database_cleaner
   launchy
-  rails (= 3.0.0.beta4)
+  rails (= 3.0.0.rc)
   rspec-rails (>= 2.0.0.beta.16)
   ruby-debug
   spork

data/sample_app/app/models/item.rb

@@ -1,2 +1,3 @@
 class Item < ActiveRecord::Base
+  belongs_to :user
 end

data/sample_app/app/models/user.rb

@@ -1,2 +1,3 @@
 class User < ActiveRecord::Base
+  has_many :items
 end

data/spec/config/shards.yml

@@ -127,6 +127,28 @@ octopus_rails:
       adapter: mysql
       host: localhost
       database: octopus_shard5
+
+
+not_entire_sharded:
+  entire_sharded: false
+  shards:
+    europe:
+      adapter: mysql
+      host: localhost
+      database: octopus_shard2
+    canada:
+      adapter: mysql
+      host: localhost
+      database: octopus_shard3
+    brazil:
+      adapter: mysql
+      host: localhost
+      database: octopus_shard4
+    russia:
+      adapter: mysql
+      host: localhost
+      database: octopus_shard5
+  
       
       
   

data/spec/database_models.rb

@@ -16,6 +16,7 @@ end
 #This class is replicated
 class Cat < ActiveRecord::Base
   replicated_model()
+  #sharded_model()
 end
 
 #This items belongs to a client

data/spec/octopus/association_spec.rb

@@ -99,9 +99,11 @@ describe Octopus::Association do
         @permission_brazil_2.roles.to_set.should == [@role].to_set
       end
 
-      it "update_attribute" do
-        @permission_brazil_2.update_attribute(:role_ids, [@role.id])
-        @permission_brazil_2.roles.to_set.should == [@role].to_set
+      if !Octopus.rails3?
+        it "update_attribute" do
+          @permission_brazil_2.update_attribute(:role_ids, [@role.id])
+          @permission_brazil_2.roles.to_set.should == [@role].to_set
+        end
       end
 
       it "<<" do
@@ -252,9 +254,11 @@ describe Octopus::Association do
         @new_brazil_programmer.projects.to_set.should == [@project].to_set
       end
 
-      it "update_attribute" do
-        @new_brazil_programmer.update_attribute(:project_ids, [@project.id])
-        @new_brazil_programmer.projects.to_set.should == [@project].to_set
+      if !Octopus.rails3?
+        it "update_attribute" do
+          @new_brazil_programmer.update_attribute(:project_ids, [@project.id])
+          @new_brazil_programmer.projects.to_set.should == [@project].to_set
+        end
       end
 
       it "<<" do
@@ -377,7 +381,7 @@ 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")
@@ -409,14 +413,17 @@ describe Octopus::Association do
         @brazil_client.items.to_set.should == [@item_brazil].to_set 
       end
 
+
       it "update_attributes" do
         @brazil_client.update_attributes(:item_ids => [@item_brazil_2.id, @item_brazil.id])
         @brazil_client.items.to_set.should == [@item_brazil, @item_brazil_2].to_set
       end
 
-      it "update_attribute" do
-        @brazil_client.update_attribute(:item_ids, [@item_brazil_2.id, @item_brazil.id])
-        @brazil_client.items.to_set.should == [@item_brazil, @item_brazil_2].to_set
+      if !Octopus.rails3?
+        it "update_attribute" do
+          @brazil_client.update_attribute(:item_ids, [@item_brazil_2.id, @item_brazil.id])
+          @brazil_client.items.to_set.should == [@item_brazil, @item_brazil_2].to_set
+        end
       end
 
       it "<<" do
@@ -509,7 +516,7 @@ describe Octopus::Association do
       end
     end
   end
-  
+
   describe "when you have a 1 x N polymorphic relationship" do
     before(:each) do
       @brazil_client = Client.using(:brazil).create!(:name => "Brazil Client")
@@ -550,9 +557,11 @@ describe Octopus::Association do
         @brazil_client.comments.to_set.should == [@comment_brazil, @comment_brazil_2].to_set
       end
 
-      it "update_attribute" do
-        @brazil_client.update_attribute(:comment_ids, [@comment_brazil_2.id, @comment_brazil.id])
-        @brazil_client.comments.to_set.should == [@comment_brazil, @comment_brazil_2].to_set
+      if !Octopus.rails3?
+        it "update_attribute" do
+          @brazil_client.update_attribute(:comment_ids, [@comment_brazil_2.id, @comment_brazil.id])
+          @brazil_client.comments.to_set.should == [@comment_brazil, @comment_brazil_2].to_set
+        end
       end
 
       it "<<" do

data/spec/octopus/controller_spec.rb

@@ -15,7 +15,7 @@ describe "Rails Controllers" do
         end
       end
       
-      def self._router
+      def self._routes
         ActionDispatch::Routing::RouteSet.new
       end      
     end

data/spec/octopus/model_spec.rb

@@ -218,7 +218,7 @@ describe Octopus::Model do
     it "update_attribute" do
       @user = User.using(:brazil).create!(:name => "User1")
       @user2 = User.using(:brazil).find(@user.id)
-      @user2.update_attributes(:name => "Joaquim")  
+      @user2.update_attribute(:name, "Joaquim")  
       User.using(:brazil).find_by_name("Joaquim").should_not be_nil
     end
 

data/spec/octopus/proxy_spec.rb

@@ -116,6 +116,13 @@ describe Octopus::Proxy do
 
         User.find_by_name("Thiago").should == @user
       end
+      
+      it "should work with associations" do
+        u = Client.create!(:name => "Thiago")
+        i = Item.create(:name => "Item")
+        u.items << i
+        u.save()
+      end
     end
 
     after(:each) do

data/spec/octopus/sharded_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "when the database is not entire sharded" do
+  before(:each) do
+    Octopus.stub!(:env).and_return("not_entire_sharded")
+    clean_connection_proxy()
+  end
+ 
+  it "should not send all queries to the specified slave" do
+    pending()
+    # User.create!(:name => "Thiago")
+    # 
+    # using_enviroment :not_entire_sharded do 
+    #   Octopus.using(:russia) do
+    #     User.create!(:name => "Thiago")
+    #   end
+    # end
+    # 
+    # User.count.should == 2
+  end
+  
+  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 
+      Octopus.using(:russia) do
+        Cat.create!(:name => "Thiago")
+      end
+    end
+    
+    Cat.count.should == 1
+  end
+end

data/spec/spec_helper.rb

@@ -1,21 +1,21 @@
 require "rubygems"
-MIGRATIONS_ROOT = File.expand_path(File.join(File.dirname(__FILE__),  'migrations'))
-
 if ENV["VERSION"]
   gem 'activerecord', ENV["VERSION"]
   gem 'activesupport', ENV["VERSION"]
   gem 'actionpack', ENV["VERSION"]
 end
 
-require 'spec'
-require 'spec/autorun'
+require "bundler"
+Bundler.setup()
 require File.expand_path(File.dirname(__FILE__)) + "/database_connection"
-require "action_controller"
-require 'octopus'
+require "octopus"
 require "octopus_helper"
+require "action_controller"
+require 'rspec/core'
 
+MIGRATIONS_ROOT = File.expand_path(File.join(File.dirname(__FILE__),  'migrations'))
 
-Spec::Runner.configure do |config|  
+RSpec.configure do |config|
   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: 39
+  hash: 37
   prerelease: false
   segments: 
   - 0
   - 0
-  - 28
-  version: 0.0.28
+  - 29
+  version: 0.0.29
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -16,29 +16,32 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -03:00
+date: 2010-07-30 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  name: rspec
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 62196421
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
-  type: :development
-  version_requirements: *id001
+        - 0
+        - 0
+        - beta
+        - 19
+        version: 2.0.0.beta.19
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: mysql
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  name: mysql
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,12 +52,12 @@ dependencies:
         - 8
         - 1
         version: 2.8.1
-  type: :development
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: pg
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  name: pg
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,12 +68,12 @@ dependencies:
         - 9
         - 0
         version: 0.9.0
-  type: :development
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  name: sqlite3-ruby
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,12 +84,27 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: *id004
+  name: jeweler
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  name: actionpack
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,8 +114,22 @@ dependencies:
         - 2
         - 3
         version: "2.3"
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
-  version_requirements: *id005
+  name: activerecord
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
+        version: "2.3"
+  requirement: *id007
 description: This gem allows you to use sharded databases with ActiveRecord. this also provides a interface for replication and for running migrations with multiples shards.
 email: tchandy@gmail.com
 executables: []
@@ -108,6 +140,9 @@ extra_rdoc_files:
 - README.mkdn
 files: 
 - .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
 - README.mkdn
 - Rakefile
 - VERSION
@@ -219,8 +254,8 @@ files:
 - spec/octopus/proxy_spec.rb
 - spec/octopus/replication_specs.rb
 - spec/octopus/scope_proxy_spec.rb
+- spec/octopus/sharded_spec.rb
 - spec/octopus_helper.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/tchandy/octopus
@@ -280,5 +315,6 @@ test_files:
 - spec/octopus/proxy_spec.rb
 - spec/octopus/replication_specs.rb
 - spec/octopus/scope_proxy_spec.rb
+- spec/octopus/sharded_spec.rb
 - spec/octopus_helper.rb
 - spec/spec_helper.rb

data/spec/spec.opts

@@ -1,2 +0,0 @@
---color
---format=specdoc