rails-env-switcher 0.2 → 0.2.1

data/lib/rails-env-switcher/switcher/active_record.rb

@@ -1,9 +1,8 @@
 module RailsEnvSwitcher::Switcher::ActiveRecord
   def self.switch_env(old_env, env, options={})
-    if ::ActiveRecord::Base.connected?
-      ::ActiveRecord::Base.clear_cache! if ::ActiveRecord::Base.respond_to? :clear_cache
-      ::ActiveRecord::Base.clear_all_connections!
-      ::ActiveRecord::Base.establish_connection
+    if defined? ActiveRecord
+      ActiveRecord::Base.clear_active_connections!
+      ActiveRecord::Base.establish_connection
     end
   end
 end

data/lib/rails-env-switcher/switcher/rails.rb

@@ -1,15 +1,11 @@
 module RailsEnvSwitcher::Switcher::Rails
   def self.switch_env(old_env, env, options={})
-    if ::Rails.env != env
-      ENV['RAILS_ENV'] = env
-      ::Rails.env = env
+    return if ::Rails.env == env
 
-      Kernel.silence_warnings do
-        Dir[Rails.root.join('config', 'initializers', '*.rb')].map do |file|
-          load file
-        end
-        load Rails.root.join('config', 'environments', "#{env}.rb")
-      end
+    ENV['RAILS_ENV'] = ::Rails.env = env
+    Kernel.silence_warnings do
+      Dir[Rails.root.join('config', 'initializers', '*.rb')].each { |file| load file }
+      load Rails.root.join('config', 'environments', "#{env}.rb")
     end
   end
 end

data/lib/rails-env-switcher/switcher/reloader.rb

@@ -1,8 +1,8 @@
 module RailsEnvSwitcher::Switcher::Reloader
   def self.switch_env(old_env, env, options={})
-    # delete because we don't necessarily want to reload when we go back to
-    # the original environment
-    if options.delete(:reload)
+    if options[:reload]
+      ActionDispatch::Reloader.cleanup!
+      ActionDispatch::Reloader.prepare!
       reload!(false) if respond_to?(:reload!)
       FactoryGirl.reload if defined?(FactoryGirl)
     end

data/lib/rails-env-switcher/version.rb

@@ -1,3 +1,3 @@
 module RailsEnvSwitcher
-  VERSION = '0.2'
+  VERSION = '0.2.1'
 end

data/lib/rails-env-switcher.rb

@@ -11,6 +11,7 @@ module RailsEnvSwitcher
       switch_env(env, options)
       yield
     ensure
+      options.delete(:reload) # not reloading again once we switch back
       switch_env(old_env, options)
     end
   end
@@ -22,6 +23,9 @@ module RailsEnvSwitcher
       self.handlers.each do |handler|
         handler.switch_env(old_env, env, options)
       end
+    else
+      # Always reload if needed
+      Switcher::Reloader.switch_env(env, env, options)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-env-switcher
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,14 +34,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rails-env-switcher/switcher/active_record.rb
 - lib/rails-env-switcher/switcher/copycopter_client.rb
-- lib/rails-env-switcher/switcher/rails.rb
 - lib/rails-env-switcher/switcher/mongoid.rb
 - lib/rails-env-switcher/switcher/bundler.rb
+- lib/rails-env-switcher/switcher/active_record.rb
+- lib/rails-env-switcher/switcher/rails.rb
 - lib/rails-env-switcher/switcher/reloader.rb
-- lib/rails-env-switcher/switcher.rb
 - lib/rails-env-switcher/pry.rb
+- lib/rails-env-switcher/switcher.rb
 - lib/rails-env-switcher/version.rb
 - lib/rails-env-switcher.rb
 - README.md
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Switch from a Rails environment to another