shackles 1.0.10 → 1.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWVlZWFiZGEwOTFjMDhmZTJiOWFhMWMyZTVhZGUzZmI5OWIxMzVjNw==
-  data.tar.gz: !binary |-
-    NGU0ZjEzYWI5OGZiZTk2ZWVlZDliYWMzNTY1Njg5OTI0NTU4YmZkMQ==
+SHA1:
+  metadata.gz: 71107d30a7307374ffbf19d585bcfcfdc7be7cd2
+  data.tar.gz: eb3b93f08eb0aaad52dd3c790ad90e2c25bb7006
 SHA512:
-  metadata.gz: !binary |-
-    MjdhNWRhZWQwOWM0MDUzOTE2OGYyOTU4Yjc0NWZkMmM0ZDEzMTAzMzA3Zjdm
-    NDZiYTIxY2JiMzc2NWU2MGRiODMwYzExMzBjNzNmMmY1YWI0Y2QzNmFiMjFl
-    YTYzYjM3MDYyZjE2ZDRjNWJkMGM4ZDE5MmNjOTIxNzM5OWQ2YWU=
-  data.tar.gz: !binary |-
-    NDUyNjcwYjJjOTExM2U4MTM4Zjc4NGY5NWJlNzY1ODJkMTdmNGFlMzlmY2Zm
-    NDMzNWY2ODRkODhhMjg5Y2ZkNTA3MTZlZjdiMTNhZDBlNmJhNWVhNTVhODk3
-    MTM4NDQ0MTQ4OTM4MmFjZjZiMmU2M2MxMjY0ZGZiYzYwMzcyNjc=
+  metadata.gz: af803e0e4278db28f9c00ebfdd06218262ab048e1a44cd56dbb227adef84d9fd29036dd4b48627e5f611329a3258564d55b2ee1eae35e35e8e61769949cc3dd7
+  data.tar.gz: 8ce9c41baa33ea174084017662d9f87549bcae1a46d34caa5ffae54c81fa51e7cd86192c69aad912417dc7980321aacf23e110a7ef35db75c37a77e2439415d7

data/lib/shackles.rb

@@ -22,9 +22,8 @@ module Shackles
 
       activated_environments << Shackles.environment
 
-      ActiveRecord::ConnectionAdapters::ConnectionHandler.send(:include, ConnectionHandler)
-      klass = Rails.version < '4' ? ActiveRecord::Base : ActiveRecord::ConnectionAdapters
-      klass::ConnectionSpecification.send(:include, ConnectionSpecification)
+      ActiveRecord::ConnectionAdapters::ConnectionHandler.prepend(ConnectionHandler)
+      ActiveRecord::ConnectionAdapters::ConnectionSpecification.prepend(ConnectionSpecification)
     end
 
     def global_config_sequence
@@ -89,15 +88,9 @@ module Shackles
       new_handler = @connection_handlers[environment]
       if !new_handler
         new_handler = @connection_handlers[environment] = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
-        pools = if Rails.version < '3.0'
-                  ActiveRecord::Base.connection_handler.instance_variable_get(:@connection_pools)
-                elsif Rails.version < '4.0'
-                  ActiveRecord::Base.connection_handler.instance_variable_get(:@class_to_pool)
-                else
-                  ActiveRecord::Base.connection_handler.send(:owner_to_pool)
-                end
+        pools = ActiveRecord::Base.connection_handler.send(:owner_to_pool)
         pools.each_pair do |model, pool|
-          model = model.constantize if Rails.version >= '4'
+          model = model.constantize
           new_handler.establish_connection(model, pool.spec)
         end
       end

data/lib/shackles/connection_handler.rb

@@ -1,16 +1,13 @@
 module Shackles
   module ConnectionHandler
-    def self.included(klass)
-      %w{clear_active_connections clear_reloadable_connections
-         clear_all_connections verify_active_connections }.each do |method|
-        next unless klass.instance_methods.include?("#{method}!".to_sym)
-        klass.class_eval(<<EOS, __FILE__, __LINE__ + 1)
-          def #{method}_with_multiple_environments!
-            ::Shackles.connection_handlers.values.each(&:#{method}_without_multiple_environments!)
-          end
-EOS
-        klass.alias_method_chain "#{method}!".to_sym, :multiple_environments
-      end
+    %w{clear_active_connections clear_reloadable_connections
+       clear_all_connections verify_active_connections }.each do |method|
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{method}!(super_method: false)
+          return super() if super_method
+          ::Shackles.connection_handlers.values.each { |handler| handler.#{method}!(super_method: true) }
+        end
+      RUBY
     end
   end
 end

data/lib/shackles/connection_specification.rb

@@ -31,13 +31,8 @@ module Shackles
       end
     end
 
-    def self.included(klass)
-      klass.send(:remove_method, :config)
-      klass.alias_method_chain :initialize, :deep_symbolize
-    end
-
-    def initialize_with_deep_symbolize(config, adapter_method)
-      initialize_without_deep_symbolize(config.deep_symbolize_keys, adapter_method)
+    def initialize(config, adapter_method)
+      super(config.deep_symbolize_keys, adapter_method)
     end
 
     def config

data/lib/shackles/version.rb

@@ -1,3 +1,3 @@
 module Shackles
-  VERSION = "1.0.10"
+  VERSION = "1.1.0"
 end

data/spec/shackles_spec.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'byebug'
 require 'rails'
 require 'shackles'
 
@@ -10,9 +11,7 @@ RSpec.configure do |config|
 end
 
 describe Shackles do
-  ConnectionSpecification = Rails.version < '4' ?
-      ActiveRecord::Base::ConnectionSpecification :
-      ActiveRecord::ConnectionAdapters::ConnectionSpecification
+  ConnectionSpecification = ActiveRecord::ConnectionAdapters::ConnectionSpecification
 
   it "should allow changing environments" do
     conf = {

metadata

@@ -1,61 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: shackles
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Allows multiple environments in database.yml, and dynamically switching
@@ -84,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ActiveRecord database environment switching for slaves and least-privilege