rspectacular 0.13.0 → 0.14.0

data/lib/rspectacular/plugins/singleton.rb

@@ -3,7 +3,7 @@
 ##############################################################################
 
 RSpec.configure do |config|
-  config.before(:each, :singletons => lambda { |v| !!v }) do |example|
+  config.around(:each, :singletons => lambda { |v| !!v }) do |example|
     require 'singleton'
 
     options             = example.metadata[:singletons]
@@ -13,5 +13,11 @@ RSpec.configure do |config|
     singletons_to_reset.each do |singleton|
       Singleton.__init__(singleton)
     end
+
+    example.run
+
+    singletons_to_reset.each do |singleton|
+      Singleton.__init__(singleton)
+    end
   end
 end

data/lib/rspectacular/spec_helpers/active_record_basic.rb

@@ -1,18 +1,4 @@
-require 'active_record'
-
-rails_database_yaml_file_path         = File.join(Dir.pwd, 'config', 'database.yml')
-rails_engine_database_yaml_file_path  = File.join(Dir.pwd, 'spec', 'dummy', 'config', 'database.yml')
-
-database_yaml_file_path               = if File.exist? rails_engine_database_yaml_file_path
-                                          rails_engine_database_yaml_file_path
-                                        else
-                                          rails_database_yaml_file_path
-                                        end
-
-connection_info                       = YAML.load_file(database_yaml_file_path)['test']
-
-ActiveRecord::Base.establish_connection(connection_info)
-
+require File.expand_path(File.join('..', 'active_record_connection_setup'), __FILE__)
 require 'rspectacular'
 
 Dir[File.join(Dir.pwd, 'spec', 'support', '**', '*.rb')].each { |f| require f }

data/lib/rspectacular/spec_helpers/active_record_connection_setup.rb

@@ -0,0 +1,24 @@
+require 'active_record'
+require 'fileutils'
+require 'logger'
+
+begin
+  FileUtils.mkdir 'log'
+rescue Errno::EEXIST
+end
+
+log_file                              = File.join(Dir.pwd, 'log', 'activerecord.log')
+
+rails_database_yaml_file_path         = File.join(Dir.pwd, 'config', 'database.yml')
+rails_engine_database_yaml_file_path  = File.join(Dir.pwd, 'spec', 'dummy', 'config', 'database.yml')
+
+database_yaml_file_path               = if File.exist? rails_engine_database_yaml_file_path
+                                          rails_engine_database_yaml_file_path
+                                        else
+                                          rails_database_yaml_file_path
+                                        end
+
+connection_info                       = YAML.load_file(database_yaml_file_path)['test']
+
+ActiveRecord::Base.logger = Logger.new(log_file)
+ActiveRecord::Base.establish_connection(connection_info)

data/lib/rspectacular/spec_helpers/rails_engine.rb

@@ -1,4 +1,6 @@
 ENV["RAILS_ENV"] ||= 'test'
+
+require File.expand_path(File.join('..', 'active_record_connection_setup'), __FILE__)
 require File.join(Dir.pwd, 'spec', 'dummy', 'config', 'environment')
 
 require 'rspec/rails'

data/lib/rspectacular/version.rb

@@ -1,3 +1,3 @@
 module RSpectacular
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspectacular
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -88,6 +88,7 @@ files:
 - lib/rspectacular/selectors/defaults.rb
 - lib/rspectacular/selectors.rb
 - lib/rspectacular/spec_helpers/active_record_basic.rb
+- lib/rspectacular/spec_helpers/active_record_connection_setup.rb
 - lib/rspectacular/spec_helpers/rails_engine.rb
 - lib/rspectacular/support/focused.rb
 - lib/rspectacular/support/formatters.rb