fabrication 0.7.0 → 0.7.1

data/README.markdown

@@ -10,6 +10,14 @@ Currently supported object types are...
 
 By default it will lazily generate active record associations. So if you have a has_many :widgets defined, it will not actually generate the widgets until the association is accessed. You can override this by appending "!" to the name of the parameter when defining the field in the Fabricator.
 
+### Important Thing To Note! ###
+
+If you are fabricating an activerecord backed object and it has attributes that are not columns in the underlying table, Fabrication will lazily generate them even if they are not defined associations. You can easily work around this by adding a "!" to the end of the attribute definition in the Fabricator.
+
+Fabricator(:user) do
+  some_delegated_something_or_other! { Fabricate(:something) }
+end
+
 ### Installation ###
 
 Add this to your gemfile.
@@ -46,16 +54,6 @@ Breaking down the above, we are defining a "company" fabricator, which will gene
 * After the object is built but before it is saved, it will update the name to "Another Fun Factory".
 * After the object is created, it will update the "ceo" association with a new "drone" record.
 
-Alternatively, you can Fabricate(:company) without first defining the Fabricator. Doing so will create an empty Fabricator called ":company" and prevent you from defining the Fabricator explicitly later.
-
-### Important Thing To Note! ###
-
-If you are fabricating an activerecord backed object and it has attributes that are not columns in the underlying table, Fabrication will lazily generate them even if they are not defined associations. You can easily work around this by adding a "!" to the end of the attribute definition in the Fabricator.
-
-Fabricator(:user) do
-  some_delegated_something_or_other! { Fabricate(:something) }
-end
-
 ### Inheritance ###
 
 So you already have a company fabricator, but you need one that specifically generates an LLC. No problem!
@@ -64,7 +62,7 @@ So you already have a company fabricator, but you need one that specifically gen
       type "LLC"
     end
 
-Setting the :from option will inherit the class and all the attributes from the named Fabricator. Even if you haven't defined a :company Fabricator yet, it will still work as long as it references an actual class name.
+Setting the :from option will inherit the class and all the attributes from the named Fabricator.
 
 You can also explicitly specify the class being fabricated with the :class_name parameter.
 
@@ -136,3 +134,4 @@ To run rake successfully:
 * Dave Ott (daveott)
 * Matt (winescout)
 * Lar Van Der Jagt (supaspoida)
+* Justin Smestad (jsmestad)

data/lib/fabrication/errors.rb

@@ -4,4 +4,6 @@ module Fabrication
 
   class UnfabricatableError < StandardError; end
 
+  class UnknownFabricatorError < StandardError; end
+
 end

data/lib/fabrication/fabricator.rb

@@ -9,7 +9,8 @@ class Fabrication::Fabricator
 
     def generate(name, options={}, overrides={}, &block)
       Fabrication::Support.find_definitions if schematics.empty?
-      (schematics[name] || define(name)).generate(options, overrides, &block)
+      raise Fabrication::UnknownFabricatorError, "No Fabricator defined for '#{name}'" unless schematics.has_key?(name)
+      schematics[name].generate(options, overrides, &block)
     end
 
     def schematics

data/lib/fabrication/support.rb

@@ -23,8 +23,9 @@ class Fabrication::Support
     end
 
     def find_definitions
+      base_path = defined?(Rails) ? Rails.root : "."
       ['test', 'spec'].map do |folder|
-        path = File.expand_path(File.join(folder, 'fabricators'))
+        path = File.expand_path(File.join(base_path, folder, 'fabricators'))
 
         load("#{path}.rb") if File.exists?("#{path}.rb")
 

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/spec/{fabricator_spec.rb → fabrication/fabricator_spec.rb}

@@ -41,19 +41,22 @@ describe Fabrication::Fabricator do
 
       it "finds definitions if none exist" do
         Fabrication::Support.should_receive(:find_definitions)
-        subject.generate(:object)
+        lambda { subject.generate(:object) }.should raise_error
       end
 
     end
 
     context 'with definitions' do
 
-      it "raises an error if the object can't be fabricated" do
-        lambda { subject.generate(:somenonexistantclass) }.should raise_error(Fabrication::UnfabricatableError)
+      it "raises an error if the class cannot be located" do
+        lambda { subject.define(:somenonexistantclass) }.should raise_error(Fabrication::UnfabricatableError)
+      end
+
+      it "raises an error if the fabricator cannot be located" do
+        lambda { subject.generate(:object) }.should raise_error(Fabrication::UnknownFabricatorError)
       end
 
       it 'generates a new object every time' do
-        subject.define(:person) { first_name '1' }
         subject.generate(:person).should_not == subject.generate(:person)
       end
 

data/spec/{support_spec.rb → fabrication/support_spec.rb}

@@ -36,7 +36,10 @@ describe Fabrication::Support do
 
   describe ".find_definitions" do
 
-    before(:all) { Fabrication::Support.find_definitions }
+    before(:all) do
+      Fabrication.clear_definitions
+      Fabrication::Support.find_definitions
+    end
 
     it "has an awesome object" do
       Fabrication::Fabricator.schematics[:awesome_object].should be

data/spec/fabrication_spec.rb

@@ -269,12 +269,16 @@ describe Fabrication do
 
   context 'when defining a fabricator twice' do
 
-    before(:all) do
-      Fabricator(:author) {}
+    it 'throws an error' do
+      lambda { Fabricator(:author) {} }.should raise_error(Fabrication::DuplicateFabricatorError)
     end
 
+  end
+
+  context "when defining a fabricator for a class that doesn't exist" do
+
     it 'throws an error' do
-      lambda { Fabricator(:author) {} }.should raise_error(Fabrication::DuplicateFabricatorError)
+      lambda { Fabricator(:your_mom) }.should raise_error(Fabrication::UnfabricatableError)
     end
 
   end
@@ -282,7 +286,7 @@ describe Fabrication do
   context 'when generating from a non-existant fabricator' do
 
     it 'throws an error' do
-      lambda { Fabricate(:your_mom) }.should raise_error(Fabrication::UnfabricatableError)
+      lambda { Fabricate(:your_mom) }.should raise_error(Fabrication::UnknownFabricatorError)
     end
 
   end
@@ -300,30 +304,11 @@ describe Fabrication do
 
   end
 
-  describe ".fabricators" do
-
-    let(:author) { Fabricator(:author) }
-    let(:book) { Fabricator(:book) }
-
-    before(:all) do
-      Fabrication.clear_definitions
-      author; book
-    end
-
-    after(:all) do
-      Fabrication::Support.find_definitions
-    end
-
-    it "returns the two fabricators" do
-      Fabrication::Fabricator.schematics.should == {:author => author, :book => book}
-    end
-
-  end
-
   describe "Fabricate with a block" do
 
     let(:person) do
       Fabricate(:person) do
+        age nil
         first_name "Paul"
         last_name { "Elliott" }
       end

data/spec/fabricators.rb

@@ -1 +1,42 @@
+# Plain Ruby Objects
 Fabricator(:awesome_object, :from => :object)
+
+Fabricator(:dog)
+Fabricator(:greyhound, :from => :dog) do
+  breed "greyhound"
+  locations(:count => 2)
+end
+
+Fabricator(:location) do
+  lat 35
+  lng 40
+end
+
+Fabricator(:person) do
+  first_name "John"
+  last_name { Faker::Name.last_name }
+  age { rand(100) }
+  shoes(:count => 10) { |person, i| "shoe #{i}" }
+  location
+end
+
+# ActiveRecord Objects
+Fabricator(:division) do
+  name "Division Name"
+end
+
+# Mongoid Documents
+Fabricator(:author) do
+  name 'George Orwell'
+  books(:count => 4) do |author, i|
+    Fabricate(:book, :title => "book title #{i}", :author => author)
+  end
+end
+
+Fabricator(:hemingway, :from => :author) do
+  name 'Ernest Hemingway'
+end
+
+Fabricator(:book) do
+  title "book title"
+end

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
-$:.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
-$:.unshift(File.dirname(__FILE__))
-
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'fabrication'
 require 'ffaker'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}

data/spec/support/active_record.rb

@@ -34,7 +34,3 @@ end
 class Division < ActiveRecord::Base
   belongs_to :company
 end
-
-Fabricator(:division) do
-  name "Division Name"
-end

data/spec/support/helper_objects.rb

@@ -9,21 +9,3 @@ end
 class Person
   attr_accessor :age, :first_name, :last_name, :shoes, :location
 end
-
-Fabricator(:greyhound, :from => :dog) do
-  breed "greyhound"
-  locations(:count => 2)
-end
-
-Fabricator(:location) do
-  lat 35
-  lng 40
-end
-
-Fabricator(:person) do
-  first_name "John"
-  last_name { Faker::Name.last_name }
-  age { rand(100) }
-  shoes(:count => 10) { |person, i| "shoe #{i}" }
-  location
-end

data/spec/support/mongoid.rb

@@ -9,7 +9,7 @@ def clear_mongodb
   Mongoid.master.collections.select {|c| c.name !~ /system/ }.each(&:drop)
 end
 
-Spec::Runner.configure do |config|
+Rspec.configure do |config|
   config.before(:all) do
     clear_mongodb
   end
@@ -31,18 +31,3 @@ class Book
 
   embedded_in :author, :inverse_of => :books
 end
-
-Fabricator(:author) do
-  name 'George Orwell'
-  books(:count => 4) do |author, i|
-    Fabricate(:book, :title => "book title #{i}", :author => author)
-  end
-end
-
-Fabricator(:hemingway, :from => :author) do
-  name 'Ernest Hemingway'
-end
-
-Fabricator(:book) do
-  title "book title"
-end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Paul Elliott
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -04:00
+date: 2010-09-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +26,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 3
+        - 2
         - 0
-        version: 1.3.0
+        - 0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -131,21 +133,20 @@ files:
 - lib/fabrication/version.rb
 - lib/fabrication.rb
 - spec/fabrication/attribute_spec.rb
+- spec/fabrication/fabricator_spec.rb
+- spec/fabrication/generator/active_record_spec.rb
+- spec/fabrication/generator/base_spec.rb
+- spec/fabrication/generator/mongoid_spec.rb
+- spec/fabrication/schematic_spec.rb
+- spec/fabrication/sequence_spec.rb
+- spec/fabrication/support_spec.rb
 - spec/fabrication_spec.rb
-- spec/fabricator_spec.rb
 - spec/fabricators/cool_object_fabricator.rb
 - spec/fabricators.rb
-- spec/generator/active_record_spec.rb
-- spec/generator/base_spec.rb
-- spec/generator/mongoid_spec.rb
-- spec/schematic_spec.rb
-- spec/sequence_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/helper_objects.rb
 - spec/support/mongoid.rb
-- spec/support_spec.rb
 - README.markdown
 has_rdoc: true
 homepage: http://github.com/paulelliott/fabrication

data/spec/spec.opts

@@ -1,3 +0,0 @@
---colour
---format nested
---backtrace