fabrication 0.9.4 → 0.9.5

data/README.markdown

@@ -11,14 +11,6 @@ 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.
@@ -48,7 +40,11 @@ They are really easy to configure! Just add this to your `config/application.rb`
 
 Packaged with the gem is a generator which will load some handy cucumber table steps into your step_definitions folder. You can get them by running `rails g fabrication:cucumber_steps`.
 
-To generating a single "widget" object (expecting a Fabricator(:widget) to be defined):
+To generate a single "widget" object (expecting a Fabricator(:widget) to be defined):
+
+    Given 1 widget
+
+To generate a single "widget" object with specified attributes:
 
     Given the following widget:
       | name  | widget_1 |
@@ -56,6 +52,10 @@ To generating a single "widget" object (expecting a Fabricator(:widget) to be de
 
 To generate multiple "widget" objects:
 
+    Given 10 widgets
+
+To generate multiple "widget" objects with specified attributes:
+
     Given the following widgets:
       | name     | color |
       | widget_1 | red   |
@@ -68,7 +68,7 @@ To generate "wockets" nested within "widget" objects:
       | title    | Amazing |
       | category | fancy   |
 
-That will use the most recently defined "widget" and pass it into the Fabricator. That obviously requires your "wocket" to have a setter for a "widget".
+That will use the most recently defined "widget" and pass it into the Fabricator. That requires your "wocket" to have a setter for a "widget".
 
 ### Usage ###
 
@@ -196,3 +196,4 @@ To run rake successfully:
 * monsterlabs - Rails 3 Generators
 * Brandon Weiss (brandonweiss) - Sequal Model support
 * Tim Pope (tpope) - Singularize generated fabricator names
+* hakanensari - Default attribute cucumber steps

data/lib/fabrication.rb

@@ -57,3 +57,9 @@ class Fabricate
   end
 
 end
+
+class Fabricator
+  def self.name_for(name)
+    Fabrication::Support.name_for(name)
+  end
+end

data/lib/fabrication/fabricator.rb

@@ -43,7 +43,7 @@ class Fabrication::Fabricator
 end
 
 # Adds support for reload! in the Rails 2.3.x console
-if defined? ActionController and ActionController::Dispatcher.respond_to? :reload_application
+if defined? ActionController::Dispatcher and ActionController::Dispatcher.respond_to? :reload_application
   ActionController::Dispatcher.to_prepare :fabrication do
     Fabrication.clear_definitions
   end

data/lib/fabrication/support.rb

@@ -35,6 +35,10 @@ class Fabrication::Support
       end
     end
 
+    def name_for(name)
+      name.gsub(" ", "_").singularize.to_sym
+    end
+
   end
 
 end

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

data/lib/rails/generators/fabrication/cucumber_steps/templates/fabrication_steps.rb

@@ -1,54 +1,53 @@
 module FabricationMethods
   def create_from_table(model_name, table, extra = {})
-    fabricator_name = model_name.gsub(/\W+/, '_').downcase.singularize.to_sym
+    fabricator_name = generate_fabricator_name(model_name)
     is_singular = model_name.to_s.singularize == model_name.to_s
-    hashes = if is_singular
-               [table.rows_hash]
-             else
-               table.hashes
-             end
+    hashes = is_singular ? [table.rows_hash] : table.hashes
     @they = hashes.map do |hash|
       hash = hash.merge(extra).inject({}) {|h,(k,v)| h.update(k.gsub(/\W+/,'_').to_sym => v)}
-      object = Fabricate.build(fabricator_name, hash)
-      yield object if block_given?
-      object.save!
-      object
+      Fabricate(fabricator_name, hash)
     end
     if is_singular
       @it = @they.last
       instance_variable_set("@#{fabricator_name}", @it)
     end
   end
+
+  def create_with_default_attributes(model_name, count, extra = {})
+    fabricator_name = generate_fabricator_name(model_name)
+    is_singular = count == 1
+    @they = count.times.map { Fabricate(fabricator_name, extra) }
+    if is_singular
+      @it = @they.last
+      instance_variable_set("@#{fabricator_name}", @it)
+    end
+  end
+
+  def generate_fabricator_name(model_name)
+    model_name.gsub(/\W+/, '_').downcase.singularize.to_sym
+  end
 end
 
 World(FabricationMethods)
 
-Given %r{^the following (.+):$} do |model_name, table|
+Given /^(\d+) ([^"]*)$/ do |count, model_name|
+  create_with_default_attributes(model_name, count.to_i)
+end
+
+Given /^the following ([^"]*):$/ do |model_name, table|
   create_from_table(model_name, table)
 end
 
-Given %r{^that (.+) has the following (.+):$} do |parent, child, table|
-  child= child.gsub(/\W+/,'_')
-  is_child_plural = child.pluralize == child
+Given /^that ([^"]*) has the following ([^"]*):$/ do |parent, child, table|
   parent = parent.gsub(/\W+/,'_').downcase.sub(/^_/, '')
   parent_instance = instance_variable_get("@#{parent}")
-  parent_class = parent_instance.class
-  if assoc = parent_class.reflect_on_association(child.to_sym) || parent_class.reflect_on_association(child.pluralize.to_sym)
-    parent = (assoc.options[:as] || parent).to_s
-    child = (assoc.options[:class_name] || assoc.options[:source] || child).to_s
-    # source will always be singular, repluralize based on original argument
-    child = child.pluralize if is_child_plural
-  end
-  if child.classify.constantize.method_defined?(parent.pluralize)
-    create_from_table(child, table, parent.pluralize => [parent_instance])
-  elsif child.classify.constantize.method_defined?(parent)
-    create_from_table(child, table, parent => parent_instance)
-  else
-    create_from_table(child, table)
-    if assoc.macro == :has_many
-      parent_instance.send("#{assoc.name}=", @they)
-    else
-      parent_instance.send("#{assoc.name}=", @they.first)
-    end
+  child = child.gsub(/\W+/,'_').downcase
+
+  child_class = Fabrication::Support.class_for(child.singularize)
+  if child_class && !child_class.new.respond_to?("#{parent}=")
+    parent = parent.pluralize
+    parent_instance = [parent_instance]
   end
+
+  create_from_table(child, table, parent => parent_instance)
 end

data/spec/fabrication/support_spec.rb

@@ -51,4 +51,30 @@ describe Fabrication::Support do
 
   end
 
+  describe ".name_for" do
+
+    context "whitespace delimited" do
+      context "singular" do
+        subject { Fabrication::Support.name_for("interesting location") }
+        it { should == :interesting_location }
+      end
+      context "plural" do
+        subject { Fabrication::Support.name_for("interesting locations") }
+        it { should == :interesting_location }
+      end
+    end
+
+    context "underscored" do
+      context "singular" do
+        subject { Fabrication::Support.name_for("interesting_location") }
+        it { should == :interesting_location }
+      end
+      context "plural" do
+        subject { Fabrication::Support.name_for("interesting_locations") }
+        it { should == :interesting_location }
+      end
+    end
+
+  end
+
 end

data/spec/fabricator_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Fabricator do
+
+  describe ".name_for" do
+
+    it "delegates to Fabrication::Support" do
+      Fabrication::Support.should_receive(:name_for).with("interesting location")
+      Fabricator.name_for("interesting location")
+    end
+
+  end
+
+end

data/spec/fabricators.rb

@@ -11,6 +11,7 @@ Fabricator(:location) do
   lat 35
   lng 40
 end
+Fabricator(:interesting_location, :from => :location)
 
 Fabricator(:person) do
   first_name "John"
@@ -42,7 +43,7 @@ end
 Fabricator(:author) do
   name 'George Orwell'
   books(:count => 4) do |author, i|
-    Fabricate(:book, :title => "book title #{i}", :author => author)
+    Fabricate.build(:book, :title => "book title #{i}", :author => author)
   end
 end
 

data/spec/spec_helper.rb

@@ -6,3 +6,9 @@ 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}
+
+Rspec.configure do |config|
+  config.before(:all) do
+    clear_mongodb
+  end
+end

data/spec/support/mongoid.rb

@@ -9,12 +9,6 @@ def clear_mongodb
   Mongoid.master.collections.select {|c| c.name !~ /system/ }.each(&:drop)
 end
 
-Rspec.configure do |config|
-  config.before(:all) do
-    clear_mongodb
-  end
-end
-
 class Author
   include Mongoid::Document
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabrication
 version: !ruby/object:Gem::Version 
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Paul Elliott
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-02 00:00:00 -05:00
+date: 2011-01-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 2
@@ -33,97 +35,119 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ffaker
+  name: cucumber
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: ffaker
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 4
         - 0
         version: 0.4.0
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 3
         - 0
         - 3
         version: 3.0.3
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
         - 3
         - 1
         version: 1.3.1
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: bson_ext
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
         - 1
-        - 4
-        version: 1.1.4
+        - 5
+        version: 1.1.5
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mongoid
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15424093
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
+        - rc
+        - 4
+        version: 2.0.0.rc.4
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: sequel
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 71
         segments: 
         - 3
         - 16
         - 0
         version: 3.16.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: Fabrication is an object generation framework for ActiveRecord, Mongoid, and Sequel. It has a sensible syntax and lazily generates ActiveRecord associations!
 email: 
 - paul@hashrocket.com
@@ -162,6 +186,7 @@ files:
 - 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/spec_helper.rb
@@ -184,6 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -192,6 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"