daddy 0.3.32 → 0.3.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea43453048982cc8991397d085d37a423eb0b0f6
-  data.tar.gz: abc99da56dbb0a1494f3ea44e1eec35ac8ef50e2
+  metadata.gz: 7ccd54aece78155f0dc1d720a791abd2024391e5
+  data.tar.gz: 839055c3f8929cd73179b38d3357a25c3ab8a16d
 SHA512:
-  metadata.gz: 1e49d30efa85c2e81af67186c355855b4b002763081e947514868cdd3eaa54f6fe38bf46e6212dc738b2a2a2e09e969f76a27c0b4d3895e8a1fe4b8f3f57e2ce
-  data.tar.gz: b5ee34a4b105456784514f29e77da19656541e896a3b618cb5dbf7afe83ef5a9e25e5e34e60c7c9b34b57609a4c053dbc3bf1eb2f97b2c19f05c89c96919d36e
+  metadata.gz: 6a5ed3415b414134ea2f36ea6f5c237b1baf4973596499cc1c21a467505aacc39ee72aef9f33fc509b577178a677aa6e10ee3bf3e9208750acbe11396bfb2325
+  data.tar.gz: 61ff9b31dc665f7236330814598446f6bccb8e8e90e6c86220ed19964a5db8927de29c8c837f48666d28fd2b7d41ce450309140cbed7f47dd4662ec09de2a0bd

data/lib/daddy.rb

@@ -1,12 +1,3 @@
-if defined?(Rails)
-  require 'daddy/rails/engine'
-  require 'daddy/rails/railtie'
-else
-  Dir[File.join(File.dirname(__FILE__), 'tasks', '*.rake')].each do |f|
-    load f
-  end
-end
-
 require 'daddy/utils/config'
 require 'daddy/utils/string_utils'
 require 'sql_builder'
@@ -18,3 +9,12 @@ module Daddy
   end
 
 end
+
+if defined?(Rails)
+  require 'daddy/rails/engine'
+  require 'daddy/rails/railtie'
+else
+  Dir[File.join(File.dirname(__FILE__), 'tasks', '*.rake')].each do |f|
+    load f
+  end
+end

data/lib/daddy/cucumber/hooks/database.rb

@@ -7,25 +7,24 @@ rescue NameError
   raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it."
 end
 
-Before do
-  DatabaseCleaner.start
+if ::ActiveRecord::VERSION::MAJOR < 4
+  fixture_class = ActiveRecord::Fixtures
+else
+  fixture_class = ActiveRecord::FixtureSet
+end
 
-  if ::ActiveRecord::VERSION::MAJOR < 4
-    fixture_class = ActiveRecord::Fixtures
-  else
-    fixture_class = ActiveRecord::FixtureSet
-  end
+fixtures_folder = File.join(Rails.root, 'test', 'fixtures')
+fixtures = Dir[File.join(fixtures_folder, '*.yml')].map {|f| File.basename(f, '.yml') }
+if defined? RailsCsvFixtures
+  fixtures += Dir[File.join(fixtures_folder, '*.csv')].map {|f| File.basename(f, '.csv') }
+end
 
-  fixture_class.reset_cache
-  fixtures_folder = File.join(Rails.root, 'test', 'fixtures')
-  fixtures = Dir[File.join(fixtures_folder, '*.yml')].map {|f| File.basename(f, '.yml') }
+Before do
+  DatabaseCleaner.start
   fixture_class.create_fixtures(fixtures_folder, fixtures)
-  if defined? RailsCsvFixtures
-    fixtures = Dir[File.join(fixtures_folder, '*.csv')].map {|f| File.basename(f, '.csv') }
-    fixture_class.create_fixtures(fixtures_folder, fixtures)
-  end
 end
 
 After do |scenario|
+  fixture_class.reset_cache
   DatabaseCleaner.clean
 end

data/lib/daddy/formatter/daddy_html.rb

@@ -1,4 +1,5 @@
 require 'erb'
+require 'daddy'
 
 module Daddy
   module Formatter

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.3.32'.freeze
+  VERSION = '0.3.33'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.3.32
+  version: 0.3.33
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -394,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: My rails dad