ar-octopus 0.8.2 → 0.8.3

data/lib/octopus/railtie.rb

@@ -1,10 +1,10 @@
 begin
-  require "rails/railtie"
+  require 'rails/railtie'
 
   module Octopus
     class Railtie < Rails::Railtie
       rake_tasks do
-        Dir[File.join(File.dirname(__FILE__), "../tasks/*.rake")].each { |ext| load ext }
+        Dir[File.join(File.dirname(__FILE__), '../tasks/*.rake')].each { |ext| load ext }
       end
     end
   end

data/lib/octopus/relation_proxy.rb

@@ -18,6 +18,11 @@ module Octopus
     end
 
     # these methods are not normally sent to method_missing
+
+    def select(*args, &block)
+      method_missing(:select, *args, &block)
+    end
+
     def inspect
       method_missing(:inspect)
     end
@@ -34,6 +39,6 @@ module Octopus
         method_missing(:==, other)
       end
     end
-    alias :eql? :==
+    alias_method :eql?, :==
   end
 end

data/lib/octopus/scope_proxy.rb

@@ -1,47 +1,49 @@
-class Octopus::ScopeProxy
-  include Octopus::ShardTracking::Attribute
-  attr_accessor :klass
+module Octopus
+  class ScopeProxy
+    include Octopus::ShardTracking::Attribute
+    attr_accessor :klass
+
+    def initialize(shard, klass)
+      @current_shard = shard
+      @klass = klass
+    end
 
-  def initialize(shard, klass)
-    @current_shard = shard
-    @klass = klass
-  end
+    def using(shard)
+      fail "Nonexistent Shard Name: #{shard}" if @klass.connection.instance_variable_get(:@shards)[shard].nil?
+      @current_shard = shard
+      self
+    end
 
-  def using(shard)
-    raise "Nonexistent Shard Name: #{shard}" if @klass.connection.instance_variable_get(:@shards)[shard].nil?
-    @current_shard = shard
-    return self
-  end
+    # Transaction Method send all queries to a specified shard.
+    def transaction(options = {}, &block)
+      run_on_shard { @klass = klass.transaction(options, &block) }
+    end
 
-  # Transaction Method send all queries to a specified shard.
-  def transaction(options = {}, &block)
-    run_on_shard { @klass = klass.transaction(options, &block) }
-  end
+    def connection
+      @klass.connection.current_shard = @current_shard
+      @klass.connection
+    end
 
-  def connection
-    @klass.connection().current_shard = @current_shard
-    @klass.connection()
-  end
+    def method_missing(method, *args, &block)
+      result = run_on_shard { @klass.send(method, *args, &block) }
 
-  def method_missing(method, *args, &block)
-    result = run_on_shard { @klass.send(method, *args, &block) }
+      if result.respond_to?(:all)
+        @klass = result
+        return self
+      end
 
-    if result.respond_to?(:scoped)
-      @klass = result
-      return self
+      result
     end
 
-    result
-  end
-
-  def as_json(options = nil)
-    method_missing(:as_json, options)
-  end
+    def as_json(options = nil)
+      method_missing(:as_json, options)
+    end
 
-  # Delegates to method_missing (instead of @klass) so that User.using(:blah).where(:name => "Mike")
-  # gets run in the correct shard context when #== is evaluated.
-  def ==(*args)
-    method_missing(:==, *args)
+    # Delegates to method_missing (instead of @klass) so that User.using(:blah).where(:name => "Mike")
+    # gets run in the correct shard context when #== is evaluated.
+    def ==(other)
+      method_missing(:==, other)
+    end
+    alias_method :eql?, :==
   end
-  alias :eql? :==
 end

data/lib/octopus/shard_tracking.rb

@@ -1,45 +1,46 @@
-module Octopus::ShardTracking
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  module ClassMethods
-    # If the class which includes this module responds to the class
-    # method sharded_methods, then automagically alias_method_chain
-    # a sharding-friendly version of each of those methods into existence
-    def sharded_methods(*methods)
-      methods.each { |m| create_sharded_method(m) }
+module Octopus
+  module ShardTracking
+    def self.included(base)
+      base.extend(ClassMethods)
     end
 
-    def create_sharded_method(name)
-      name.to_s =~ /([^!?]+)([!?])?/
-      method, punctuation = [ $1, $2 ]
-      with = :"#{method}_with_octopus#{punctuation}"
-      without = :"#{method}_without_octopus#{punctuation}"
-      define_method with do |*args, &block|
-        run_on_shard { send(without, *args, &block) }
+    module ClassMethods
+      # If the class which includes this module responds to the class
+      # method sharded_methods, then automagically alias_method_chain
+      # a sharding-friendly version of each of those methods into existence
+      def sharded_methods(*methods)
+        methods.each { |m| create_sharded_method(m) }
+      end
+
+      def create_sharded_method(name)
+        name.to_s =~ /([^!?]+)([!?])?/
+        method, punctuation = [Regexp.last_match[1], Regexp.last_match[2]]
+        with = :"#{method}_with_octopus#{punctuation}"
+        without = :"#{method}_without_octopus#{punctuation}"
+        define_method with do |*args, &block|
+          run_on_shard { send(without, *args, &block) }
+        end
+        alias_method_chain name.to_sym, :octopus
       end
-      alias_method_chain name.to_sym, :octopus
     end
-  end
 
-  # Adds run_on_shard method, but does not implement current_shard method
-  def run_on_shard(&block)
-    cs = current_shard
-    if !!cs
-      r = ActiveRecord::Base.connection_proxy.run_queries_on_shard(current_shard, &block)
-      # Use a case statement to avoid any path through ActiveRecord::Delegation's
-      # respond_to? code. We want to avoid the respond_to? code because it can have
-      # the side effect of causing a call to load_target
-      # return r
-      case r
-      when ActiveRecord::Relation
-        Octopus::RelationProxy.new(cs, r)
+    # Adds run_on_shard method, but does not implement current_shard method
+    def run_on_shard(&block)
+      if (cs = current_shard)
+        r = ActiveRecord::Base.connection_proxy.run_queries_on_shard(cs, &block)
+        # Use a case statement to avoid any path through ActiveRecord::Delegation's
+        # respond_to? code. We want to avoid the respond_to? code because it can have
+        # the side effect of causing a call to load_target
+        # return r
+        case r
+        when ActiveRecord::Relation
+          Octopus::RelationProxy.new(cs, r)
+        else
+          r
+        end
       else
-        r
+        yield
       end
-    else
-      yield
     end
   end
 end

data/lib/octopus/shard_tracking/attribute.rb

@@ -1,24 +1,22 @@
 # Adds current_shard as an attribute; provide a default
 # implementation of set_current_shard which considers
 # only the current ActiveRecord::Base.connection_proxy
-module Octopus::ShardTracking::Attribute
-  def self.included(base)
-    base.send(:include, Octopus::ShardTracking)
-    base.extend(ClassMethods)
-    base.track_current_shard_as_attribute
-  end
+module Octopus
+  module ShardTracking
+    module Attribute
+      def self.included(base)
+        base.send(:include, Octopus::ShardTracking)
+      end
 
-  module ClassMethods
-    def track_current_shard_as_attribute
       attr_accessor :current_shard
-    end
-  end
 
-  def set_current_shard
-    return unless Octopus.enabled?
+      def set_current_shard
+        return unless Octopus.enabled?
 
-    if ActiveRecord::Base.connection_proxy.block
-      self.current_shard = ActiveRecord::Base.connection_proxy.current_shard
+        if ActiveRecord::Base.connection_proxy.block
+          self.current_shard = ActiveRecord::Base.connection_proxy.current_shard
+        end
+      end
     end
   end
 end

data/lib/octopus/shard_tracking/dynamic.rb

@@ -1,7 +1,11 @@
 require 'octopus/shard_tracking'
 
-module Octopus::ShardTracking::Dynamic
-  def self.included(base)
-    base.send(:include, Octopus::ShardTracking)
+module Octopus
+  module ShardTracking
+    module Dynamic
+      def self.included(base)
+        base.send(:include, Octopus::ShardTracking)
+      end
+    end
   end
 end

data/lib/octopus/singular_association.rb

@@ -1,6 +1,8 @@
-module Octopus::SingularAssociation
-  def self.included(base)
-    base.sharded_methods :reader, :writer, :create, :create!, :build
+module Octopus
+  module SingularAssociation
+    def self.included(base)
+      base.sharded_methods :reader, :writer, :create, :create!, :build
+    end
   end
 end
 

data/lib/octopus/slave_group.rb

@@ -1,11 +1,13 @@
-class Octopus::SlaveGroup
-  def initialize(slaves)
-    slaves = HashWithIndifferentAccess.new(slaves)
-    slaves_list = slaves.values
-    @load_balancer = Octopus::LoadBalancing::RoundRobin.new(slaves_list)
-  end
+module Octopus
+  class SlaveGroup
+    def initialize(slaves)
+      slaves = HashWithIndifferentAccess.new(slaves)
+      slaves_list = slaves.values
+      @load_balancer = Octopus::LoadBalancing::RoundRobin.new(slaves_list)
+    end
 
-  def next
-    @load_balancer.next
+    def next
+      @load_balancer.next
+    end
   end
 end

data/lib/octopus/version.rb

@@ -1,3 +1,3 @@
 module Octopus
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

data/rails/init.rb

@@ -1 +1 @@
-require "octopus"
+require 'octopus'

data/sample_app/autotest/discover.rb

@@ -1,2 +1,2 @@
-Autotest.add_discovery { "rails" }
-Autotest.add_discovery { "rspec2" }
+Autotest.add_discovery { 'rails' }
+Autotest.add_discovery { 'rspec2' }

data/sample_app/config/application.rb

@@ -34,7 +34,7 @@ module SampleApp
     # config.i18n.default_locale = :de
 
     # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    config.encoding = 'utf-8'
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]

data/sample_app/config/boot.rb

@@ -3,4 +3,4 @@ require 'rubygems'
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

data/sample_app/config/environments/test.rb

@@ -9,7 +9,7 @@ SampleApp::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = 'public, max-age=3600'
 
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true

data/sample_app/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-SampleApp::Application.config.session_store :cookie_store, key: '_sample_app_session'
+SampleApp::Application.config.session_store :cookie_store, :key => '_sample_app_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/sample_app/config/initializers/wrap_parameters.rb

@@ -5,7 +5,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters :format => [:json]
 end
 
 # Disable root element in JSON by default.

data/sample_app/config/routes.rb

@@ -1,4 +1,4 @@
-SampleApp::Application.routes.draw do 
+SampleApp::Application.routes.draw do
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

data/sample_app/db/migrate/20100720210335_create_sample_users.rb

@@ -2,10 +2,10 @@ class CreateSampleUsers < ActiveRecord::Migration
   using(:master, :asia, :europe, :america)
 
   def self.up
-    User.create!(:name => "Exception")
+    User.create!(:name => 'Exception')
   end
 
   def self.down
-    User.find_by_name("Exception").delete()
+    User.find_by_name('Exception').delete
   end
 end

data/sample_app/db/schema.rb

@@ -11,19 +11,19 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100720210335) do
+ActiveRecord::Schema.define(:version => 20_100_720_210_335) do
 
-  create_table "items", :force => true do |t|
-    t.string   "name"
-    t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table 'items', :force => true do |t|
+    t.string 'name'
+    t.integer 'user_id'
+    t.datetime 'created_at', :null => false
+    t.datetime 'updated_at', :null => false
   end
 
-  create_table "users", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table 'users', :force => true do |t|
+    t.string 'name'
+    t.datetime 'created_at', :null => false
+    t.datetime 'updated_at', :null => false
   end
 
 end

data/sample_app/db/seeds.rb

@@ -6,11 +6,11 @@
 #   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
 #   Mayor.create(:name => 'Daley', :city => cities.first)
 Octopus.using(:asia) do
-  User.create!(:name => "Asia User")
+  User.create!(:name => 'Asia User')
 end
 
 Octopus.using(:america) do
-  users_america = User.create([{ :name => 'America User 1' }, { :name => 'America User 2' }])
+  User.create([{ :name => 'America User 1' }, { :name => 'America User 2' }])
 end
 
-User.create!(:name => "Teste")
+User.create!(:name => 'Teste')

data/sample_app/features/step_definitions/seeds_steps.rb

@@ -3,11 +3,11 @@ Then /^the "([^"]*)" shard should have one user named "([^"]*)"$/ do |shard_name
 end
 
 Then /^the version of "([^"]*)" shard should be "([^"]*)"$/ do |shard_name, version|
-  ab = ActiveRecord::Base.using(shard_name.to_sym).connection.select_value("select * from schema_migrations order by version desc limit 1;")
-  version = "" if version == "nil"
+  ab = ActiveRecord::Base.using(shard_name.to_sym).connection.select_value('select * from schema_migrations order by version desc limit 1;')
+  version = '' if version == 'nil'
   ab.to_s.should == version
 end
 
 When /^I run inside my Rails project "([^"]*)" with enviroment "([^"]*)"$/ do |command, enviroment|
-  run("cd #{Rails.root.to_s} && RAILS_ENV=#{enviroment} #{command}")
-end
+  run("cd #{Rails.root} && RAILS_ENV=#{enviroment} #{command}")
+end

data/sample_app/features/step_definitions/web_steps.rb

@@ -4,10 +4,9 @@
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
-
 require 'uri'
 require 'cgi'
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'support', 'paths'))
 
 module WithinHelpers
   def with_scope(locator)
@@ -62,7 +61,7 @@ end
 When /^(?:|I )fill in the following(?: within "([^"]*)")?:$/ do |selector, fields|
   with_scope(selector) do
     fields.rows_hash.each do |name, value|
-      When %{I fill in "#{name}" with "#{value}"}
+      When %(I fill in "#{name}" with "#{value}")
     end
   end
 end
@@ -205,7 +204,7 @@ Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
   query = URI.parse(current_url).query
   actual_params = query ? CGI.parse(query) : {}
   expected_params = {}
-  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
+  expected_pairs.rows_hash.each_pair { |k, v| expected_params[k] = v.split(',') }
 
   if actual_params.respond_to? :should
     actual_params.should == expected_params