ar-octopus 0.0.26 → 0.0.27

data/Rakefile

@@ -1,4 +1,5 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
+$LOAD_PATH << (File.dirname(__FILE__) + '/spec')
 require 'rubygems'
 require 'rake'
 require "yaml"
@@ -30,8 +31,8 @@ begin
     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_dependency('activerecord', '>= 3.0.0beta')
-    gem.version = "0.0.26"
+    gem.add_dependency('activerecord', '>= 2.3')
+    gem.version = "0.0.27"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -85,6 +86,7 @@ namespace :db do
     end
     
     %x( dropdb -U #{postgres_user} octopus_shard1 )
+    %x(rm /tmp/database.sqlite3)
   end
 
   desc 'Create tables on tests databases'
@@ -155,6 +157,11 @@ namespace :db do
         u.string :commentable_type
         u.integer :commentable_id
       end
+      
+      ActiveRecord::Base.using(shard_symbol).connection.create_table(:parts) do |u|
+        u.string :name
+        u.integer :item_id
+      end
     end
   end
   

data/ar-octopus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-octopus}
-  s.version = "0.0.26"
+  s.version = "0.0.27"
 
   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-19}
+  s.date = %q{2010-07-23}
   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 = [
@@ -39,6 +39,71 @@ Gem::Specification.new do |s|
      "lib/octopus/rails3/persistence.rb",
      "lib/octopus/scope_proxy.rb",
      "rails/init.rb",
+     "sample_app/.gitignore",
+     "sample_app/.rspec",
+     "sample_app/Gemfile",
+     "sample_app/Gemfile.lock",
+     "sample_app/README",
+     "sample_app/Rakefile",
+     "sample_app/app/controllers/application_controller.rb",
+     "sample_app/app/helpers/application_helper.rb",
+     "sample_app/app/models/item.rb",
+     "sample_app/app/models/user.rb",
+     "sample_app/app/views/layouts/application.html.erb",
+     "sample_app/autotest/discover.rb",
+     "sample_app/config.ru",
+     "sample_app/config/application.rb",
+     "sample_app/config/boot.rb",
+     "sample_app/config/cucumber.yml",
+     "sample_app/config/database.yml",
+     "sample_app/config/environment.rb",
+     "sample_app/config/environments/development.rb",
+     "sample_app/config/environments/production.rb",
+     "sample_app/config/environments/test.rb",
+     "sample_app/config/initializers/backtrace_silencers.rb",
+     "sample_app/config/initializers/inflections.rb",
+     "sample_app/config/initializers/mime_types.rb",
+     "sample_app/config/initializers/secret_token.rb",
+     "sample_app/config/initializers/session_store.rb",
+     "sample_app/config/locales/en.yml",
+     "sample_app/config/routes.rb",
+     "sample_app/config/shards.yml",
+     "sample_app/db/migrate/20100720172715_create_users.rb",
+     "sample_app/db/migrate/20100720172730_create_items.rb",
+     "sample_app/db/migrate/20100720210335_create_sample_users.rb",
+     "sample_app/db/schema.rb",
+     "sample_app/db/seeds.rb",
+     "sample_app/doc/README_FOR_APP",
+     "sample_app/features/migrate.feature",
+     "sample_app/features/seed.feature",
+     "sample_app/features/step_definitions/seeds_steps.rb",
+     "sample_app/features/step_definitions/web_steps.rb",
+     "sample_app/features/support/env.rb",
+     "sample_app/features/support/paths.rb",
+     "sample_app/lib/tasks/.gitkeep",
+     "sample_app/lib/tasks/cucumber.rake",
+     "sample_app/public/404.html",
+     "sample_app/public/422.html",
+     "sample_app/public/500.html",
+     "sample_app/public/favicon.ico",
+     "sample_app/public/images/rails.png",
+     "sample_app/public/index.html",
+     "sample_app/public/javascripts/application.js",
+     "sample_app/public/javascripts/controls.js",
+     "sample_app/public/javascripts/dragdrop.js",
+     "sample_app/public/javascripts/effects.js",
+     "sample_app/public/javascripts/prototype.js",
+     "sample_app/public/javascripts/rails.js",
+     "sample_app/public/robots.txt",
+     "sample_app/public/stylesheets/.gitkeep",
+     "sample_app/script/cucumber",
+     "sample_app/script/rails",
+     "sample_app/spec/models/item_spec.rb",
+     "sample_app/spec/models/user_spec.rb",
+     "sample_app/spec/spec_helper.rb",
+     "sample_app/test/performance/browsing_test.rb",
+     "sample_app/test/test_helper.rb",
+     "sample_app/vendor/plugins/.gitkeep",
      "spec/config/shards.yml",
      "spec/database_connection.rb",
      "spec/database_models.rb",
@@ -109,20 +174,20 @@ Gem::Specification.new do |s|
       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_runtime_dependency(%q<activerecord>, [">= 3.0.0beta"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.3"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       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<activerecord>, [">= 3.0.0beta"])
+      s.add_dependency(%q<activerecord>, [">= 2.3"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     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<activerecord>, [">= 3.0.0beta"])
+    s.add_dependency(%q<activerecord>, [">= 2.3"])
   end
 end
 

data/lib/octopus/has_and_belongs_to_many_association.rb

@@ -4,11 +4,7 @@ module Octopus::HasAndBelongsToManyAssociation
       alias_method_chain :insert_record, :octopus
     end
   end
-
-  def should_wrap_the_connection?
-    @owner.respond_to?(:current_shard) && @owner.current_shard != nil
-  end
-
+  
   def insert_record_with_octopus(record, force = true, validate = true)
     if should_wrap_the_connection?
       Octopus.using(@owner.current_shard) { insert_record_without_octopus(record, force, validate) } 

data/lib/octopus/model.rb

@@ -3,10 +3,6 @@ module Octopus::Model
     base.send(:include, InstanceMethods)
     base.extend(ClassMethods)
     base.hijack_connection()
-    
-    class << base
-      alias_method_chain :connection, :octopus
-    end
   end
 
   module SharedMethods
@@ -50,19 +46,13 @@ module Octopus::Model
         Thread.current[:connection_proxy] ||= Octopus::Proxy.new(Octopus.config())
       end
 
-      def self.connection_with_octopus()
-        if defined?(::Rails) 
-          Octopus.config()
-          if Octopus.enviroments.include?(Rails.env.to_s)
-            self.connection_proxy().current_model = self
-            return self.connection_proxy()
-          else
-            self.connection_without_octopus()
-          end
-        else
-          self.connection_proxy().current_model = self
-          return self.connection_proxy()
+      def self.connection()
+        if defined?(::Rails) && Octopus.config() && !Octopus.enviroments.include?(Rails.env.to_s)
+          return super 
         end
+
+        self.connection_proxy().current_model = self
+        self.connection_proxy()
       end
     end
   end

data/lib/octopus/proxy.rb

@@ -12,12 +12,7 @@ class Octopus::Proxy
     @shards[:master] = ActiveRecord::Base.connection_pool()
     @current_shard = :master
     
-    if !config.nil? && Octopus.rails?
-      shards_config = config[Rails.env().to_s]["shards"]
-    elsif !config.nil?
-      shards_config = config["shards"]
-    end
-    
+    shards_config = config[Octopus.rails_env()] if !config.nil?
     shards_config ||= []
 
     shards_config.each do |key, value|

data/lib/octopus/scope_proxy.rb

@@ -13,14 +13,9 @@ class Octopus::ScopeProxy
   
   # 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
+    @klass.connection.run_queries_on_shard(@shard) do
+      @klass = @klass.connection().transaction(options, &block)
+    end      
   end
     
   def connection
@@ -29,8 +24,10 @@ class Octopus::ScopeProxy
   end
   
   def method_missing(method, *args, &block)
-    @klass.connection().current_shard = @shard
-    @klass = @klass.send(method, *args, &block)
+    @klass.connection.run_queries_on_shard(@shard) do
+      @klass = @klass.send(method, *args, &block)
+    end
+
     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/sample_app/.gitignore

@@ -0,0 +1,4 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/**/*

data/sample_app/.rspec

@@ -0,0 +1 @@
+--colour

data/sample_app/Gemfile

@@ -0,0 +1,22 @@
+source 'http://rubygems.org'
+
+gem 'rails', '3.0.0.beta4'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'sqlite3-ruby', :require => 'sqlite3'
+
+gem 'ar-octopus', :git => 'git://github.com/tchandy/octopus.git', :require => "octopus"
+
+group :test do 
+  gem 'capybara'
+  gem 'database_cleaner'
+  gem 'cucumber-rails'
+  gem 'cucumber'
+  gem 'spork'
+  gem 'launchy'   
+  gem "rspec-rails", ">= 2.0.0.beta.16"
+  gem 'ruby-debug'
+  gem "aruba"
+end

data/sample_app/Gemfile.lock

@@ -0,0 +1,149 @@
+GIT
+  remote: git://github.com/tchandy/octopus.git
+  revision: 65b5bcf
+  specs:
+    ar-octopus (0.0.26)
+      activerecord (>= 3.0.0beta)
+
+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)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.5)
+      i18n (~> 0.4.1)
+      rack (~> 1.1.0)
+      rack-mount (~> 0.6.3)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.16)
+    activemodel (3.0.0.beta4)
+      activesupport (= 3.0.0.beta4)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.0.beta4)
+      activemodel (= 3.0.0.beta4)
+      activesupport (= 3.0.0.beta4)
+      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)
+    arel (0.4.0)
+      activesupport (>= 3.0.0.beta)
+    aruba (0.2.1)
+    builder (2.1.2)
+    capybara (0.3.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.3)
+    columnize (0.3.1)
+    configuration (1.1.0)
+    cucumber (0.8.5)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.1.4)
+      json_pure (~> 1.4.3)
+      term-ansicolor (~> 1.0.4)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
+    culerity (0.2.10)
+    database_cleaner (0.5.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    gherkin (2.1.5)
+      trollop (~> 1.16.2)
+    i18n (0.4.1)
+    json_pure (1.4.3)
+    launchy (0.3.7)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
+    linecache (0.43)
+    mail (2.2.5)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
+    nokogiri (1.4.2)
+    polyglot (0.3.1)
+    rack (1.1.0)
+    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)
+      rake (>= 0.8.3)
+      thor (~> 0.13.6)
+    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)
+      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)
+    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)
+      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)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
+    trollop (1.16.2)
+    tzinfo (0.3.22)
+    webrat (0.7.1)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ar-octopus!
+  aruba
+  capybara
+  cucumber
+  cucumber-rails
+  database_cleaner
+  launchy
+  rails (= 3.0.0.beta4)
+  rspec-rails (>= 2.0.0.beta.16)
+  ruby-debug
+  spork
+  sqlite3-ruby

data/sample_app/README

@@ -0,0 +1,3 @@
+== Welcome to the Octopus test app!
+
+This is a sample app, created for testing propouses.

data/sample_app/Rakefile

@@ -0,0 +1,7 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+require 'rake'
+
+Rails::Application.load_tasks

data/sample_app/app/controllers/application_controller.rb

@@ -0,0 +1,4 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+  layout 'application'
+end