fabrication 1.4.0 → 1.4.1

data/Rakefile

@@ -9,7 +9,7 @@ end
 
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:cucumber) do |t|
-  t.cucumber_opts = "--format Cucumber::Formatter::Fuubar --tags ~@wip"
+  t.cucumber_opts = "--format progress --tags ~@wip"
 end
 
 RSpec::Core::RakeTask.new(:turnip) do |spec|

data/lib/fabrication/schematic/definition.rb

@@ -124,7 +124,7 @@ class Fabrication::Schematic::Definition
     (defined?(HashWithIndifferentAccess) ? HashWithIndifferentAccess.new : {}).tap do |hash|
       attributes.map do |attribute|
         value = object.send(attribute.name)
-        if value.respond_to? :id
+        if value && value.respond_to?(:id)
           hash["#{attribute.name}_id"] = value.id
         else
           hash[attribute.name] = value

data/lib/fabrication/syntax/make.rb

@@ -12,12 +12,18 @@ module Fabrication
     #
     #
     module Make
-      def make(overrides = {}, &block)
-        Fabricate.build(name.underscore.to_sym, overrides, &block)
+      def make(*args, &block)
+        overrides = args.extract_options!
+        klass = name.underscore.to_sym
+        fabricator_name = args.first.is_a?(Symbol) ? "#{klass}_#{args.first}" : klass
+        Fabricate.build(fabricator_name, overrides, &block)
       end
 
-      def make!(overrides = {}, &block)
-        Fabricate(name.underscore.to_sym, overrides, &block)
+      def make!(*args, &block)
+        overrides = args.extract_options!
+        klass = name.underscore.to_sym
+        fabricator_name = args.first.is_a?(Symbol) ? "#{klass}_#{args.first}" : klass
+        Fabricate(fabricator_name, overrides, &block)
       end
     end
   end

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-05 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70248489649880 !ruby/object:Gem::Requirement
+  requirement: &70131616319860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248489649880
+  version_requirements: *70131616319860
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70248489648640 !ruby/object:Gem::Requirement
+  requirement: &70131616319440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248489648640
+  version_requirements: *70131616319440
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70248489647020 !ruby/object:Gem::Requirement
+  requirement: &70131616319020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248489647020
+  version_requirements: *70131616319020
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70248489646320 !ruby/object:Gem::Requirement
+  requirement: &70131616318600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248489646320
+  version_requirements: *70131616318600
 - !ruby/object:Gem::Dependency
   name: dm-active_model
-  requirement: &70248489645760 !ruby/object:Gem::Requirement
+  requirement: &70131616318180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248489645760
+  version_requirements: *70131616318180
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &70248489644760 !ruby/object:Gem::Requirement
+  requirement: &70131616317760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248489644760
+  version_requirements: *70131616317760
 - !ruby/object:Gem::Dependency
   name: dm-migrations
-  requirement: &70248489643740 !ruby/object:Gem::Requirement
+  requirement: &70131616317340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248489643740
+  version_requirements: *70131616317340
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
-  requirement: &70248489629400 !ruby/object:Gem::Requirement
+  requirement: &70131616316920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248489629400
+  version_requirements: *70131616316920
 - !ruby/object:Gem::Dependency
   name: turnip
-  requirement: &70248489628020 !ruby/object:Gem::Requirement
+  requirement: &70131615272400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70248489628020
+  version_requirements: *70131615272400
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70248489627440 !ruby/object:Gem::Requirement
+  requirement: &70131615269340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,32 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248489627440
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: &70248489626520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70248489626520
-- !ruby/object:Gem::Dependency
-  name: fuubar-cucumber
-  requirement: &70248489626020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70248489626020
+  version_requirements: *70131615269340
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70248489625400 !ruby/object:Gem::Requirement
+  requirement: &70131615264260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248489625400
+  version_requirements: *70131615264260
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70248489624900 !ruby/object:Gem::Requirement
+  requirement: &70131616346200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248489624900
+  version_requirements: *70131616346200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70248489624300 !ruby/object:Gem::Requirement
+  requirement: &70131616345780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248489624300
+  version_requirements: *70131616345780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70248489623680 !ruby/object:Gem::Requirement
+  requirement: &70131616345360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248489623680
+  version_requirements: *70131616345360
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70248489623160 !ruby/object:Gem::Requirement
+  requirement: &70131616344940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,7 +175,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248489623160
+  version_requirements: *70131616344940
 description: Fabrication is an object generation framework for ActiveRecord, Mongoid,
   and Sequel. It has a sensible syntax and lazily generates ActiveRecord associations!
 email: