ar-octopus 0.0.26 → 0.0.27

data/sample_app/public/javascripts/rails.js

@@ -0,0 +1,118 @@
+document.observe("dom:loaded", function() {
+  function handleRemote(element) {
+    var method, url, params;
+
+    if (element.tagName.toLowerCase() === 'form') {
+      method = element.readAttribute('method') || 'post';
+      url    = element.readAttribute('action');
+      params = element.serialize(true);
+    } else {
+      method = element.readAttribute('data-method') || 'get';
+      url    = element.readAttribute('href');
+      params = {};
+    }
+
+    var event = element.fire("ajax:before");
+    if (event.stopped) return false;
+
+    new Ajax.Request(url, {
+      method: method,
+      parameters: params,
+      asynchronous: true,
+      evalScripts: true,
+
+      onLoading:     function(request) { element.fire("ajax:loading", {request: request}); },
+      onLoaded:      function(request) { element.fire("ajax:loaded", {request: request}); },
+      onInteractive: function(request) { element.fire("ajax:interactive", {request: request}); },
+      onComplete:    function(request) { element.fire("ajax:complete", {request: request}); },
+      onSuccess:     function(request) { element.fire("ajax:success", {request: request}); },
+      onFailure:     function(request) { element.fire("ajax:failure", {request: request}); }
+    });
+
+    element.fire("ajax:after");
+  }
+
+  function handleMethod(element) {
+    var method, url, token_name, token;
+
+    method     = element.readAttribute('data-method');
+    url        = element.readAttribute('href');
+    csrf_param = $$('meta[name=csrf-param]').first();
+    csrf_token = $$('meta[name=csrf-token]').first();
+
+    var form = new Element('form', { method: "POST", action: url, style: "display: none;" });
+    element.parentNode.appendChild(form);
+
+    if (method != 'post') {
+      var field = new Element('input', { type: 'hidden', name: '_method', value: method });
+      form.appendChild(field);
+    }
+
+    if (csrf_param) {
+      var param = csrf_param.readAttribute('content');
+      var token = csrf_token.readAttribute('content');
+      var field = new Element('input', { type: 'hidden', name: param, value: token });
+      form.appendChild(field);
+    }
+
+    form.submit();
+  }
+
+  $(document.body).observe("click", function(event) {
+    var message = event.findElement().readAttribute('data-confirm');
+    if (message && !confirm(message)) {
+      event.stop();
+      return false;
+    }
+
+    var element = event.findElement("a[data-remote]");
+    if (element) {
+      handleRemote(element);
+      event.stop();
+      return true;
+    }
+
+    var element = event.findElement("a[data-method]");
+    if (element) {
+      handleMethod(element);
+      event.stop();
+      return true;
+    }
+  });
+
+  // TODO: I don't think submit bubbles in IE
+  $(document.body).observe("submit", function(event) {
+    var element = event.findElement(),
+        message = element.readAttribute('data-confirm');
+    if (message && !confirm(message)) {
+      event.stop();
+      return false;
+    }
+
+    var inputs = element.select("input[type=submit][data-disable-with]");
+    inputs.each(function(input) {
+      input.disabled = true;
+      input.writeAttribute('data-original-value', input.value);
+      input.value = input.readAttribute('data-disable-with');
+    });
+
+    var element = event.findElement("form[data-remote]");
+    if (element) {
+      handleRemote(element);
+      event.stop();
+    }
+  });
+
+  $(document.body).observe("ajax:after", function(event) {
+    var element = event.findElement();
+
+    if (element.tagName.toLowerCase() === 'form') {
+      var inputs = element.select("input[type=submit][disabled=true][data-disable-with]");
+      inputs.each(function(input) {
+        input.value = input.readAttribute('data-original-value');
+        input.writeAttribute('data-original-value', null);
+        input.disabled = false;
+      });
+    }
+  });
+});

data/sample_app/public/robots.txt

@@ -0,0 +1,5 @@
+# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-Agent: *
+# Disallow: /

data/sample_app/script/cucumber

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+vendored_cucumber_bin = Dir["#{File.dirname(__FILE__)}/../vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+if vendored_cucumber_bin
+  load File.expand_path(vendored_cucumber_bin)
+else
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+  require 'cucumber'
+  load Cucumber::BINARY
+end

data/sample_app/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/sample_app/spec/models/item_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Item do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

data/sample_app/spec/models/user_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe User do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

data/sample_app/spec/spec_helper.rb

@@ -0,0 +1,27 @@
+# This file is copied to ~/spec when you run 'ruby script/generate rspec'
+# from the project root directory.
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+  # == Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  config.mock_with :rspec
+
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, comment the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+end

data/sample_app/test/performance/browsing_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+require 'rails/performance_test_help'
+
+# Profiling results for each test method are written to tmp/performance.
+class BrowsingTest < ActionDispatch::PerformanceTest
+  def test_homepage
+    get '/'
+  end
+end

data/sample_app/test/test_helper.rb

@@ -0,0 +1,13 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end

data/spec/config/shards.yml

@@ -109,26 +109,24 @@ octopus_rails:
     - production
 
   staging:
-    shards:
-      slave1:
-        adapter: mysql
-        host: localhost
-        database: octopus_shard2
-      slave2:
-        adapter: mysql
-        host: localhost
-        database: octopus_shard3
+    slave1:
+      adapter: mysql
+      host: localhost
+      database: octopus_shard2
+    slave2:
+      adapter: mysql
+      host: localhost
+      database: octopus_shard3
 
   production:
-    shards:
-      slave3:
-        adapter: mysql
-        host: localhost
-        database: octopus_shard4
-      slave4:
-        adapter: mysql
-        host: localhost
-        database: octopus_shard5
+    slave3:
+      adapter: mysql
+      host: localhost
+      database: octopus_shard4
+    slave4:
+      adapter: mysql
+      host: localhost
+      database: octopus_shard5
       
       
   

data/spec/database_models.rb

@@ -21,6 +21,11 @@ end
 #This items belongs to a client
 class Item < ActiveRecord::Base
   belongs_to :client
+  has_many :parts
+end
+
+class Part < ActiveRecord::Base
+  belongs_to :item
 end
 
 class Keyboard < ActiveRecord::Base

data/spec/octopus/model_spec.rb

@@ -11,15 +11,15 @@ 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
@@ -36,12 +36,20 @@ describe Octopus::Model do
       User.create!(:name => 'oi')
       User.count.should == 1
     end
-    
+
+    it "should allow creating more than one user" do
+      User.using(:canada).create([{ :name => 'America User 1' }, { :name => 'America User 2' }])
+      User.create!(:name => "Thiago")
+      User.using(:canada).find_by_name("America User 1").should_not be_nil
+      User.using(:canada).find_by_name("America User 2").should_not be_nil      
+      User.using(:master).find_by_name("Thiago").should_not be_nil
+    end
+
     it "should work when you have a SQLite3 shard" do
       u = User.using(:sqlite_shard).create!(:name => "Sqlite3")
       User.using(:sqlite_shard).find_by_name("Sqlite3").should == u
     end
-    
+
     it "should clean #current_shard from proxy when using execute" do
       ActiveRecord::Base.using(:canada).connection().execute("select * from users limit 1;")
       ActiveRecord::Base.connection.current_shard.should == :master
@@ -52,14 +60,14 @@ 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")
 
       Octopus.using(:brazil) do
         User.first.should == @user
       end
-      
+
       User.using(:brazil).find_by_name("Thiago").should == @user
     end
 
@@ -195,14 +203,14 @@ describe Octopus::Model do
       @user2.update_attributes(:name => "Joaquim")  
       User.using(:brazil).find_by_name("Joaquim").should_not be_nil    
     end
-    
+
     it "using update_attributes inside a block" do
       Octopus.using(:brazil) do
         @user = User.create!(:name => "User1")
         @user2 = User.find(@user.id)
         @user2.update_attributes(:name => "Joaquim")  
       end
-      
+
       User.find_by_name("Joaquim").should be_nil
       User.using(:brazil).find_by_name("Joaquim").should_not be_nil
     end
@@ -213,18 +221,18 @@ describe Octopus::Model do
       @user2.update_attributes(:name => "Joaquim")  
       User.using(:brazil).find_by_name("Joaquim").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.find_by_name("Thiago").should be_nil
         User.create!(:name => "Brazil")
       end
-      
+
       User.using(:brazil).count.should == 1
       User.using(:master).count.should == 1
     end
@@ -246,14 +254,69 @@ describe Octopus::Model do
       end
     end
   end
-  
+
+  describe "when you have joins/include" do 
+    before(:each) do
+      @client1 = Client.using(:brazil).create(:name => "Thiago")
+      
+      Octopus.using(:canada) do 
+        @client2 = Client.create(:name => "Mike")
+        @client3 = Client.create(:name => "Joao")
+        @item1 = Item.create(:client => @client2, :name => "Item 1")
+        @item2 = Item.create(:client => @client2, :name => "Item 2")
+        @item3 = Item.create(:client => @client3, :name => "Item 3")
+        @part1 = Part.create(:item => @item1, :name => "Part 1")
+        @part2 = Part.create(:item => @item1, :name => "Part 2")
+        @part3 = Part.create(:item => @item2, :name => "Part 3")
+      end
+      
+      @item4 = Item.using(:brazil).create(:client => @client1, :name => "Item 4")
+    end
+    
+    it "should work with the rails 2.x syntax" do
+      items = Item.using(:canada).find(:all, :joins => :client, :conditions => { :clients => { :id => @client2.id } })      
+      items.should == [@item1, @item2]
+    end
+    
+    it "should work using the rails 3.x syntax" do
+      if Octopus.rails3?
+        items = Item.using(:canada).joins(:client).where("clients.id = #{@client2.id}").all
+        items.should == [@item1, @item2]      
+      end
+    end
+    
+    it "should work for include also, rails 2.x syntax" do
+      items = Item.using(:canada).find(:all, :include => :client, :conditions => { :clients => { :id => @client2.id } })      
+      items.should == [@item1, @item2]
+    end
+
+    it "should work for include also, rails 3.x syntax" do
+      if Octopus.rails3?
+        items = Item.using(:canada).includes(:client).where("clients.id = #{@client2.id}").all
+        items.should == [@item1, @item2]
+      end
+    end
+    
+    it "should work for multiple includes, with rails 2.x syntax" do
+      parts = Part.using(:canada).find(:all, :include => {:item => :client}, :conditions => {:clients => { :id => @client2.id}})
+      parts.should == [@part1, @part2, @part3]
+      parts.first.item.client.should == @client2
+    end
+    
+    it "should work for multiple join, with rails 2.x syntax" do
+      parts = Part.using(:canada).find(:all, :joins => {:item => :client}, :conditions => {:clients => { :id => @client2.id}})
+      parts.should == [@part1, @part2, @part3]
+      parts.first.item.client.should == @client2
+    end
+  end
+
   describe "ActiveRecord::Base Validations" do
     it "should work correctly when using validations" do
       @key = Keyboard.create!(:name => "Key")
       lambda { Keyboard.using(:brazil).create!(:name => "Key") }.should_not raise_error()
       lambda { Keyboard.create!(:name => "Key") }.should raise_error()
     end
-    
+
     it "should work correctly when using validations with using syntax" do
       @key = Keyboard.using(:brazil).create!(:name => "Key")
       lambda { Keyboard.create!(:name => "Key") }.should_not raise_error()

data/spec/octopus/proxy_spec.rb

@@ -68,6 +68,7 @@ describe Octopus::Proxy do
     
     it "should initialize correctly octopus common variables for the enviroments" do
       Rails.stub!(:env).and_return('staging')
+      Octopus.instance_variable_set(:@rails_env, nil)
       Octopus.config()
       
       proxy.instance_variable_get(:@replicated).should be_true
@@ -89,6 +90,7 @@ describe Octopus::Proxy do
     after(:each) do
       Object.send(:remove_const, :Rails)
       Octopus.instance_variable_set(:@config, nil)
+      Octopus.instance_variable_set(:@rails_env, nil)
     end
   end