shackles 1.1.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71107d30a7307374ffbf19d585bcfcfdc7be7cd2
-  data.tar.gz: eb3b93f08eb0aaad52dd3c790ad90e2c25bb7006
+  metadata.gz: 4692b2c9a32072b9a591234bad820ad8845a13af
+  data.tar.gz: 34809b1f70d5741b40688bd59f2fe9c2d94fa88a
 SHA512:
-  metadata.gz: af803e0e4278db28f9c00ebfdd06218262ab048e1a44cd56dbb227adef84d9fd29036dd4b48627e5f611329a3258564d55b2ee1eae35e35e8e61769949cc3dd7
-  data.tar.gz: 8ce9c41baa33ea174084017662d9f87549bcae1a46d34caa5ffae54c81fa51e7cd86192c69aad912417dc7980321aacf23e110a7ef35db75c37a77e2439415d7
+  metadata.gz: '09955aed6683cadf221f6cd3b461528b7250e84fa2754c06108d9c8bb31b550af95795c4f35e49ffaf7914aefc5b35d1e4784cfadf9112784cdb757ab5bfcf8a'
+  data.tar.gz: 89a7a2bf11d701f900c8f6020e25d4f3a10641f467625dadb7d0b22c706299f4e070f0a7519cfb9e724ea53901007bb845b6708390be08551d314caedda2ef2f

data/lib/shackles/connection_specification.rb

@@ -31,8 +31,19 @@ module Shackles
       end
     end
 
-    def initialize(config, adapter_method)
-      super(config.deep_symbolize_keys, adapter_method)
+    if Rails.version < '5'
+      def initialize(config, adapter_method)
+        super(config.deep_symbolize_keys, adapter_method)
+      end
+    else
+      def initialize(name, config, adapter_method)
+        super(name, config.deep_symbolize_keys, adapter_method)
+      end
+    end
+
+    def initialize_dup(original)
+      @current_config = nil
+      super
     end
 
     def config

data/lib/shackles/helper_methods.rb

@@ -1,7 +1,9 @@
 module Shackles
   module HelperMethods
     def self.included(base)
-      base.extend(ClassMethods)
+      base.singleton_class.include(ClassMethods)
+      # call shackle_class_method on the class itself, which then calls shackle_method on the singleton_class
+      base.singleton_class.singleton_class.include(ClassMethods)
     end
 
     # see readme for example usage

data/lib/shackles/version.rb

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

data/lib/shackles.rb

@@ -3,7 +3,7 @@ require 'set'
 module Shackles
   class << self
     def environment
-      @environment ||= :master
+      Thread.current[:shackles_environment] ||= :master
     end
 
     def global_config
@@ -63,7 +63,7 @@ module Shackles
         activated_environments << environment
         yield
       ensure
-        @environment = old_environment
+        Thread.current[:shackles_environment] = old_environment
         ActiveRecord::Base.connection_handler = ensure_handler unless Rails.env.test?
       end
     end
@@ -73,7 +73,7 @@ module Shackles
       environment ||= :master
       save_handler
       old_environment = self.environment
-      @environment = environment
+      Thread.current[:shackles_environment] = environment
       ActiveRecord::Base.connection_handler = ensure_handler unless Rails.env.test?
       old_environment
     end
@@ -90,8 +90,14 @@ module Shackles
         new_handler = @connection_handlers[environment] = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
         pools = ActiveRecord::Base.connection_handler.send(:owner_to_pool)
         pools.each_pair do |model, pool|
-          model = model.constantize
-          new_handler.establish_connection(model, pool.spec)
+          if Rails.version < '5'
+            model = model.constantize
+            new_handler.establish_connection(model, pool.spec)
+          elsif Rails.version < '5.1'
+            new_handler.establish_connection(pool.spec)
+          else
+            new_handler.establish_connection(pool.spec.config)
+          end
         end
       end
       new_handler

data/spec/shackles_spec.rb

@@ -13,6 +13,10 @@ end
 describe Shackles do
   ConnectionSpecification = ActiveRecord::ConnectionAdapters::ConnectionSpecification
 
+  def spec_args(conf, adapter)
+    Rails.version < '5' ? [conf, adapter] : ['dummy', conf, adapter]
+  end
+
   it "should allow changing environments" do
     conf = {
         :adapter => 'postgresql',
@@ -25,21 +29,21 @@ describe Shackles do
             :database => 'slave'
         }
     }
-    spec = ConnectionSpecification.new(conf, 'adapter')
-    spec.config[:username].should == 'canvas'
-    spec.config[:database].should == 'master'
+    spec = ConnectionSpecification.new(*spec_args(conf, 'adapter'))
+    expect(spec.config[:username]).to eq('canvas')
+    expect(spec.config[:database]).to eq('master')
     Shackles.activate(:deploy) do
-      spec.config[:username].should == 'deploy'
-      spec.config[:database].should == 'master'
+      expect(spec.config[:username]).to eq('deploy')
+      expect(spec.config[:database]).to eq('master')
     end
-    spec.config[:username].should == 'canvas'
-    spec.config[:database].should == 'master'
+    expect(spec.config[:username]).to eq('canvas')
+    expect(spec.config[:database]).to eq('master')
     Shackles.activate(:slave) do
-      spec.config[:username].should == 'canvas'
-      spec.config[:database].should == 'slave'
+      expect(spec.config[:username]).to eq('canvas')
+      expect(spec.config[:database]).to eq('slave')
     end
-    spec.config[:username].should == 'canvas'
-    spec.config[:database].should == 'master'
+    expect(spec.config[:username]).to eq('canvas')
+    expect(spec.config[:database]).to eq('master')
   end
 
   it "should allow using hash insertions" do
@@ -52,12 +56,12 @@ describe Shackles do
             :username => 'deploy'
         }
     }
-    spec = ConnectionSpecification.new(conf, 'adapter')
-    spec.config[:username].should == 'canvas'
+    spec = ConnectionSpecification.new(*spec_args(conf, 'adapter'))
+    expect(spec.config[:username]).to eq('canvas')
     Shackles.activate(:deploy) do
-      spec.config[:username].should == 'deploy'
+      expect(spec.config[:username]).to eq('deploy')
     end
-    spec.config[:username].should == 'canvas'
+    expect(spec.config[:username]).to eq('canvas')
   end
 
   it "should be cache coherent with modifying the config" do
@@ -70,21 +74,35 @@ describe Shackles do
             :username => 'deploy'
         }
     }
-    spec = ConnectionSpecification.new(conf.dup, 'adapter')
-    spec.config[:username].should == 'canvas'
+    spec = ConnectionSpecification.new(*spec_args(conf.dup, 'adapter'))
+    expect(spec.config[:username]).to eq('canvas')
     spec.config[:schema_search_path] = 'bob'
-    spec.config[:schema_search_path].should == 'bob'
-    spec.config[:username].should == 'bob'
+    expect(spec.config[:schema_search_path]).to eq('bob')
+    expect(spec.config[:username]).to eq('bob')
     Shackles.activate(:deploy) do
-      spec.config[:schema_search_path].should == 'bob'
-      spec.config[:username].should == 'deploy'
+      expect(spec.config[:schema_search_path]).to eq('bob')
+      expect(spec.config[:username]).to eq('deploy')
     end
     external_config = spec.config.dup
-    external_config.class.should == Hash
-    external_config.should == spec.config
+    expect(external_config.class).to eq(Hash)
+    expect(external_config).to eq(spec.config)
 
     spec.config = conf.dup
-    spec.config[:username].should == 'canvas'
+    expect(spec.config[:username]).to eq('canvas')
+  end
+
+  it "does not share config objects when dup'ing specs" do
+    conf = {
+        :adapter => 'postgresql',
+        :database => 'master',
+        :username => '%{schema_search_path}',
+        :schema_search_path => 'canvas',
+        :deploy => {
+            :username => 'deploy'
+        }
+    }
+    spec = ConnectionSpecification.new(*spec_args(conf.dup, 'adapter'))
+    expect(spec.config.object_id).not_to eq spec.dup.config.object_id
   end
 
   describe "activate" do
@@ -107,33 +125,43 @@ describe Shackles do
     it "should not close connections when switching envs" do
       conn = ActiveRecord::Base.connection
       slave_conn = Shackles.activate(:slave) { ActiveRecord::Base.connection }
-      conn.should_not == slave_conn
-      ActiveRecord::Base.connection.should == conn
+      expect(conn).not_to eq(slave_conn)
+      expect(ActiveRecord::Base.connection).to eq(conn)
     end
 
     it "should track all activated environments" do
       Shackles.activate(:slave) {}
       Shackles.activate(:custom) {}
       expected = Set.new([:master, :slave, :custom])
-      (Shackles.activated_environments & expected).should == expected
+      expect(Shackles.activated_environments & expected).to eq(expected)
     end
 
     context "non-transactional" do
       it "should really disconnect all envs" do
         ActiveRecord::Base.connection
-        ActiveRecord::Base.connection_pool.should be_connected
+        expect(ActiveRecord::Base.connection_pool).to be_connected
 
         Shackles.activate(:slave) do
           ActiveRecord::Base.connection
-          ActiveRecord::Base.connection_pool.should be_connected
+          expect(ActiveRecord::Base.connection_pool).to be_connected
         end
 
         ActiveRecord::Base.clear_all_connections!
-        ActiveRecord::Base.connection_pool.should_not be_connected
+        expect(ActiveRecord::Base.connection_pool).not_to be_connected
         Shackles.activate(:slave) do
-          ActiveRecord::Base.connection_pool.should_not be_connected
+          expect(ActiveRecord::Base.connection_pool).not_to be_connected
         end
       end
     end
+
+    it 'is thread safe' do
+      Shackles.activate(:slave) do
+        Thread.new do
+          Shackles.activate!(:deploy)
+          expect(Shackles.environment).to eq :deploy
+        end.join
+        expect(Shackles.environment).to eq :slave
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shackles
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,27 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -136,10 +156,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: ActiveRecord database environment switching for slaves and least-privilege
 test_files:
 - spec/shackles_spec.rb
-has_rdoc: