<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,51 +1,51 @@
 module Mack
   module Data
     module Factory
-      
+
       class FieldContentGenerator
         class &lt;&lt; self
           def alpha_generator
-            @alpha_gen ||= Proc.new do |def_value, rules|
+            @alpha_gen = Proc.new do |def_value, rules|
               words = %w(alias consequatur aut perferendis sit voluptatem accusantium doloremque aperiam eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo aspernatur aut odit aut fugit sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt neque dolorem ipsum quia dolor sit amet consectetur adipisci velit sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem ut enim ad minima veniam quis nostrum exercitationem ullam corporis nemo enim ipsam voluptatem quia voluptas sit suscipit laboriosam nisi ut aliquid ex ea commodi consequatur quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae et iusto odio dignissimos ducimus qui blanditiis praesentium laudantium totam rem voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident sed ut perspiciatis unde omnis iste natus error similique sunt in culpa qui officia deserunt mollitia animi id est laborum et dolorum fuga et harum quidem rerum facilis est et expedita distinctio nam libero tempore cum soluta nobis est eligendi optio cumque nihil impedit quo porro quisquam est qui minus id quod maxime placeat facere possimus omnis voluptas assumenda est omnis dolor repellendus temporibus autem quibusdam et aut consequatur vel illum qui dolorem eum fugiat quo voluptas nulla pariatur at vero eos et accusamus officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae itaque earum rerum hic tenetur a sapiente delectus ut aut reiciendis voluptatibus maiores doloribus asperiores repellat)
-              
+
               length = 128
               min_length = -1
               max_length = -1
-              
+
               if rules[:min_length]
                 min_length = rules[:min_length].to_i
               end
-              
+
               if rules[:max_length]
                 max_length = rules[:max_length].to_i
               end
-              
+
               if rules[:length]
                 length = rules[:length].to_i
                 length = max_length if (max_length != -1) and (max_length &lt;= length)
               end
-              
+
               ret_val = &quot;&quot;
               words_size = words.size
               until ret_val.size &gt; length do
                 i = (rand * 100).to_i
                 i = words_size if (i-1) &gt; words_size
-                
+
                 ret_val += words[i]
                 ret_val += &quot; &quot; if rules[:add_space]
               end
 
               ret_val.strip!
-              
+
               ret_val = ret_val[0, length] if ret_val.size &gt; length
-              
+
               ret_val
             end
             return @alpha_gen
           end
 
           def alpha_numeric_generator
-            @alpha_numeric_gen ||= Proc.new do |def_value, rules|
+            @alpha_numeric_gen = Proc.new do |def_value, rules|
               words = %w(alias consequatur aut perferendis sit voluptatem accusantium doloremque aperiam eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo aspernatur aut odit aut fugit sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt neque dolorem ipsum quia dolor sit amet consectetur adipisci velit sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem ut enim ad minima veniam quis nostrum exercitationem ullam corporis nemo enim ipsam voluptatem quia voluptas sit suscipit laboriosam nisi ut aliquid ex ea commodi consequatur quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae et iusto odio dignissimos ducimus qui blanditiis praesentium laudantium totam rem voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident sed ut perspiciatis unde omnis iste natus error similique sunt in culpa qui officia deserunt mollitia animi id est laborum et dolorum fuga et harum quidem rerum facilis est et expedita distinctio nam libero tempore cum soluta nobis est eligendi optio cumque nihil impedit quo porro quisquam est qui minus id quod maxime placeat facere possimus omnis voluptas assumenda est omnis dolor repellendus temporibus autem quibusdam et aut consequatur vel illum qui dolorem eum fugiat quo voluptas nulla pariatur at vero eos et accusamus officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae itaque earum rerum hic tenetur a sapiente delectus ut aut reiciendis voluptatibus maiores doloribus asperiores repellat)
 
               length = 128
@@ -85,81 +85,81 @@ module Mack
           end
 
           def numeric_generator
-            @numeric_gen ||= Proc.new do |def_value, rules|
+            @numeric_gen = Proc.new do |def_value, rules|
               n_start = rules[:start_num] || 0
               n_end   = rules[:end_num] || 1000
-              
+
               val = (n_start..n_end).to_a.randomize[0]
-              (def_value + val)
+              val
             end
             return @numeric_gen
           end
 
           def date_generator
-            @date_gen ||= Proc.new do |def_value, rules|
+            @date_gen = Proc.new do |def_value, rules|
               Time.now.to_s
             end
             return @date_gen
           end
 
           def date_time_generator
-            @date_time_gen ||= Proc.new do |def_value, rules|
+            @date_time_gen = Proc.new do |def_value, rules|
               Time.now.to_s
             end
             return @date_time_gen
           end
-          
+
           def email_generator
-            @email_gen ||= Proc.new do |def_value, rules|
+            @email_gen = Proc.new do |def_value, rules|
               Faker::Internet.free_email
             end
             return @email_gen
           end
-          
+
           def firstname_generator
-            @fn_gen ||= Proc.new do |def_value, rules|
+            @fn_gen = Proc.new do |def_value, rules|
               Faker::Name.first_name
             end
             return @fn_gen
           end
-          
+
           def lastname_generator
-            @ln_gen ||= Proc.new |def_value, rules|
+            @ln_gen = Proc.new do |def_value, rules|
               Faker::Name.last_name
             end
             return @ln_gen
-          end       
-          
-          def name_generator
-            @name_gen ||= Proc.new |def_value, rules|
-              Faker::Name.name
-            end
-            return @name_gen
           end
-          
+
           def phone_generator
-            @phone_gen ||= Proc.new |def_value, rules|
+            @phone_gen = Proc.new do |def_value, rules|
               Faker::PhoneNumber.phone_number
             end
             return @phone_gen
           end
-          
+
           def company_generator
-            @company_gen ||= Proc.new |def_value, rules|
+            @company_gen = Proc.new do |def_value, rules|
               str = Faker::Company.name
-              
+
               if rules[:include_bs]
                 str += &quot;\n#{Faker::Company.bs}&quot;
               end
-              
+
               str
             end
             return @company_gen
           end
-          
+
+          def name_generator
+            @name_gen = Proc.new do |def_value, rules|
+              Faker::Name.name
+            end
+            return @name_gen
+          end
+
         end
       end
-
     end
+
   end
 end
\ No newline at end of file</diff>
      <filename>mack-data_factory/lib/mack-data_factory/content_generator.rb</filename>
    </modified>
    <modified>
      <diff>@@ -12,7 +12,7 @@ module Mack
         def create(num, scope = :default)
           factory_name = self.name.underscore
           model_name = factory_name.gsub('_factory', '')
-          puts &quot;creating #{num} instances of #{model_name.camelcase}&quot;
+          #puts &quot;creating #{num} instances of #{model_name.camelcase}&quot;
           
           scoped_fields = field_manager.scopes[scope]
           fields = field_manager.scopes[:default].merge(scoped_fields)</diff>
      <filename>mack-data_factory/lib/mack-data_factory/data_factory.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,19 +1,20 @@
 module Mack
   module Data
+    
     class Field
       attr_accessor :field_name
       attr_accessor :field_value
       attr_accessor :field_value_producer
       attr_accessor :field_rules
-      
+
       def initialize(hash = {})
-        puts &quot;Inititalizing DataFactory's Field object:&quot;
+        #puts &quot;Inititalizing DataFactory's Field object:&quot;
         
         hash.each_pair do |k, v|
-          puts &quot;--&gt; Setting #{v} to #{k}&quot;
+          #puts &quot;--&gt; Setting #{v} to #{k}&quot;
           self.send(&quot;#{k}=&quot;, v)
         end
-        
+                
         self.field_rules = {
           :immutable =&gt; false,
           :length =&gt; 256,</diff>
      <filename>mack-data_factory/lib/mack-data_factory/field.rb</filename>
    </modified>
    <modified>
      <diff>@@ -35,7 +35,6 @@ module Mack
       attr_accessor :lastname
 
       def save
-        puts &quot;Saving user&quot;
         Database.instance.add(self)
       end
 
@@ -138,26 +137,26 @@ describe &quot;DataFactory&quot; do
 
   describe &quot;Module&quot; do
     before(:each) do
-      @factory = Mack::FactoryTest::UserFactory
+      @user_factory = Mack::FactoryTest::UserFactory
     end
 
     it &quot;should add create class_method to the factory object&quot; do
-      @factory.respond_to?(:create).should == true
+      @user_factory.respond_to?(:create).should == true
     end
 
     it &quot;should add field class_method to the factory object&quot; do
-      @factory.respond_to?(:field).should == true
+      @user_factory.respond_to?(:field).should == true
     end
 
     it &quot;should add scope_for class_method to the factory object&quot; do
-      @factory.respond_to?(:scope_for).should == true
+      @user_factory.respond_to?(:scope_for).should == true
     end
   end
 
   describe &quot;Core Extension&quot; do
 
     before(:each) do
-      @factory = Mack::FactoryTest::UserFactory
+      @user_factory = Mack::FactoryTest::UserFactory
       @map = Mack::Data::FactoryRegistryMap
       @db  = Mack::FactoryTest::Database.instance
 
@@ -173,8 +172,8 @@ describe &quot;DataFactory&quot; do
       @map.registered_items[:hello].should be_nil
 
       proc = Proc.new do
-        Mack::FactoryTest::UserFactory.create(1)
-        Mack::FactoryTest::UserFactory.create(1, :diff_firstname)
+        @user_factory.create(1)
+        @user_factory.create(1, :diff_firstname)
       end
 
       factories(:hello, &amp;proc)
@@ -188,8 +187,8 @@ describe &quot;DataFactory&quot; do
       @db.should be_empty
 
       proc = Proc.new do
-        Mack::FactoryTest::UserFactory.create(1)
-        Mack::FactoryTest::UserFactory.create(1, :diff_firstname)
+        @user_factory.create(1)
+        @user_factory.create(1, :diff_firstname)
       end
 
       factories(:hello, &amp;proc)
@@ -203,7 +202,8 @@ describe &quot;DataFactory&quot; do
 
   describe &quot;Creation&quot; do
     before(:each) do
-      @factory = Mack::FactoryTest::UserFactory
+      @user_factory = Mack::FactoryTest::UserFactory
+      @item_factory = Mack::FactoryTest::ItemFactory
       @db  = Mack::FactoryTest::Database.instance
       @db.reset!
     end
@@ -213,8 +213,8 @@ describe &quot;DataFactory&quot; do
     end
 
     it &quot;should generate correct relationship if relationship rule is provided&quot; do
-      Mack::FactoryTest::UserFactory.create(10)
-      Mack::FactoryTest::ItemFactory.create(1)
+      @user_factory.create(10)
+      @item_factory.create(1)
       
       check = false
       item = @db.list.last
@@ -229,7 +229,7 @@ describe &quot;DataFactory&quot; do
     it &quot;should generate x number of instances with no random data if immutable flag is set&quot; do
       @db.should be_empty
 
-      Mack::FactoryTest::UserFactory.create(1)
+      @user_factory.create(1)
 
       @db.list.size.should == 1
       user = @db.list[0]
@@ -244,7 +244,7 @@ describe &quot;DataFactory&quot; do
     it &quot;should generate x number of scoped instances properly&quot; do
       @db.should be_empty
 
-      Mack::FactoryTest::UserFactory.create(1, :diff_firstname)
+      @user_factory.create(1, :diff_firstname)
 
       @db.list.size.should == 1
       user = @db.list[0]
@@ -257,7 +257,7 @@ describe &quot;DataFactory&quot; do
 
     describe &quot;using default generator&quot; do
       before(:each) do
-        @factory = Mack::FactoryTest::UserFactory
+        @user_factory = Mack::FactoryTest::UserFactory
         @db  = Mack::FactoryTest::Database.instance
         @db.reset!
       end
@@ -269,14 +269,14 @@ describe &quot;DataFactory&quot; do
       it &quot;should honor the add_space flag, length, and content type&quot; do
         @db.should be_empty
 
-        Mack::FactoryTest::UserFactory.create(1, :alpha_with_space)
+        @user_factory.create(1, :alpha_with_space)
         user = @db.list[0]
         user.firstname.size.should == 128     # 128 bytes of string
         user.firstname.should_not match(/\d/) # alphabet only
         user.firstname.should match(/ /)      # add_space = true
 
         @db.reset!
-        Mack::FactoryTest::UserFactory.create(1, :alpha_without_space)
+        @user_factory.create(1, :alpha_without_space)
         user = @db.list[0]
         user.firstname.size.should == 128     # 128 bytes of string
         user.firstname.should_not match(/\d/) # alphabet only
@@ -286,7 +286,7 @@ describe &quot;DataFactory&quot; do
       it &quot;should generate numeric type&quot; do
         @db.should be_empty
 
-        Mack::FactoryTest::UserFactory.create(1, :numeric_type)
+        @user_factory.create(1, :numeric_type)
         user = @db.list[0]
         user.id.is_a?(Fixnum).should == true
         num = user.id
@@ -297,7 +297,7 @@ describe &quot;DataFactory&quot; do
       it &quot;should generate alpha_numeric type&quot; do
         @db.should be_empty
 
-        Mack::FactoryTest::UserFactory.create(1, :alpha_numeric_with_space)
+        @user_factory.create(1, :alpha_numeric_with_space)
         user = @db.list[0]
         user.firstname.size.should == 128
         user.firstname.should match(/\d/)
@@ -305,7 +305,7 @@ describe &quot;DataFactory&quot; do
         user.firstname.should match(/[a-z]/)
 
         @db.reset!
-        Mack::FactoryTest::UserFactory.create(1, :alpha_numeric_without_space)
+        @user_factory.create(1, :alpha_numeric_without_space)
         user = @db.list[0]
         user.firstname.size.should == 128
         user.firstname.should match(/\d/)
@@ -318,7 +318,7 @@ describe &quot;DataFactory&quot; do
     it &quot;should generate correct instance with custom content generator if provided&quot; do
       @db.should be_empty
 
-      Mack::FactoryTest::UserFactory.create(1, :custom_string_generator)
+      @user_factory.create(1, :custom_string_generator)
       user = @db.list[0]
       user.firstname.should == &quot;Darsono Sutedja&quot;
     end</diff>
      <filename>mack-data_factory/spec/lib/data_factory_spec.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>1b8a764b6dd43e7a89e6e9157ae2ba135d99f683</id>
    </parent>
  </parents>
  <author>
    <name>dsutedja</name>
    <email>dsutedja@helium.com</email>
  </author>
  <url>http://github.com/markbates/mack-more/commit/13fd05b1694d921fb72e75647e91bf5e2606a5e0</url>
  <id>13fd05b1694d921fb72e75647e91bf5e2606a5e0</id>
  <committed-date>2008-07-29T10:59:52-07:00</committed-date>
  <authored-date>2008-07-29T10:59:52-07:00</authored-date>
  <message>more data_factory stuff</message>
  <tree>8e1ee7e12a6e5f89473b671ac608e51b92123a38</tree>
  <committer>
    <name>dsutedja</name>
    <email>dsutedja@helium.com</email>
  </committer>
</commit>
