fabrication 0.9.1 → 0.9.2

data/README.markdown

@@ -169,3 +169,4 @@ To run rake successfully:
 * Christopher Hanks (chanks) - Chained callbacks
 * monsterlabs - Rails 3 Generators
 * Brandon Weiss (brandonweiss) - Sequal Model support
+* Tim Pope (tpope) - Singularize generated fabricator names

data/lib/fabrication/schematic.rb

@@ -28,8 +28,12 @@ class Fabrication::Schematic
     attributes.select { |a| a.name == name }.first
   end
 
-  def delete_attribute(name)
-    attributes.reject! { |a| a.name == name }
+  def append_or_update_attribute(attribute)
+    if index = attributes.index { |a| a.name == attribute.name }
+      attributes[index] = attribute
+    else
+      attributes << attribute
+    end
   end
 
   attr_writer :attributes
@@ -70,8 +74,7 @@ class Fabrication::Schematic
     clone.tap do |schematic|
       schematic.instance_eval(&block) if block_given?
       overrides.each do |name, value|
-        schematic.delete_attribute(name)
-        schematic.attributes << Fabrication::Attribute.new(name, nil, value)
+        schematic.append_or_update_attribute(Fabrication::Attribute.new(name, nil, value))
       end
     end
   end
@@ -86,8 +89,7 @@ class Fabrication::Schematic
       value = args.first
     end
 
-    delete_attribute(method_name)
-    attributes.push(Fabrication::Attribute.new(method_name, params, value))
+    append_or_update_attribute(Fabrication::Attribute.new(method_name, params, value))
   end
 
   def on_init(&block)

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/spec/fabrication/schematic_spec.rb

@@ -49,16 +49,6 @@ describe Fabrication::Schematic do
     end
   end
 
-  describe "#delete_attribute" do
-    it "deletes the requested attribute if it exists" do
-      schematic.delete_attribute(:name).should_not be_nil
-      schematic.attribute(:name).should be_nil
-    end
-    it "returns nil if it does not exist" do
-      schematic.delete_attribute(:not_there).should be_nil
-    end
-  end
-
   describe "#attributes" do
     it "always returns an empty array" do
       schematic.attributes = nil

data/spec/fabrication_spec.rb

@@ -122,8 +122,7 @@ describe Fabrication do
   context 'with the generation parameter' do
 
     let(:person) do
-      Fabricate(:person) do
-        first_name "Paul"
+      Fabricate(:person, :first_name => "Paul") do
         last_name { |person| "#{person.first_name}#{person.age}" }
         age 50
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Paul Elliott
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 -05:00
+date: 2010-11-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency