active_record_shards 3.7.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e203b68170add3e662a225149760c94ddec6a25
-  data.tar.gz: 0cd9762ecefd6e9c0fa52a244a142573d45a299d
+  metadata.gz: 7cd066dedaafc888517b5363be4efc2d812cb85e
+  data.tar.gz: 1fe39d92a3875a9b4b2f36dd4bdfc1d94dee8047
 SHA512:
-  metadata.gz: 91264360257099f210038dc7794b26a142a418e23cb66b24abd1b8e3ae8868266886d9de7a8ae529864e6dd0a5243afeafda29d269ef1fddc8cfe41a0e830455
-  data.tar.gz: a607aad5fc1d32f4df67f331e1a651731c2b1900e8c7d52ffdccd56bf5d760fe61da456495d196e5521bda5817b541b178beb112dbeab26b4bae94f8433d5352
+  metadata.gz: 7c48a0f57a841dca2eb11960527fbb8f81d5e38e86ce4e2e0097ab43e8059776603e571a26264341ecd6b7201a31b8bf30470d090bb1c6c646bcedca1af9ddee
+  data.tar.gz: beab57cf1269253638b4a6653dcf3351748fac968e49f42dc67f0670c7f0c03b6cc28e5594809c55fc7ea724d41b4de552ee89dfb2dcd7ae18ed91bd106d811e

data/lib/active_record_shards/association_collection_connection_selection.rb

@@ -31,7 +31,7 @@ module ActiveRecordShards
         @which = which
       end
 
-      def method_missing(method, *args, &block)
+      def method_missing(method, *args, &block) # rubocop:disable Style/MethodMissing
         # would love to not rely on version here, unfortunately @association_collection
         # is a sensitive little bitch of an object.
         reflection = @association_collection.proxy_association.reflection

data/lib/active_record_shards/configuration_parser.rb

@@ -9,12 +9,11 @@ module ActiveRecordShards
       conf = conf.deep_dup
 
       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|
-            expand_child!(env_config, shard_conf)
-            conf["#{env_name}_shard_#{shard_name}"] = shard_conf
-          end
+        next unless shards = env_config.delete('shards')
+        env_config['shard_names'] = shards.keys
+        shards.each do |shard_name, shard_conf|
+          expand_child!(env_config, shard_conf)
+          conf["#{env_name}_shard_#{shard_name}"] = shard_conf
         end
       end
 

data/lib/active_record_shards/connection_specification.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class ActiveRecord::Base
+ActiveRecord::Base.class_eval do
   def self.establish_connection(spec = ENV["DATABASE_URL"])
     if ActiveRecord::VERSION::STRING >= '4.1.0'
       spec ||= ActiveRecord::ConnectionHandling::DEFAULT_ENV.call

data/lib/active_record_shards/connection_switcher.rb

@@ -15,18 +15,18 @@ module ActiveRecordShards
 
     def default_shard=(new_default_shard)
       ActiveRecordShards::ShardSelection.default_shard = new_default_shard
-      switch_connection(:shard => new_default_shard)
+      switch_connection(shard: new_default_shard)
     end
 
-    def on_shard(shard, &block)
+    def on_shard(shard)
       old_options = current_shard_selection.options
-      switch_connection(:shard => shard) if supports_sharding?
+      switch_connection(shard: shard) if supports_sharding?
       yield
     ensure
       switch_connection(old_options)
     end
 
-    def on_first_shard(&block)
+    def on_first_shard
       shard_name = shard_names.first
       on_shard(shard_name) { yield }
     end
@@ -35,11 +35,11 @@ module ActiveRecordShards
       ShardSupport.new(self == ActiveRecord::Base ? nil : where(nil))
     end
 
-    def on_all_shards(&block)
+    def on_all_shards
       old_options = current_shard_selection.options
       if supports_sharding?
         shard_names.map do |shard|
-          switch_connection(:shard => shard)
+          switch_connection(shard: shard)
           yield(shard)
         end
       else
@@ -96,11 +96,12 @@ module ActiveRecordShards
     alias_method :with_slave_unless, :on_slave_unless
 
     def on_cx_switch_block(which, options = {}, &block)
+      @disallow_slave ||= 0
       old_options = current_shard_selection.options
-      switch_to_slave = (which == :slave && (@disallow_slave.nil? || @disallow_slave == 0))
-      switch_connection(:slave => switch_to_slave)
+      switch_to_slave = (which == :slave && @disallow_slave.zero?)
+      switch_connection(slave: switch_to_slave)
 
-      @disallow_slave = (@disallow_slave || 0) + 1 if which == :master
+      @disallow_slave += 1 if which == :master
 
       # we avoid_readonly_scope to prevent some stack overflow problems, like when
       # .columns calls .with_scope which calls .columns and onward, endlessly.
@@ -157,22 +158,20 @@ module ActiveRecordShards
       ActiveRecordShards.rails_env
     end
 
-    def columns_with_default_shard
+    def with_default_shard
       if is_sharded? && current_shard_id.nil? && table_name != ActiveRecord::Migrator.schema_migrations_table_name
-        on_first_shard { columns_without_default_shard }
+        on_first_shard { yield }
       else
-        columns_without_default_shard
+        yield
       end
     end
 
-    def table_exists_with_default_shard?
-      result = table_exists_without_default_shard?
-
-      if !result && is_sharded? && (shard_name = shard_names.first)
-        result = on_shard(shard_name) { table_exists_without_default_shard? }
-      end
+    def columns_with_default_shard
+      with_default_shard { columns_without_default_shard }
+    end
 
-      result
+    def table_exists_with_default_shard?
+      with_default_shard { table_exists_without_default_shard? }
     end
 
     class MasterSlaveProxy
@@ -181,7 +180,7 @@ module ActiveRecordShards
         @which = which
       end
 
-      def method_missing(method, *args, &block)
+      def method_missing(method, *args, &block) # rubocop:disable Style/MethodMissing
         @target.on_master_or_slave(@which) { @target.send(method, *args, &block) }
       end
     end

data/lib/active_record_shards/default_slave_patches.rb

@@ -2,11 +2,12 @@
 module ActiveRecordShards
   module DefaultSlavePatches
     def self.wrap_method_in_on_slave(class_method, base, method)
-      base_methods = if class_method
-        base.methods + base.private_methods
-      else
-        base.instance_methods + base.private_instance_methods
-      end
+      base_methods =
+        if class_method
+          base.methods + base.private_methods
+        else
+          base.instance_methods + base.private_instance_methods
+        end
 
       return unless base_methods.include?(method)
       _, method, punctuation = method.to_s.match(/^(.*?)([\?\!]?)$/).to_a
@@ -25,13 +26,14 @@ module ActiveRecordShards
     end
 
     def columns_with_default_slave(*args, &block)
-      read_columns_from = if on_slave_by_default? && !Thread.current[:_active_record_shards_slave_off]
-        :slave
-      else
-        :master
-      end
+      read_columns_from =
+        if on_slave_by_default? && !Thread.current[:_active_record_shards_slave_off]
+          :slave
+        else
+          :master
+        end
 
-      on_cx_switch_block(read_columns_from, :construct_ro_scope => false) { columns_without_default_slave(*args, &block) }
+      on_cx_switch_block(read_columns_from, construct_ro_scope: false) { columns_without_default_slave(*args, &block) }
     end
 
     def transaction_with_slave_off(*args, &block)
@@ -58,7 +60,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?].freeze
 
     def self.extended(base)
       CLASS_SLAVE_METHODS.each { |m| ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(true, base, m) }
@@ -83,7 +85,7 @@ module ActiveRecordShards
       end
     end
 
-    def on_slave_unless_tx(&block)
+    def on_slave_unless_tx
       if on_slave_by_default? && !Thread.current[:_active_record_shards_slave_off]
         on_slave { yield }
       else
@@ -112,7 +114,7 @@ module ActiveRecordShards
 
     module HasAndBelongsToManyPreloaderPatches
       def self.included(base)
-        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :records_for) rescue nil
+        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :records_for) rescue nil # rubocop:disable Style/RescueModifier
       end
 
       def on_slave_unless_tx
@@ -142,7 +144,7 @@ module ActiveRecordShards
         end
 
         # also transfer the sharded-ness of the left table to the join model
-        model.not_sharded if !model.left_reflection.klass.is_sharded?
+        model.not_sharded unless model.left_reflection.klass.is_sharded?
         model
       end
     end

data/lib/active_record_shards/migration.rb

@@ -41,7 +41,7 @@ module ActiveRecord
 
     # list of pending migrations is any migrations that haven't run on all shards.
     def pending_migrations
-      pending, missing = self.class.shard_status(migrations.map(&:version))
+      pending, _missing = self.class.shard_status(migrations.map(&:version))
       pending = pending.values.flatten
       migrations.select { |m| pending.include?(m.version) }
     end
@@ -66,7 +66,7 @@ module ActiveRecord
       ActiveRecord::Base.on_shard(nil) { collect.call(nil) }
       ActiveRecord::Base.on_all_shards { |shard| collect.call(shard) }
 
-      return pending, missing
+      [pending, missing]
     end
   end
 end
@@ -116,4 +116,4 @@ ActiveRecord::Migration.class_eval do
   alias_method :migrate, :migrate_with_forced_shard
 end
 
-ActiveRecord::MigrationProxy.delegate :migration_shard, :to => :migration
+ActiveRecord::MigrationProxy.delegate :migration_shard, to: :migration

data/lib/active_record_shards/model.rb

@@ -8,7 +8,7 @@ module ActiveRecordShards
       @sharded = false
     end
 
-    def is_sharded?
+    def is_sharded? # rubocop:disable Style/PredicateName
       if self == ActiveRecord::Base
         @sharded != false && supports_sharding?
       elsif self == base_class

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

@@ -33,7 +33,7 @@ module ActiveRecordShards
     end
 
     def count
-      enum.inject(0) { |accum, shard| @scope.clone.count + accum }
+      enum.inject(0) { |accum, _shard| @scope.clone.count + accum }
     end
 
     def to_a

data/lib/active_record_shards/tasks.rb

@@ -7,61 +7,60 @@ end
 
 namespace :db do
   desc 'Drops the database for the current RAILS_ENV including shards'
-  task :drop => :load_config do
+  task drop: :load_config do
     ActiveRecord::Base.configurations.each do |key, conf|
-      if key.starts_with?(ActiveRecordShards.rails_env) && !key.ends_with?("_slave")
-        begin
-          ActiveRecordShards::Tasks.root_connection(conf).drop_database(conf['database'])
-        # 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 "Couldn't drop #{conf['database']}"
-        end
+      next if !key.starts_with?(ActiveRecordShards.rails_env) || key.ends_with?("_slave")
+      begin
+        ActiveRecordShards::Tasks.root_connection(conf).drop_database(conf['database'])
+      # rescue ActiveRecord::NoDatabaseError # TODO: exists in AR but never is raised here ...
+      #   $stderr.puts "Database '#{conf['database']}' does not exist"
+      rescue StandardError => error
+        $stderr.puts error, *error.backtrace
+        $stderr.puts "Couldn't drop #{conf['database']}"
       end
     end
   end
 
-  task :reset => :load_config do |t|
-    Rake.application.lookup('db:drop', t.scope).invoke rescue nil
+  task reset: :load_config do |t|
+    Rake.application.lookup('db:drop', t.scope).invoke rescue nil # rubocop:disable Style/RescueModifier
     Rake.application.lookup('db:setup', t.scope).invoke
   end
 
   desc "Create the database defined in config/database.yml for the current RAILS_ENV including shards"
-  task :create => :load_config do
+  task create: :load_config do
     ActiveRecord::Base.configurations.each do |key, conf|
-      if key.starts_with?(ActiveRecordShards.rails_env) && !key.ends_with?("_slave")
-        if ActiveRecord::VERSION::MAJOR >= 4
-          begin
-            # MysqlAdapter takes charset instead of encoding in Rails 4
-            # https://github.com/rails/rails/commit/78b30fed9336336694fb2cb5d2825f95800b541c
-            symbolized_configuration = conf.symbolize_keys
-            symbolized_configuration[:charset] = symbolized_configuration[:encoding]
+      next if !key.starts_with?(ActiveRecordShards.rails_env) || key.ends_with?("_slave")
+      if ActiveRecord::VERSION::MAJOR >= 4
+        begin
+          # MysqlAdapter takes charset instead of encoding in Rails 4
+          # https://github.com/rails/rails/commit/78b30fed9336336694fb2cb5d2825f95800b541c
+          symbolized_configuration = conf.symbolize_keys
+          symbolized_configuration[:charset] = symbolized_configuration[:encoding]
 
-            ActiveRecordShards::Tasks.root_connection(conf).create_database(conf['database'], symbolized_configuration)
-          rescue ActiveRecord::StatementInvalid => ex
-            if ex.message.include?('database exists')
-              puts "#{conf['database']} already exists"
-            else
-              raise ex
-            end
+          ActiveRecordShards::Tasks.root_connection(conf).create_database(conf['database'], symbolized_configuration)
+        rescue ActiveRecord::StatementInvalid => ex
+          if ex.message.include?('database exists')
+            puts "#{conf['database']} already exists"
+          else
+            raise ex
           end
-        else
-          create_database(conf)
         end
+      else
+        create_database(conf)
       end
     end
     ActiveRecord::Base.establish_connection(ActiveRecordShards.rails_env.to_sym)
   end
 
   desc "Raises an error if there are pending migrations"
-  task :abort_if_pending_migrations => :environment do
+  task abort_if_pending_migrations: :environment do
     if defined? ActiveRecord
-      if Rails::VERSION::MAJOR >= 4
-        pending_migrations = ActiveRecord::Base.on_shard(nil) { ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations }
-      else
-        pending_migrations = ActiveRecord::Base.on_shard(nil) { ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations }
-      end
+      pending_migrations =
+        if Rails::VERSION::MAJOR >= 4
+          ActiveRecord::Base.on_shard(nil) { ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations }
+        else
+          ActiveRecord::Base.on_shard(nil) { ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations }
+        end
 
       if pending_migrations.any?
         puts "You have #{pending_migrations.size} pending migrations:"
@@ -75,7 +74,7 @@ namespace :db do
 
   namespace :test do
     desc 'Purges the test databases by dropping and creating'
-    task :purge => :load_config do |t|
+    task purge: :load_config do |t|
       begin
         saved_env = Rails.env
         Rails.env = 'test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.2
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple database switching for ActiveRecord.