active_record_shards 2.7.0 → 2.7.1

data/lib/active_record_shards/configuration_parser.rb

@@ -3,8 +3,7 @@ module ActiveRecordShards
     module_function
 
     def explode(conf)
-      conf.keys.each do |env_name|
-        env_config = conf[env_name]
+      conf.to_a.each do |env_name, env_config|
         if shards = env_config.delete('shards')
           env_config['shard_names'] = shards.keys
           shards.each do |shard_name, shard_conf|
@@ -14,13 +13,13 @@ module ActiveRecordShards
         end
       end
 
-      conf.keys.each do |env_name|
-        env_config = conf[env_name]
+      conf.to_a.each do |env_name, env_config|
         if slave_conf = env_config.delete('slave')
           expand_child!(env_config, slave_conf)
           conf["#{env_name}_slave"] = slave_conf
         end
       end
+
       conf
     end
 

data/lib/active_record_shards/connection_switcher.rb

@@ -135,7 +135,10 @@ module ActiveRecordShards
     end
 
     def shard_names
-      configurations[shard_env]['shard_names'] || []
+      unless config = configurations[shard_env]
+        raise "Did not find #{shard_env} in configurations, did you forget to add it to your database.yml ? (configurations: #{configurations.inspect})"
+      end
+      config['shard_names'] || []
     end
 
     private

data/lib/active_record_shards/default_slave_patches.rb

@@ -1,19 +1,20 @@
 module ActiveRecordShards
   module DefaultSlavePatches
-    CLASS_SLAVE_METHODS = [ :find_by_sql, :count_by_sql, :calculate, :find_one, :find_some, :find_every, :quote_value, :sanitize_sql_hash_for_conditions ]
+    CLASS_SLAVE_METHODS = [ :find_by_sql, :count_by_sql, :calculate, :find_one, :find_some, :find_every, :quote_value, :sanitize_sql_hash_for_conditions, :exists? ]
 
     def self.extended(base)
       base_methods = (base.methods | base.private_methods).map(&:to_sym)
       (CLASS_SLAVE_METHODS & base_methods).each do |slave_method|
+        _, slave_method, punctuation = slave_method.to_s.match(/^(.*?)([\?\!]?)$/).to_a
         base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
           class << self
-            def #{slave_method}_with_default_slave(*args, &block)
+            def #{slave_method}_with_default_slave#{punctuation}(*args, &block)
               on_slave_unless_tx do
-                #{slave_method}_without_default_slave(*args, &block)
+                #{slave_method}_without_default_slave#{punctuation}(*args, &block)
               end
             end
 
-            alias_method_chain :#{slave_method}, :default_slave
+            alias_method_chain :#{slave_method}#{punctuation}, :default_slave
           end
         RUBY
       end

data/test/configuration_parser_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative 'helper'
 
 class ConfigurationParserTest < ActiveSupport::TestCase
   context "exploding the database.yml" do

data/test/connection_switching_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative 'helper'
 
 class ConnectionSwitchingTest < ActiveSupport::TestCase
   context "shard switching" do
@@ -396,6 +396,12 @@ class ConnectionSwitchingTest < ActiveSupport::TestCase
           assert_equal 'master_name', account.reload.name
         end
 
+        should "do exists? on the slave" do
+          if Account.respond_to?(:exists?)
+            assert Account.exists?(1001)
+          end
+        end
+
         should "Allow override using on_master" do
           model = Account.on_master.find(1000)
           assert_equal "master_name", model.name

data/test/database.yml

@@ -1,14 +1,14 @@
 test:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: ars_test
   username: root
   password:
   host: 127.0.0.1
   shard_names: ['0', '1']
-  
+
 test_slave:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: ars_test_slave
   username: root
@@ -16,7 +16,7 @@ test_slave:
   host: 127.0.0.1
 
 test_shard_0:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: ars_test_shard0
   username: root
@@ -24,7 +24,7 @@ test_shard_0:
   host: 127.0.0.1
 
 test_shard_0_slave:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: ars_test_shard0_slave
   username: root
@@ -32,7 +32,7 @@ test_shard_0_slave:
   host: 127.0.0.1
 
 test_shard_1:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: ars_test_shard1
   username: root
@@ -40,7 +40,7 @@ test_shard_1:
   host: 127.0.0.1
 
 test_shard_1_slave:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: ars_test_shard1_slave
   username: root
@@ -48,7 +48,7 @@ test_shard_1_slave:
   host: 127.0.0.1
 
 test2:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: ars_test2
   username: root
@@ -56,7 +56,7 @@ test2:
   host: 127.0.0.1
 
 test2_slave:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: ars_test2_slave
   username: root
@@ -64,7 +64,7 @@ test2_slave:
   host: 127.0.0.1
 
 alternative:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: ars_test_alternative
   username: root

data/test/helper.rb

@@ -1,11 +1,10 @@
 require 'rubygems'
 require 'bundler'
+require 'test/unit'
 
 Bundler.setup
 Bundler.require(:default, :development)
 
-require 'mocha'
-
 if defined?(Debugger)
   ::Debugger.start
   ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)
@@ -15,6 +14,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'active_record_shards'
 require 'logger'
+require 'shoulda'
 
 RAILS_ENV = "test"
 

data/test/migrator_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative 'helper'
 
 class CowardlyMigration < ActiveRecord::Migration
   def self.up

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -35,150 +35,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.1
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Easily run queries on shard and slave databases.
 email:
 - mick@staugaard.com
@@ -213,7 +69,8 @@ files:
 - test/models.rb
 - test/schema.rb
 homepage: http://github.com/staugaard/active_record_shards
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: