shackles 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWY1MDlmODBlNTc5NDVmZGNhZDY3ZWJlZjlhZTViMDExNjM5MDVkMA==
+  data.tar.gz: !binary |-
+    YWY1NTVhYmFjODI3YWMxNWRiODI1ZjM1MDRmNjQwOTZmNjc1OGNmNg==
+SHA512:
+  metadata.gz: !binary |-
+    ZjkwZDllYjZkNTE4Nzg2MzE2M2E4ODIzY2FkNTkzY2IyNGE3YTk4Nzk0NThl
+    Yjg5OTA0MjFkZDAyYWRhMjgzYjA3MmVjYmFmNGI0Njg2YWYxYzc0MmE5MjFk
+    NDhmYjAwMjM1ODJhYjQxMmQ4M2RiODA4NTgyZjNjOTFlOGViNzI=
+  data.tar.gz: !binary |-
+    YWU4ODE4OTMzZTA3ZjE0YzlmYWEwZDExMGFiZjBjN2I3MjVlMDBmY2FiZGI4
+    YWI5YzFkMzFkNmM4ZjAyYTlhNjE5ODIwNTYyYzdkMjE1NWY4MTllODg3MmRj
+    MzVlYjYzYzkwOWQyZTI2NTY5NzA3MGFkOWYxNGJmOTUzODJmNTQ=

data/lib/shackles/connection_handler.rb

@@ -3,6 +3,7 @@ module Shackles
     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)
           def #{method}_with_multiple_environments!
             ::Shackles.connection_handlers.values.each(&:#{method}_without_multiple_environments!)

data/lib/shackles/version.rb

@@ -1,3 +1,3 @@
 module Shackles
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/shackles.rb

@@ -13,8 +13,9 @@ module Shackles
       require 'shackles/connection_handler'
       require 'shackles/connection_specification'
 
-      ActiveRecord::ConnectionAdapters::ConnectionHandler.send(:include, Shackles::ConnectionHandler)
-      ActiveRecord::Base::ConnectionSpecification.send(:include, Shackles::ConnectionSpecification)
+      ActiveRecord::ConnectionAdapters::ConnectionHandler.send(:include, ConnectionHandler)
+      klass = Rails.version < '4' ? ActiveRecord::Base : ActiveRecord::ConnectionAdapters
+      klass::ConnectionSpecification.send(:include, ConnectionSpecification)
     end
 
     def global_config_sequence
@@ -78,8 +79,15 @@ module Shackles
       new_handler = @connection_handlers[environment]
       if !new_handler
         new_handler = @connection_handlers[environment] = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
-        variable = Rails.version < '3.0' ? :@connection_pools : :@class_to_pool
-        ActiveRecord::Base.connection_handler.instance_variable_get(variable).each do |model, pool|
+        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.each_pair do |model, pool|
+          model = model.constantize if Rails.version >= '4'
           new_handler.establish_connection(model, pool.spec)
         end
       end

data/spec/shackles_spec.rb

@@ -10,6 +10,10 @@ RSpec.configure do |config|
 end
 
 describe Shackles do
+  ConnectionSpecification = Rails.version < '4' ?
+      ActiveRecord::Base::ConnectionSpecification :
+      ActiveRecord::ConnectionAdapters::ConnectionSpecification
+
   it "should allow changing environments" do
     conf = {
         :adapter => 'postgresql',
@@ -22,7 +26,7 @@ describe Shackles do
             :database => 'slave'
         }
     }
-    spec = ActiveRecord::Base::ConnectionSpecification.new(conf, 'adapter')
+    spec = ConnectionSpecification.new(conf, 'adapter')
     spec.config[:username].should == 'canvas'
     spec.config[:database].should == 'master'
     Shackles.activate(:deploy) do
@@ -49,7 +53,7 @@ describe Shackles do
             :username => 'deploy'
         }
     }
-    spec = ActiveRecord::Base::ConnectionSpecification.new(conf, 'adapter')
+    spec = ConnectionSpecification.new(conf, 'adapter')
     spec.config[:username].should == 'canvas'
     Shackles.activate(:deploy) do
       spec.config[:username].should == 'deploy'
@@ -67,7 +71,7 @@ describe Shackles do
             :username => 'deploy'
         }
     }
-    spec = ActiveRecord::Base::ConnectionSpecification.new(conf.dup, 'adapter')
+    spec = ConnectionSpecification.new(conf.dup, 'adapter')
     spec.config[:username].should == 'canvas'
     spec.config[:schema_search_path] = 'bob'
     spec.config[:username].should == 'bob'

metadata

@@ -1,36 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: shackles
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.3'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.3'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,31 +40,27 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +68,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -82,38 +79,37 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- lib/shackles.rb
 - lib/shackles/connection_handler.rb
 - lib/shackles/connection_specification.rb
 - lib/shackles/railtie.rb
 - lib/shackles/version.rb
-- lib/shackles.rb
-- LICENSE
-- README.md
 - spec/shackles_spec.rb
 homepage: http://github.com/instructure/shackles
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord database environment switching for slaves and least-privilege
 test_files:
 - spec/shackles_spec.rb