advanced_connection 0.5.1 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62f7a17e7ed43268b606a797d1caf063a7315655
-  data.tar.gz: e27f2b539440c06bb584c391823cffa513f07cb9
+  metadata.gz: 1b6cf3c3a0fdeacc8cde74431cd95e8ee086a785
+  data.tar.gz: df3db9850e19c1999b0e219ae8a5670b2c803750
 SHA512:
-  metadata.gz: 42ed8c6c57cc86e27c18536b1b122c635599be016d0ec01252f652b1f42a47b571d3612bc695923b95e7e269bff88f3bc074f00ecfa93cf3d17571b1e1584e1d
-  data.tar.gz: 7d54804ab6b0cd5c56c684d071608209f5a5cdc959ac121e8088b9eb0b145a4cbec7bbf7c02e4710ba48caf9eff5578bead5528d3982f2f8869ddc16b7d483c4
+  metadata.gz: 268715f2553969f63c9c6b54b17b5c3f1a046fb864f9df865185622b416973d3c749433d9bfab4d803b1e6fe7c984152756e8dfdccbaa5b391b09d6f65e9255b
+  data.tar.gz: b883bc28735538d6f7f095ac362363b357747028cb29c4aeac305c0d8d9aae5550392f715fca0491abb51ae0d4f39f8c6c9592fac44f5b20b135c4e4e064e316

data/.rubocop.yml

@@ -0,0 +1,205 @@
+AllCops:
+  Include:
+    - Rakefile
+  Exclude:
+    - test.rb
+    - bin/**
+
+SpecialGlobalVars:
+  Enabled: false
+
+BlockComments:
+  Enabled: false
+
+Encoding:
+  Enabled: false
+
+RegexpLiteral:
+  Enabled: false
+
+# dots at the end of lines are okay
+DotPosition:
+  Enabled: false
+
+CollectionMethods:
+  PreferredMethods:
+    map: 'collect'
+    map!: 'collect!'
+    reduce: 'inject'
+    detect: 'find'
+    find_all: 'select'
+
+CaseIndentation:
+  IndentWhenRelativeTo: end
+  IndentOneStep: true
+
+LineLength:
+  Enabled: false
+
+# Personally, I prefer to outdent public/protected/private, as it makes
+# it easier to see the different sections of code.
+AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+EmptyLinesAroundAccessModifier:
+  Enabled: true
+
+EndAlignment:
+  AlignWith: variable
+
+SpaceInsideBrackets:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Relaxed.Ruby.Style
+
+Style/Alias:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylealias
+
+Style/BeginBlock:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylebeginblock
+
+Style/BlockDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleblockdelimiters
+
+Style/Documentation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledocumentation
+
+Style/DotPosition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledotposition
+
+Style/DoubleNegation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledoublenegation
+
+Style/EndBlock:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleendblock
+
+Style/FormatString:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleformatstring
+
+Style/IfUnlessModifier:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleifunlessmodifier
+
+Style/Lambda:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylelambda
+
+Style/ModuleFunction:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylemodulefunction
+
+Style/MultilineBlockChain:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylemultilineblockchain
+
+Style/NegatedIf:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedif
+
+Style/NegatedWhile:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedwhile
+
+Style/ParallelAssignment:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleparallelassignment
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylepercentliteraldelimiters
+
+Style/PerlBackrefs:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleperlbackrefs
+
+Style/Semicolon:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesemicolon
+
+Style/SignalException:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesignalexception
+
+Style/SingleLineBlockParams:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesinglelineblockparams
+
+Style/SingleLineMethods:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
+
+Style/SpaceBeforeBlockBraces:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
+
+Style/SpaceInsideParens:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
+
+Style/SpecialGlobalVars:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespecialglobalvars
+
+Style/StringLiterals:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylestringliterals
+
+Style/TrailingCommaInLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styletrailingcomma
+
+Style/TrailingCommaInArguments:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styletrailingcomma
+
+Style/WhileUntilModifier:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylewhileuntilmodifier
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
+
+Lint/AssignmentInCondition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    advanced_connection (0.5.1)
-      activerecord (>= 4.1.0, < 5.0)
-      activesupport (>= 4.1.0, < 5.0)
-      rails (>= 4.1.0, < 5.0)
+    advanced_connection (0.5.5)
+      activerecord (~> 4.1)
+      activesupport (~> 4.1)
+      rails (~> 4.1)
 
 GEM
   remote: https://rubygems.org/
@@ -49,7 +49,6 @@ GEM
     charlock_holmes (0.7.3)
     coderay (1.1.1)
     concurrent-ruby (1.0.1)
-    concurrent-ruby (1.0.1-java)
     copyright-header (1.0.15)
       github-linguist (~> 2.6)
     coveralls (0.8.13)
@@ -104,7 +103,6 @@ GEM
     nenv (0.3.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    nokogiri (1.6.7.2-java)
     notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -193,7 +191,6 @@ GEM
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
     tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -205,14 +202,14 @@ PLATFORMS
 
 DEPENDENCIES
   advanced_connection!
-  copyright-header (= 1.0.15)
-  coveralls (~> 0.8)
-  guard-rspec (~> 4.6)
-  pg (~> 0.18)
-  pry (~> 0.10)
-  pry-nav (~> 0.2)
-  rack (~> 1.6)
-  rake (~> 10.5)
-  rspec (~> 3.4)
-  rspec-collection_matchers (~> 1.1)
-  rspec-its (~> 1.2)
+  copyright-header (~> 1.0.15)
+  coveralls (~> 0.8.13)
+  guard-rspec (~> 4.6.4)
+  pg (~> 0.18.4)
+  pry (~> 0.10.3)
+  pry-nav (~> 0.2.4)
+  rack (~> 1.6.4)
+  rake (~> 10.5.0)
+  rspec (~> 3.4.0)
+  rspec-collection_matchers (~> 1.1.2)
+  rspec-its (~> 1.2.0)

data/advanced_connection.gemspec

@@ -24,26 +24,26 @@ Gem::Specification.new do |spec|
   #   :jruby    => '~> 1.7',
   # }
 
-  spec.add_runtime_dependency "rails",         ">= 4.1.0", "< 5.0"
-  spec.add_runtime_dependency "activerecord",  ">= 4.1.0", "< 5.0"
-  spec.add_runtime_dependency "activesupport", ">= 4.1.0", "< 5.0"
+  spec.add_runtime_dependency "rails",         "~> 4.1"
+  spec.add_runtime_dependency "activerecord",  "~> 4.1"
+  spec.add_runtime_dependency "activesupport", "~> 4.1"
 
-  spec.add_development_dependency "rake",      '~> 10.5'
-  spec.add_development_dependency "rack",      '~> 1.6'
-  spec.add_development_dependency "rspec",     '~> 3.4'
-  spec.add_development_dependency "rspec-its", '~> 1.2'
-  spec.add_development_dependency "rspec-collection_matchers", '~> 1.1'
+  spec.add_development_dependency "rake",      '~> 10.5.0'
+  spec.add_development_dependency "rack",      '~> 1.6.4'
+  spec.add_development_dependency "rspec",     '~> 3.4.0'
+  spec.add_development_dependency "rspec-its", '~> 1.2.0'
+  spec.add_development_dependency "rspec-collection_matchers", '~> 1.1.2'
 
   # optional dependencies
   if RUBY_ENGINE == 'jruby'
-    spec.add_development_dependency "activerecord-jdbcpostgresql-adapter", "~> 1.3"
+    spec.add_development_dependency "activerecord-jdbcpostgresql-adapter", "~> 1.3.19"
   else
-    spec.add_development_dependency "pg",      "~> 0.18"
-    spec.add_development_dependency "pry",     '~> 0.10'
-    spec.add_development_dependency "pry-nav", '~> 0.2'
+    spec.add_development_dependency "pg",      "~> 0.18.4"
+    spec.add_development_dependency "pry",     '~> 0.10.3'
+    spec.add_development_dependency "pry-nav", '~> 0.2.4'
   end
 
-  spec.add_development_dependency "guard-rspec", '~> 4.6'
-  spec.add_development_dependency "coveralls",   '~> 0.8'
-  spec.add_development_dependency 'copyright-header', '= 1.0.15'
+  spec.add_development_dependency "guard-rspec", '~> 4.6.4'
+  spec.add_development_dependency "coveralls",   '~> 0.8.13'
+  spec.add_development_dependency 'copyright-header', '~> 1.0.15'
 end

data/lib/advanced_connection.rb

@@ -42,9 +42,7 @@ module AdvancedConnection
 
     def configure(overwrite = true)
       return unless overwrite
-      (yield config).tap {
-        config.loaded!
-      }
+      (yield config).tap { config.loaded! }
     end
 
     def config
@@ -62,4 +60,4 @@ module AdvancedConnection
   end
 
   require 'advanced_connection/railtie' if defined?(Rails)
-end
+end

data/lib/advanced_connection/active_record_ext.rb

@@ -51,9 +51,9 @@ module AdvancedConnection
 
       ActiveRecord::Base.instance_exec do
         if AdvancedConnection.enable_without_connection
-          extend ActiveRecordExt::WithoutConnection unless AdvancedConnection::enable_statement_pooling
+          extend ActiveRecordExt::WithoutConnection unless AdvancedConnection.enable_statement_pooling
         end
       end
     end
   end
-end
+end

data/lib/advanced_connection/active_record_ext/abstract_adapter.rb

@@ -45,4 +45,4 @@ module AdvancedConnection::ActiveRecordExt
       (Time.now - @instantiated_at).to_f
     end
   end
-end
+end

data/lib/advanced_connection/active_record_ext/abstract_adapter/statement_pooling.rb

@@ -28,43 +28,39 @@ module AdvancedConnection::ActiveRecordExt
 
       module ExecuteWrapper
         def __wrap_adapter_exec_methods(*methods)
-          Array(methods).flatten.collect(&:to_sym).each { |exec_method|
+          Array(methods).flatten.collect(&:to_sym).each do |exec_method|
             class_eval(<<-EOS, __FILE__, __LINE__ + 1)
               def #{exec_method}_with_callback(sql, *args, &block)
                 if Thread.current[:without_callbacks] || sql =~ /^BEGIN/i || transaction_open? || pool.nil?
                   #{exec_method}_without_callback(sql, *args, &block)
                 else
                   run_callbacks(:statement_pooling_connection_checkin) do
-                    $stderr.puts "#{Thread.current.object_id} executing sql -> \#{sql.inspect}"
                     #{exec_method}_without_callback(sql, *args, &block).tap {
-                      $stderr.puts "#{Thread.current.object_id} Releasing connection..."
                       reset!
                       pool.release_connection
-                      $stderr.puts "#{Thread.current.object_id} Connection Released..."
                     }
                   end
                 end
               end
             EOS
             alias_method_chain exec_method, :callback
-          }
+          end
         end
         alias_method :__wrap_adapter_exec_method, :__wrap_adapter_exec_methods
 
         def __wrap_without_callbacks(*methods)
-          Array(methods).flatten.collect(&:to_sym).each { |m|
-            target, punctuation = m.to_s.sub(/([?!=])$/, ''), $1
+          Array(methods).flatten.collect(&:to_sym).each do |exec_method|
+            target, punctuation = exec_method.to_s.sub(/([?!=])$/, ''), $1
             class_eval(<<-EOS, __FILE__, __LINE__ + 1)
               def #{target}_with_no_callbacks#{punctuation}(*args, &block)
-                # $stderr.puts "setting without_callbacks to true"
                 Thread.current[:without_callbacks] = true
                 #{target}_without_no_callbacks#{punctuation}(*args, &block)
               ensure
                 Thread.current[:without_callbacks] = nil
               end
             EOS
-            alias_method_chain m, :no_callbacks
-          }
+            alias_method_chain exec_method, :no_callbacks
+          end
         end
         alias_method :__wrap_without_callback, :__wrap_without_callbacks
       end
@@ -78,7 +74,7 @@ module AdvancedConnection::ActiveRecordExt
         set_callback :statement_pooling_connection_checkin, :before, :before_connection_checkin
         set_callback :statement_pooling_connection_checkin, :after, :after_connection_checkin
 
-        DEFAULT_EXEC_METHODS = [ :execute, :exec_no_cache, :query ]
+        DEFAULT_EXEC_METHODS = [ :execute, :exec_no_cache, :query ].freeze
         JDBC_EXEC_METHODS = %w[
           execute
           exec_query
@@ -90,21 +86,21 @@ module AdvancedConnection::ActiveRecordExt
         ].collect(&:to_sym)
 
         if RUBY_ENGINE == 'jruby'
-          JDBC_EXEC_METHODS.each { |m| __wrap_adapter_exec_methods m }
+          JDBC_EXEC_METHODS.each { |exec_method| __wrap_adapter_exec_methods exec_method }
         else
-          DEFAULT_EXEC_METHODS.each { |m| __wrap_adapter_exec_methods m }
+          DEFAULT_EXEC_METHODS.each { |exec_method| __wrap_adapter_exec_methods exec_method }
         end
 
-        [ :active?, :reset!, :disconnect!, :reconnect! ].each { |m|
-          __wrap_without_callbacks m
+        [ :active?, :reset!, :disconnect!, :reconnect! ].each { |exec_method|
+          __wrap_without_callbacks exec_method
         }
       end
 
-      def around_connection_checkin(&block)
+      def around_connection_checkin
         callbacks = AdvancedConnection.callbacks.statement_pooling
-        if callbacks.around.respond_to? :call
-          callbacks.around.call() { block.call }
-        end
+        callbacks.around.call do
+          yield
+        end if callbacks.around.respond_to? :call
       end
 
       def before_connection_checkin
@@ -118,4 +114,4 @@ module AdvancedConnection::ActiveRecordExt
       end
     end
   end
-end
+end

data/lib/advanced_connection/active_record_ext/connection_pool.rb

@@ -35,4 +35,4 @@ module AdvancedConnection
       end
     end
   end
-end
+end

data/lib/advanced_connection/active_record_ext/connection_pool/idle_manager.rb

@@ -29,7 +29,7 @@ module AdvancedConnection::ActiveRecordExt
         alias_method_chain :checkin, :last_checked_in
 
         class IdleManager
-          attr_reader :pool, :interval, :thread
+          attr_reader :thread
 
           def initialize(pool, interval)
             @pool     = pool
@@ -38,22 +38,22 @@ module AdvancedConnection::ActiveRecordExt
           end
 
           def run
-            return unless interval > 0
+            return unless @interval > 0
 
-            @thread ||= Thread.new(pool, interval) { |_pool, _interval|
-              _pool.send(:idle_info, "starting idle manager; running every #{_interval} seconds")
+            @thread ||= Thread.new(@pool, @interval) { |pool, interval|
+              pool.send(:idle_info, "starting idle manager; running every #{interval} seconds")
 
               loop do
-                sleep _interval
+                sleep interval
 
                 begin
                   start = Time.now
-                  _pool.send(:idle_info, "beginning idle connection cleanup")
-                  _pool.remove_idle_connections
-                  _pool.send(:idle_info, "beginning idle connection warmup")
-                  _pool.create_idle_connections
+                  pool.send(:idle_info, "beginning idle connection cleanup")
+                  pool.remove_idle_connections
+                  pool.send(:idle_info, "beginning idle connection warmup")
+                  pool.create_idle_connections
                   finish = (Time.now - start).round(6)
-                  _pool.send(:idle_info, "finished idle connection tasks in #{finish} seconds.; next run in #{pool.max_idle_time} seconds")
+                  pool.send(:idle_info, "finished idle connection tasks in #{finish} seconds; next run in #{pool.max_idle_time} seconds")
                 rescue => e
                   Rails.logger.error "#{e.class.name}: #{e.message}"
                   e.backtrace.each { |line| Rails.logger.error line }
@@ -67,21 +67,21 @@ module AdvancedConnection::ActiveRecordExt
       def initialize_with_advanced_connection(spec)
         initialize_without_advanced_connection(spec)
 
-        @available  = case queue_type
+        @available = case queue_type
           when :prefer_older   then Queues::OldAgeBiased.new
           when :prefer_younger then Queues::YoungAgeBiased.new
           when :lifo, :stack   then Queues::Stack.new
-        else
-          Rails.logger.warn "Unknown queue_type #{queue_type.inspect} - using standard FIFO instead"
-          Queues::FIFO.new
+          else
+            Rails.logger.warn "Unknown queue_type #{queue_type.inspect} - using standard FIFO instead"
+            Queues::FIFO.new
         end
 
-        @idle_manager = IdleManager.new(self, idle_check_interval).tap { |m| m.run }
+        @idle_manager = IdleManager.new(self, idle_check_interval).tap(&:run)
       end
 
       def queue_type
         @queue_type ||= spec.config.fetch(:queue_type,
-                          AdvancedConnection.connection_pool_queue_type).to_s.downcase.to_sym
+                                          AdvancedConnection.connection_pool_queue_type).to_s.downcase.to_sym
       end
 
       def warmup_connection_count
@@ -143,7 +143,7 @@ module AdvancedConnection::ActiveRecordExt
       def idle_connections
         available_connections.select do |conn|
           (Time.now - conn.last_checked_in).to_f > max_idle_time
-        end.sort { |a,b|
+        end.sort { |a, b|
           case queue_type
             when :prefer_younger then
               # when prefering younger, we sort oldest->youngest
@@ -175,9 +175,12 @@ module AdvancedConnection::ActiveRecordExt
         end
         total = active + available
 
-        ActiveSupport::OrderedOptions.new.merge({
-          total: total, idle: idle, active: active, available: available,
-        })
+        ActiveSupport::OrderedOptions.new.merge(
+          total:     total,
+          idle:      idle,
+          active:    active,
+          available: available,
+        )
       end
 
       def warmup_connections(count = nil)
@@ -268,4 +271,4 @@ module AdvancedConnection::ActiveRecordExt
       end
     end
   end
-end
+end

data/lib/advanced_connection/active_record_ext/connection_pool/queues.rb

@@ -57,4 +57,4 @@ module AdvancedConnection::ActiveRecordExt
       end
     end
   end
-end
+end

data/lib/advanced_connection/active_record_ext/connection_pool/statement_pooling.rb

@@ -39,4 +39,4 @@ module AdvancedConnection::ActiveRecordExt
       end
     end
   end
-end
+end

data/lib/advanced_connection/active_record_ext/connection_pool/without_connection.rb

@@ -39,55 +39,53 @@ module AdvancedConnection::ActiveRecordExt
 
         if AdvancedConnection.callbacks.without_connection.present?
           run_callbacks(:without_connection) do
-            __without_connection() { yield }
+            __without_connection do
+              yield
+            end
           end
         else
-          __without_connection() { yield }
+          __without_connection do
+            yield
+          end
         end
       end
 
     private
 
       def __without_connection
+        # return the connection to the pool for the duration of `yield`
+        release_connection if active_connection?
+        raise Error::UnableToReleaseConnection if active_connection?
+        yield
+      ensure
+        tries = 3
         begin
-          # return the connection to the pool for the duration of `yield`
-          release_connection if active_connection?
-          raise Error::UnableToReleaseConnection if active_connection?
-          yield
-        ensure
-          tries = 3
-          begin
-            # attempt to retrieve another connection
-            retrieve_connection
-          rescue ActiveRecord::ConnectionTimeoutError
-            Rails.logger.info "Failed to acquire a connection (#{Thread.current.object_id}) trying #{tries > 1 ? "#{tries} more times" : 'once more'}"
-            retry unless (tries -= 1) < 0
-            Rails.logger.info "Giving up on trying to acquire another connection"
-            raise
-          end
+          # attempt to retrieve another connection
+          retrieve_connection
+        rescue ActiveRecord::ConnectionTimeoutError
+          Rails.logger.info "Failed to acquire a connection (#{Thread.current.object_id}) trying #{tries > 1 ? "#{tries} more times" : 'once more'}"
+          retry unless (tries -= 1) < 0
+          Rails.logger.info "Giving up on trying to acquire another connection"
+          raise
         end
       end
 
-      def around_without_connection(&block)
+      def around_without_connection
         callbacks = AdvancedConnection.callbacks.without_connection
-        if callbacks.around.respond_to? :call
-          callbacks.around.call() { block.call }
-        end
+        callbacks.around.call do
+          yield
+        end if callbacks.around.respond_to? :call
       end
 
       def before_without_connection
         callbacks = AdvancedConnection.callbacks.without_connection
-        if callbacks.before.respond_to? :call
-          callbacks.before.call
-        end
+        callbacks.before.call if callbacks.before.respond_to? :call
       end
 
       def after_without_connection
         callbacks = AdvancedConnection.callbacks.without_connection
-        if callbacks.after.respond_to? :call
-          callbacks.after.call
-        end
+        callbacks.after.call if callbacks.after.respond_to? :call
       end
     end
   end
-end
+end

data/lib/advanced_connection/config.rb

@@ -29,24 +29,24 @@ module AdvancedConnection
       :fifo, :lifo, :stack, :prefer_younger, :prefer_older
     ].freeze unless defined? VALID_QUEUE_TYPES
 
-    CALLBACK_TYPES = ActiveSupport::OrderedOptions.new.merge({
+    CALLBACK_TYPES = ActiveSupport::OrderedOptions.new.merge(
       before: nil,
       around: nil,
       after: nil
-    }).freeze unless defined? CALLBACK_TYPES
-
-    DEFAULT_CONFIG = ActiveSupport::OrderedOptions.new.merge({
-      :enable_without_connection      => false,
-      :enable_statement_pooling       => false,
-      :enable_idle_connection_manager => false,
-      :connection_pool_queue_type     => :fifo,
-      :warmup_connections             => false,
-      :min_idle_connections           => 0,
-      :max_idle_connections           => ::Float::INFINITY,
-      :max_idle_time                  => 0,
-      :idle_check_interval            => 0,
-      :callbacks                      => ActiveSupport::OrderedOptions.new
-    }).freeze unless defined? DEFAULT_CONFIG
+    ).freeze unless defined? CALLBACK_TYPES
+
+    DEFAULT_CONFIG = ActiveSupport::OrderedOptions.new.merge(
+      enable_without_connection:      false,
+      enable_statement_pooling:       false,
+      enable_idle_connection_manager: false,
+      connection_pool_queue_type:     :fifo,
+      warmup_connections:             false,
+      min_idle_connections:           0,
+      max_idle_connections:           ::Float::INFINITY,
+      max_idle_time:                  0,
+      idle_check_interval:            0,
+      callbacks:                      ActiveSupport::OrderedOptions.new
+    ).freeze unless defined? DEFAULT_CONFIG
 
     class << self
       def method_missing(method, *args, &block)
@@ -55,7 +55,7 @@ module AdvancedConnection
       end
 
       def respond_to_missing?(method, include_private = false)
-        instance.respond_to?(method) || super
+        instance.respond_to?(method, include_private) || super
       end
 
       def include?(key)
@@ -93,6 +93,9 @@ module AdvancedConnection
 
     add_callbacks :without_connection, :statement_pooling
 
+    attr_reader :loaded
+    alias_method :loaded?, :loaded
+
     def initialize
       @loaded = false
       @config = DEFAULT_CONFIG.deep_dup
@@ -102,10 +105,6 @@ module AdvancedConnection
       @loaded = true
     end
 
-    def loaded?
-      @loaded
-    end
-
     def [](key)
       @config[key.to_sym]
     end
@@ -161,16 +160,12 @@ module AdvancedConnection
     end
 
     def warmup_connections=(value)
-      unless value.nil? || value === false || value.is_a?(Fixnum) || value =~ /^\d+$/
+      unless !!value || value.is_a?(Fixnum) || value =~ /^\d+$/
         fail Error::ConfigError, 'Expected warmup_connections to be nil, false ' \
                            "or a valid positive integer, but found `#{value.inspect}`"
       end
 
-      if value.to_s =~ /^\d+$/
-        @config[:warmup_connections] = value.to_i
-      else
-        @config[:warmup_connections] = false
-      end
+      @config[:warmup_connections] = value.to_s =~ /^\d+$/ ? value.to_i : false
     end
 
     def min_idle_connections
@@ -196,8 +191,8 @@ module AdvancedConnection
       end
       @config[:max_idle_connections] = begin
         value.to_i
-      rescue FloatDomainError => e
-        raise unless e.message =~ /infinity/i
+      rescue FloatDomainError
+        raise unless $!.message =~ /infinity/i
         ::Float::INFINITY
       end
     end
@@ -244,4 +239,4 @@ module AdvancedConnection
       @config[:connection_pool_queue_type] = value
     end
   end
-end
+end

data/lib/advanced_connection/railtie.rb

@@ -37,4 +37,4 @@ module AdvancedConnection
       end
     end
   end
-end
+end

data/lib/advanced_connection/version.rb

@@ -22,7 +22,7 @@
 module AdvancedConnection
   MAJOR = 0
   MINOR = 5
-  PATCH = 1
+  PATCH = 5
 
   VERSION     = "%d.%d.%d" % [ MAJOR, MINOR, PATCH ]
   GEM_VERSION = Gem::Version.new(VERSION)

data/lib/generators/advanced_connection/install/templates/advanced_connection.rb

@@ -139,4 +139,4 @@ AdvancedConnection.configure do |config|
   #     end
   #   }
   # }
-end
+end

metadata

@@ -1,227 +1,209 @@
 --- !ruby/object:Gem::Specification
 name: advanced_connection
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.5
 platform: ruby
 authors:
 - Carl P. Corliss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 0.18.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 0.18.4
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.10.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: 4.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: 4.6.4
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.13
 - !ruby/object:Gem::Dependency
   name: copyright-header
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.15
 description: Adds idle connection management, statement pooling, and other advanced
@@ -235,6 +217,7 @@ files:
 - ".document"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -263,7 +246,6 @@ files:
 - lib/generators/advanced_connection/install/USAGE
 - lib/generators/advanced_connection/install/install_generator.rb
 - lib/generators/advanced_connection/install/templates/advanced_connection.rb
-- lib/tasks/advanced_connection_tasks.rake
 - spec/config/database.yml
 - spec/config/database.yml.erb
 - spec/dummy/.gitignore

data/lib/tasks/advanced_connection_tasks.rake

@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 Finalsite, LLC
-# Copyright (C) 2016 Carl P. Corliss <carl.corliss@finalsite.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# desc "Explaining what the task does"
-# task :advanced_connection do
-#   # Task goes here
-# end