db-switch 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9386730abb6a43273dde21685ba599dd5f2a03f0
-  data.tar.gz: c7dfcffd2a19423dc4de0b761c813407566ac297
+  metadata.gz: 349594e5e378fb58e5c4d22c352218c7da091c91
+  data.tar.gz: d01d7d462e99fe60d5bafcb982e42ce8e0022f13
 SHA512:
-  metadata.gz: c5dcd0b3f043f0be5f1bfb3d6fbf04f3013c216bdaa4f356a9034f4c127a56a03dee1ca464530a62b5c08b48bd376e0fdcc56df9b0ea09c08c183896c7d499ba
-  data.tar.gz: e93b14b1cb755b13b9af46176b45dd492db6e944ddb47c7284770007ca939b649268d1ffdcd946d849903e5a772f823a8beed44cb99563181bf4a24af91f6b66
+  metadata.gz: b4db0e07aebed82b9a6288ca55900f062c39a4d8d848e2c3de52d9cb3bbf63bdc262c68d5ae0cc81799854e787436825989a5a987cf01e190f77623a9ce9aa5e
+  data.tar.gz: bb4edc848a5eec04b88a5f5b9959d90da1b5699df578ad3ef82e063184ec4fbee859e88039758f7becdca6705c61c27eaca756762ccd1a3e4492c2613e0cf078

data/.gitignore

@@ -8,4 +8,6 @@
 /spec/reports/
 /tmp/
 .idea/
-*.log
+*.log
+gemfiles/
+*.gem

data/.rubocop.yml

@@ -0,0 +1,16 @@
+Documentation:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/LineLength:
+  Max: 120
+Metrics/AbcSize:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false
+Naming/FileName:
+  Enabled: false

data/.travis.yml

@@ -1,5 +1,6 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.13.4
+  - 2.3.4
+  - 2.4.1
+script: appraisal install && appraisal rake && rubocop --fail-level R

data/Appraisals

@@ -0,0 +1,9 @@
+appraise 'rails-5.0' do
+  gem 'activerecord', '~> 5.0.0'
+  gem 'railties', '~> 5.0.0'
+end
+
+appraise 'rails-5.1' do
+  gem 'activerecord', '~> 5.1.0'
+  gem 'railties', '~> 5.1.0'
+end

data/Rakefile

@@ -3,4 +3,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/db-switch.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pg', '~> 0.19'
+  spec.add_development_dependency 'rubocop', '0.50.0'
+  spec.add_development_dependency 'appraisal', '~> 2.1'
 
   # Rails 5 dependencies
   spec.add_runtime_dependency 'activerecord', '~> 5.0'

data/lib/db-switch.rb

@@ -1,2 +1,2 @@
 require 'db-switch/version'
-require 'db-switch/railtie'
+require 'db-switch/railtie'

data/lib/db-switch/active_record_base.rb

@@ -1,14 +1,22 @@
-module DbSwitch::ActiveRecordBase
-  include DbSwitch::ThreadVariables
+module DbSwitch
+  module ActiveRecordBase
+    include DbSwitch::ThreadVariables
 
-  def connect_to(connection_name)
-    begin
+    def connect_to(connection_name)
       self.db_switch_connection_name = connection_name.to_s
       if ActiveRecord::Base.connection_handler.connected?(connection_name.to_s).nil?
-        db_config = ActiveRecord::Base.configurations[connection_name.to_s]
+        db_config =
+          ActiveRecord::Base.configurations[connection_name.to_s] ||
+          connection_configurations[connection_name.to_s]
+
         if db_config && db_config[Rails.env.to_s]
-          resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(db_config)
-          spec = resolver.spec(Rails.env.to_sym, connection_name.to_s)
+          spec =
+            if Rails::VERSION::MINOR.zero?
+              resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(db_config)
+              resolver.spec(Rails.env.to_sym, connection_name.to_s)
+            else
+              db_config[Rails.env.to_s].merge(name: connection_name.to_s)
+            end
           ActiveRecord::Base.connection_handler.establish_connection spec
         else
           self.db_switch_connection_name = nil
@@ -18,9 +26,13 @@ module DbSwitch::ActiveRecordBase
     ensure
       self.db_switch_connection_name = nil
     end
-  end
 
-  def connection_specification_name
-    db_switch_connection_name || super
+    def connection_specification_name
+      db_switch_connection_name || super
+    end
+
+    def connection_configurations
+      @connection_configurations ||= YAML.load_file(Rails.root.join('config/database.yml'))
+    end
   end
-end
+end

data/lib/db-switch/log_subscriber.rb

@@ -1,15 +1,24 @@
-module DbSwitch::LogSubscriber
-  include DbSwitch::ThreadVariables
+module DbSwitch
+  module LogSubscriber
+    include DbSwitch::ThreadVariables
 
-  attr_accessor :color_value
+    attr_accessor :color_value
 
-  def colorize_payload_name(name, payload_name)
-    self.color_value = payload_name.blank? || payload_name == 'SQL' ? :MAGENTA : :CYAN if db_switch_connection_name
-    super
-  end
+    def colorize_payload_name(name, payload_name)
+      if db_switch_connection_name
+        self.color_value =
+          if payload_name.blank? || payload_name == 'SQL'
+            :MAGENTA
+          else
+            :CYAN
+          end
+      end
+      super
+    end
 
-  def debug(msg)
-    msg = color("[#{db_switch_connection_name}]", color_value || :CYAN, true) + msg if db_switch_connection_name
-    super(msg)
+    def debug(msg)
+      msg = color("[#{db_switch_connection_name}]", color_value || :CYAN, true) + msg if db_switch_connection_name
+      super(msg)
+    end
   end
-end
+end

data/lib/db-switch/railtie.rb

@@ -15,4 +15,4 @@ module DbSwitch
       end
     end
   end
-end
+end

data/lib/db-switch/thread_variables.rb

@@ -1,10 +1,12 @@
-module DbSwitch::ThreadVariables
-  def db_switch_connection_name
-    Thread.current[:db_switch_connection_name]
-  end
+module DbSwitch
+  module ThreadVariables
+    def db_switch_connection_name
+      Thread.current[:db_switch_connection_name]
+    end
 
-  def db_switch_connection_name=(value)
-    Thread.current[:db_switch_connection_name] = value
+    def db_switch_connection_name=(value)
+      Thread.current[:db_switch_connection_name] = value
+    end
+    # attr_accessor :db_switch_connection_name # notice: this is not thread safe! (just for testing purposes)
   end
-  # attr_accessor :db_switch_connection_name # notice: this is not thread safe! (just for testing purposes)
-end
+end

data/lib/db-switch/version.rb

@@ -1,3 +1,3 @@
 module DbSwitch
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-switch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Anjlab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.50.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.50.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +132,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -136,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Simple database connection switcher for Rails 5