cranky 0.0.4 → 0.0.5

data/README.rdoc

@@ -46,13 +46,13 @@ Cranky allows you to build factories via std Ruby methods, like this...
       # Define attributes via a hash, generate the values any way you want
       define :name    => "Jimmy",               
              :email   => "jimmy#{n}@home.com",   # An 'n' counter method is available to help make things unique
-             :role    => :user,
+             :role    => "pleb",
              :address => default_address         # Call your own helper methods to wire up your associations
     end
 
     # Easily create variations via the inherit helper, callable via Factory.build(:admin)
     def admin
-      inherit(:user, :role => :admin)
+      inherit(:user, :role => "admin")
     end
 
     # Return a default address if it already exists, or call the address factory to make one
@@ -92,7 +92,7 @@ So for example to create a simple user factory...
       u       = User.new
       u.name  = options[:name] || "Jimmy"                 # Use the passed in name if present, or the default
       u.email = options[:email] || "jimmy#{n}@home.com"   # Give each user a unique email address
-      u.role  = options[:role] || :user
+      u.role  = options[:role] || "pleb"
       u
     end
 
@@ -114,7 +114,7 @@ For example here it is with the capability to automatically create a default add
       u         = User.new
       u.name    = options[:name] || "Jimmy"
       u.email   = options[:email] || "jimmy#{n}@home.com"
-      u.role    = options[:role] || :user
+      u.role    = options[:role] || "pleb"
       u.address = default_address
       u
     end
@@ -129,7 +129,7 @@ So a nice tip is to implement default associations like this (assuming you're us
   # Return the default address if it already exists, or call the address factory to make one
   def default_address
     # If the default address exists, but has been cleared from the database...
-    @default_address = nil if @default_address && !Account.exists?(@default_address.id)
+    @default_address = nil if @default_address && !Address.exists?(@default_address.id)
     @default_address ||= create(:address) 
   end
 
@@ -141,7 +141,7 @@ You can pass additional arguments to your factories via the overrides hash...
     u         = User.new
     u.name    = options[:name] || "Jimmy"
     u.email   = options[:email] || "jimmy#{n}@home.com"
-    u.role    = options[:role] || :user
+    u.role    = options[:role] || "pleb"
     u.address = options[:new_address] ? create(:address) : default_address
     u
   end
@@ -158,20 +158,29 @@ Most of your factories are likely to simply define a list of mimimum attribute v
   def user
     define :name    => "Jimmy",
            :email   => "jimmy#{n}@home.com",
-           :role    => :user,
+           :role    => "pleb",
            :address => default_address
   end
 
 Note that you don't have to worry about handling the overrides here, they will be applied automatically if present, just define the defaults.
 
-The best thing about this is that there are no pesky blocks to worry about. The define argument is just a regular hash, you have complete freedom to choose how to generate the values to be passed into it.
+The define argument is just a regular hash, you have complete freedom to choose how to generate the values to be passed into it.
+
+If you like you can generate attributes with a block:
+
+  def user
+    define :name    => "Jimmy",
+           :email   => lambda{|u| "#{u.name.downcase}@home.com"},
+           :role    => "pleb",
+           :address => default_address
+  end
 
 The define method will return the object, you can grab this for additional manipulation as you would expect...
 
   def user
     u = define :name    => "Jimmy",
                :email   => "jimmy#{n}@home.com",
-               :role    => :user,
+               :role    => "pleb",
                :address => default_address
     u.do_something
     u               # Remember to return it at the end
@@ -184,7 +193,7 @@ If for any reason you want to have your factory method named differently from th
     u = define :class   => :user, 
                :name    => "Jimmy",
                :email   => "jimmy#{n}@home.com",
-               :role    => :user,
+               :role    => "pleb",
                :address => default_address
   end
 
@@ -194,7 +203,7 @@ You can inherit from other factories via the inherit method. So for example to c
 
   # Called via Factory.create(:admin)
   def admin
-    inherit(:user, :role => :admin)  # Pass in any attribute overrides you want
+    inherit(:user, :role => "admin")  # Pass in any attribute overrides you want
   end
 
 === Unique Attributes (n)

data/lib/cranky.rb

@@ -1,6 +1,6 @@
 class Cranky
 
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 
 #  Dir.glob("#{File.expand_path(File.dirname(__FILE__))}/*.rb").each do |file|
 #    require file
@@ -62,11 +62,15 @@ class Cranky
 
     def define(attrs={})
       final_attrs = attrs.merge(@attrs.last)
-      #item = (attrs[:class] ? attrs[:class] : @what.last).to_s.camelcase.constantize.new
       item = get_constant(attrs[:class] ? attrs[:class] : @what.last).new
       final_attrs.delete(:class)
+      # Assign all explicit attributes first
       final_attrs.each do |attr, value|
-        item.send("#{attr}=", value) if item.respond_to?("#{attr}=")
+        item.send("#{attr}=", value) if item.respond_to?("#{attr}=") && !value.respond_to?("call")
+      end
+      # Then call any blocks
+      final_attrs.each do |attr, value|
+        item.send("#{attr}=", value.call(item)) if item.respond_to?("#{attr}=") && value.respond_to?("call")
       end
       item
     end

data/spec/cranky_spec.rb

@@ -79,6 +79,13 @@ describe Cranky do
     Factory.build(:user).argument_received.should == nil
     Factory.build(:user, :argument_supplied => true).argument_received.should == true
   end
+
+  it "should allow blocks to be passed into the define method" do
+    Factory.build(:user, :name => "jenny", :email => lambda{ |u| "#{u.name}@home.com" }).email.should == "jenny@home.com"
+    Factory.build(:user, :name => lambda{"jimmy" + " cranky"}).name.should == "jimmy cranky"
+    Factory.build(:user, :name => "jenny", :email => Proc.new{ |u| "#{u.name}@home.com" }).email.should == "jenny@home.com"
+    Factory.build(:user, :name => Proc.new{"jimmy" + " cranky"}).name.should == "jimmy cranky"
+  end
   
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Stephen McGinty
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-23 00:00:00 -05:00
+date: 2010-05-26 00:00:00 -05:00
 default_executable: 
 dependencies: []