active_record_shards 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5542b744064c7c57d721c9bd315a17504c619d76
-  data.tar.gz: 8af807dac50f2c674678e45f1241445e6959a76c
+  metadata.gz: 0e203b68170add3e662a225149760c94ddec6a25
+  data.tar.gz: 0cd9762ecefd6e9c0fa52a244a142573d45a299d
 SHA512:
-  metadata.gz: 6193ca15cee5319d6c0be74a9121999e815724d836890038c06c09d5c45c9184467d52c76d33643169c7ecac14b0ec7d2da21b2a60801e58a9f3311d72a5e033
-  data.tar.gz: df1d2c2e88989cac38a4b6f2c2830416911b57a2c1cfa02fa448c059c309c379dc5473e5c4e43b02492b19999f88c159cc5c1d347343ba9fbd31b0fc87c45470
+  metadata.gz: 91264360257099f210038dc7794b26a142a418e23cb66b24abd1b8e3ae8868266886d9de7a8ae529864e6dd0a5243afeafda29d269ef1fddc8cfe41a0e830455
+  data.tar.gz: a607aad5fc1d32f4df67f331e1a651731c2b1900e8c7d52ffdccd56bf5d760fe61da456495d196e5521bda5817b541b178beb112dbeab26b4bae94f8433d5352

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/zendesk/active_record_shards.png)](http://travis-ci.org/zendesk/active_record_shards)
+
 # ActiveRecord Shards
 
 ActiveRecord Shards is an extension for ActiveRecord that provides support for sharded database and slaves. Basically it is just a nice way to
@@ -95,5 +97,3 @@ Copyright (c) 2011 Zendesk. See LICENSE for details.
 
 ## Authors
 Mick Staugaard, Eric Chapweske
-
-[![Build Status](https://secure.travis-ci.org/osheroff/active_record_shards.png)](http://travis-ci.org/osheroff/active_record_shards)

data/lib/active_record_shards.rb

@@ -14,7 +14,7 @@ module ActiveRecordShards
     env = Rails.env if defined?(Rails.env)
     env ||= RAILS_ENV if Object.const_defined?(:RAILS_ENV)
     env ||= ENV['RAILS_ENV']
-    env ||= 'development'
+    env || 'development'
   end
 end
 

data/lib/active_record_shards/connection_switcher-4-0.rb

@@ -1,6 +1,5 @@
 module ActiveRecordShards
   module ConnectionSwitcher
-
     # Name of the connection pool. Used by ConnectionHandler to retrieve the current connection pool.
     def connection_pool_name # :nodoc:
       name = current_shard_selection.shard_name(self)
@@ -22,7 +21,7 @@ module ActiveRecordShards
       name = connection_pool_name
       spec = configurations[name]
 
-      raise ActiveRecord::AdapterNotSpecified.new("No database defined by #{name} in database.yml") if spec.nil?
+      raise(ActiveRecord::AdapterNotSpecified, "No database defined by #{name} in database.yml") if spec.nil?
 
       # in 3.2 rails is asking for a connection pool in a map of these ConnectionSpecifications.  If we want to re-use connections,
       # we need to re-use specs.
@@ -61,7 +60,7 @@ module ActiveRecordShards
         specs_to_pools = connection_handler.connection_pools
       end
 
-      specs_to_pools.has_key?(connection_pool_key)
+      specs_to_pools.key?(connection_pool_key)
     end
   end
 end

data/lib/active_record_shards/connection_switcher-5-0.rb

@@ -1,7 +1,7 @@
 module ActiveRecordShards
   module ConnectionSwitcher
     def connection_specification_name
-      name = current_shard_selection.resolve_connection_name(sharded: is_sharded?, configurations: self.configurations)
+      name = current_shard_selection.resolve_connection_name(sharded: is_sharded?, configurations: configurations)
 
       raise "No configuration found for #{name}" unless configurations[name] || name == "primary"
       name

data/lib/active_record_shards/connection_switcher.rb

@@ -141,11 +141,11 @@ module ActiveRecordShards
 
     def switch_connection(options)
       if options.any?
-        if options.has_key?(:slave)
+        if options.key?(:slave)
           current_shard_selection.on_slave = options[:slave]
         end
 
-        if options.has_key?(:shard)
+        if options.key?(:shard)
           current_shard_selection.shard = options[:shard]
         end
 

data/lib/active_record_shards/default_slave_patches.rb

@@ -11,7 +11,7 @@ module ActiveRecordShards
       return unless base_methods.include?(method)
       _, method, punctuation = method.to_s.match(/^(.*?)([\?\!]?)$/).to_a
       base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        #{class_method ? "class << self" : ""}
+        #{class_method ? 'class << self' : ''}
           def #{method}_with_default_slave#{punctuation}(*args, &block)
             on_slave_unless_tx do
               #{method}_without_default_slave#{punctuation}(*args, &block)
@@ -20,7 +20,7 @@ module ActiveRecordShards
 
           alias_method :#{method}_without_default_slave#{punctuation}, :#{method}#{punctuation}
           alias_method :#{method}#{punctuation}, :#{method}_with_default_slave#{punctuation}
-        #{class_method ? "end" : ""}
+        #{class_method ? 'end' : ''}
       RUBY
     end
 
@@ -58,7 +58,7 @@ module ActiveRecordShards
       end
     end
 
-    CLASS_SLAVE_METHODS = [ :find_by_sql, :count_by_sql,  :calculate, :find_one, :find_some, :find_every, :exists?, :table_exists? ]
+    CLASS_SLAVE_METHODS = [:find_by_sql, :count_by_sql, :calculate, :find_one, :find_some, :find_every, :exists?, :table_exists?]
 
     def self.extended(base)
       CLASS_SLAVE_METHODS.each { |m| ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(true, base, m) }
@@ -96,6 +96,13 @@ module ActiveRecordShards
         [:calculate, :exists?, :pluck, :find_with_associations].each do |m|
           ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, m)
         end
+
+        # ActiveRecord::Explain in v3 will eagerly establish an on_master
+        # connection just to just the _static_ `supports_explain?` method on
+        # the Mysql2Adapter
+        if ActiveRecord::VERSION::MAJOR == 3
+          ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :logging_query_plan)
+        end
       end
 
       def on_slave_unless_tx

data/lib/active_record_shards/migration.rb

@@ -5,17 +5,17 @@ module ActiveRecord
       [:up, :down, :run].each do |m|
         define_method("#{m}_with_sharding") do |*args|
           ActiveRecord::Base.on_shard(nil) do
-            self.send("#{m}_without_sharding", *args)
+            send("#{m}_without_sharding", *args)
           end
           ActiveRecord::Base.on_all_shards do
-            self.send("#{m}_without_sharding", *args)
+            send("#{m}_without_sharding", *args)
           end
         end
         alias_method :"#{m}_without_sharding", m.to_sym
         alias_method m.to_sym, :"#{m}_with_sharding"
       end
 
-      def bootstrap_migrations_from_nil_shard(migrations_path, this_migration=nil)
+      def bootstrap_migrations_from_nil_shard(migrations_path, this_migration = nil)
         migrations = nil
         ActiveRecord::Base.on_shard(nil) do
           migrations = ActiveRecord::Migrator.new(:up, migrations_path).migrated
@@ -78,7 +78,6 @@ module ActiveRecordShards
     def shard(arg = nil)
       self.migration_shard = arg
     end
-
   end
 
   # ok, so some 'splaining to do.  Rails 3.1 puts the migrate() method on the instance of the
@@ -87,7 +86,7 @@ module ActiveRecordShards
   module ActualMigrationExtension
     def migrate_with_forced_shard(direction)
       if migration_shard.blank?
-        raise RuntimeError, "#{self.name}: Can't run migrations without a shard spec: this may be :all, :none,
+        raise "#{name}: Can't run migrations without a shard spec: this may be :all, :none,
                  or a specific shard (for data-fixups).  please call shard(arg) in your migration."
       end
 

data/lib/active_record_shards/schema_dumper_extension.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module ActiveRecordShards
   module SchemaDumperExtension
-
     def dump(stream)
       stream = super(stream)
       original_connection = @connection
@@ -21,7 +20,6 @@ module ActiveRecordShards
       @connection = original_connection
     end
 
-
     def shard_header(stream)
       define_params = @version ? "version: #{@version}" : ""
 
@@ -34,11 +32,10 @@ ActiveRecord::Base.on_all_shards do
 ActiveRecord::Schema.define(#{define_params}) do
 
 HEADER
-      end
+    end
 
     def shard_trailer(stream)
       stream.puts "end\nend"
     end
-
   end
 end

data/lib/active_record_shards/shard_selection.rb

@@ -82,7 +82,7 @@ module ActiveRecordShards
     end
 
     def options
-      {:shard => @shard, :slave => @on_slave}
+      { :shard => @shard, :slave => @on_slave }
     end
   end
 end

data/lib/active_record_shards/shard_support.rb

@@ -41,9 +41,9 @@ module ActiveRecordShards
     end
 
     private
+
     def ensure_concrete!
       raise "Please call this method on a concrete model, not an abstract class!" if @scope.abstract_class?
     end
   end
 end
-

data/lib/active_record_shards/tasks.rb

@@ -15,7 +15,7 @@ namespace :db do
         # rescue ActiveRecord::NoDatabaseError # TODO: exists in AR but never is raised here ...
         #   $stderr.puts "Database '#{conf['database']}' does not exist"
         rescue Exception => error
-          $stderr.puts error, *(error.backtrace)
+          $stderr.puts error, *error.backtrace
           $stderr.puts "Couldn't drop #{conf['database']}"
         end
       end
@@ -68,7 +68,7 @@ namespace :db do
         pending_migrations.each do |pending_migration|
           puts '  %4d %s' % [pending_migration.version, pending_migration.name]
         end
-        abort %{Run "rake db:migrate" to update your database then try again.}
+        abort %(Run "rake db:migrate" to update your database then try again.)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.42.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.42.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple database switching for ActiveRecord.