fabrication 1.3.1 → 1.3.2

data/lib/fabrication.rb

@@ -3,6 +3,7 @@ module Fabrication
   autoload :DuplicateFabricatorError, 'fabrication/errors/duplicate_fabricator_error'
   autoload :UnfabricatableError,      'fabrication/errors/unfabricatable_error'
   autoload :UnknownFabricatorError,   'fabrication/errors/unknown_fabricator_error'
+  autoload :MisplacedFabricateError,   'fabrication/errors/misplaced_fabricate_error'
 
   autoload :Attribute,  'fabrication/attribute'
   autoload :Config,     'fabrication/config'
@@ -32,6 +33,14 @@ module Fabrication
     Fabrication::Config.configure(&block)
   end
 
+  def self.initializing=(value)
+    @initializing = value
+  end
+
+  def self.initializing?
+    @initializing
+  end
+
 end
 
 def Fabricator(name, options={}, &block)
@@ -39,6 +48,7 @@ def Fabricator(name, options={}, &block)
 end
 
 def Fabricate(name, overrides={}, &block)
+  raise Fabrication::MisplacedFabricateError.new(name) if Fabrication.initializing?
   Fabrication::Fabricator.generate(name, {
     :save => true
   }, overrides, &block)

data/lib/fabrication/errors/misplaced_fabricate_error.rb

@@ -0,0 +1 @@
+class Fabrication::MisplacedFabricateError < StandardError; end

data/lib/fabrication/support.rb

@@ -23,12 +23,14 @@ class Fabrication::Support
     end
 
     def find_definitions
+      Fabrication.initializing = true
       path_prefix = defined?(Rails) ? Rails.root : "."
       Fabrication::Config.fabricator_dir.each do |folder|
         Dir.glob(File.join(path_prefix, folder, '**', '*.rb')).sort.each do |file|
           load file
         end
       end
+      Fabrication.initializing = false
     end
 
   end

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/lib/rails/generators/fabrication/turnip_steps/turnip_steps_generator.rb

@@ -1,21 +1,23 @@
 require 'rails/generators/base'
 
-module Fabrication::Generators
-  class TurnipStepsGenerator < Rails::Generators::Base
-    argument :step_dir, :type => :string, :default => "spec/acceptance/steps/"
+module Fabrication
+  module Generators
+    class TurnipStepsGenerator < Rails::Generators::Base
+      argument :step_dir, :type => :string, :default => "spec/acceptance/steps/"
 
-    def generate
-      template 'fabrication_steps.rb', turnip_step_directory
-    end
+      def generate
+        template 'fabrication_steps.rb', turnip_step_directory
+      end
 
-    def self.source_root
-      @_fabrication_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
-    end
+      def self.source_root
+        @_fabrication_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      end
 
-    private
+      private
 
-    def turnip_step_directory
-      File.join(step_dir, 'fabrication_steps.rb')
+      def turnip_step_directory
+        File.join(step_dir, 'fabrication_steps.rb')
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-12 00:00:00.000000000 Z
+date: 2012-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70150779173400 !ruby/object:Gem::Requirement
+  requirement: &70293264110260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,32 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150779173400
-- !ruby/object:Gem::Dependency
-  name: bson
-  requirement: &70150779171840 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :development
-  prerelease: false
-  version_requirements: *70150779171840
+  version_requirements: *70293264110260
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70150779170120 !ruby/object:Gem::Requirement
+  requirement: &70293264109540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150779170120
+  version_requirements: *70293264109540
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70150782983740 !ruby/object:Gem::Requirement
+  requirement: &70293264108380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150782983740
+  version_requirements: *70293264108380
 - !ruby/object:Gem::Dependency
   name: turnip
-  requirement: &70150782979740 !ruby/object:Gem::Requirement
+  requirement: &70293264107760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70150782979740
+  version_requirements: *70293264107760
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70150782976360 !ruby/object:Gem::Requirement
+  requirement: &70293264107080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150782976360
+  version_requirements: *70293264107080
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70150779183100 !ruby/object:Gem::Requirement
+  requirement: &70293264106400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150779183100
+  version_requirements: *70293264106400
 - !ruby/object:Gem::Dependency
   name: fuubar-cucumber
-  requirement: &70150779180820 !ruby/object:Gem::Requirement
+  requirement: &70293264105560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,32 +87,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150779180820
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: &70150779178300 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :development
-  prerelease: false
-  version_requirements: *70150779178300
+  version_requirements: *70293264105560
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70150779191660 !ruby/object:Gem::Requirement
+  requirement: &70293264104580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150779191660
+  version_requirements: *70293264104580
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70150779190740 !ruby/object:Gem::Requirement
+  requirement: &70293264102800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150779190740
+  version_requirements: *70293264102800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70150779189540 !ruby/object:Gem::Requirement
+  requirement: &70293264101080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150779189540
+  version_requirements: *70293264101080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70150779188220 !ruby/object:Gem::Requirement
+  requirement: &70293264099340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150779188220
+  version_requirements: *70293264099340
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70150779187060 !ruby/object:Gem::Requirement
+  requirement: &70293264098720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150779187060
+  version_requirements: *70293264098720
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70150779185820 !ruby/object:Gem::Requirement
+  requirement: &70293264097860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150779185820
+  version_requirements: *70293264097860
 description: Fabrication is an object generation framework for ActiveRecord, Mongoid,
   and Sequel. It has a sensible syntax and lazily generates ActiveRecord associations!
 email:
@@ -188,6 +166,7 @@ files:
 - lib/fabrication/config.rb
 - lib/fabrication/cucumber/step_fabricator.rb
 - lib/fabrication/errors/duplicate_fabricator_error.rb
+- lib/fabrication/errors/misplaced_fabricate_error.rb
 - lib/fabrication/errors/unfabricatable_error.rb
 - lib/fabrication/errors/unknown_fabricator_error.rb
 - lib/fabrication/fabricator.rb