dfl-factories-and-workers 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,7 +1,14 @@
+* [10/22/2008] - 0.1.3
+
+  FactoryBuilder was using #classify which also calls #singularize... now uses camelize instead.
+  Removed use of const_get in favor of #constantize
+  Removed use of method missing in factory_builder
+  Removed TestFactories module namespace from factories.rb.. back to mixing into Object
+
 * [10/15/2008] - 0.1.1 
 
   Fixed problems with ./script/generate migration and method missing
-  factories.rb now requires a TestFactories module namespace!
+  factories.rb now requires a TestFactories module namespace
 
 * [10/14/2008] - 0.1.0
   
@@ -9,6 +16,5 @@
     
 * [08/05/2008] - 0.0.1 (gem release)
   
-  Initial release as a gem.
-  
-  Removed some Rails specific code, but the gem is still dependent on activerecord.
+  Initial release as a gem.  
+  Removed some Rails specific code, but the gem is still dependent on ActiveRecord.

data/README.rdoc

@@ -34,11 +34,7 @@ It will be loaded during plugin initialization (see init.rb). You could also exp
 
 A minimal factories.rb file:
 
-module TestFactories   # NOTE: this module namespace is a new addition from v0.1.1 onwards
-  include FactoriesAndWorkers::Factory    # mixin to Object, which is especially useful for script/console work; season to taste.
-
   factory :user, :name => "default name"
-end
 
 This would define methods named +build_user+, +create_user+, and +valid_user_attributes+ to be available in any Object in the project.
 If you wanted to override the default valid attributes, you could call:

data/lib/factories-and-workers/factory_builder.rb

@@ -2,28 +2,16 @@ require 'digest/sha1'
 
 module FactoriesAndWorkers
 
-  module Factory
+  module Factory    
     def self.included( base )
-      base.extend ClassMethods          
-
-      # factory methods are defined as class methods; this delegation will allow them to also be called as instance methods
-      def method_missing method, *args, &block
-        if ClassMethods.method_defined?(method)
-          self.class.send method, *args, &block
-        else
-          super
-        end
-      end
 
-    end
-    
-    module ClassMethods
       def factory( kind, default_attrs, opts={}, &block )
         FactoryBuilder.new( kind, default_attrs, opts, self, &block )
       end
 
       # creates a random hex string, converts it to hexatridecimal, and truncates to desired length (max 30)
       def uniq len=10
+        raise ArgumentError, "Factory::uniq - length must be <= 30" if len > 30
         Digest::SHA1.hexdigest("#{rand(1<<64)}/#{Time.now.to_f}/#{Process.pid}").to_i(16).to_s(36)[1..len]
       end
 
@@ -36,21 +24,21 @@ module FactoriesAndWorkers
       def factory_initializers
         @@factory_initializers
       end
-    end
 
+    end
   end
 
   class FactoryBuilder
     def initialize( factory, default_attrs, opts, from_klass, &block )
       raise ArgumentError, ":chain must be a lambda block!" if opts[:chain] && !opts[:chain].is_a?( Proc )
       opts.reverse_merge!( :class => factory )
-      
-      ar_klass = ActiveRecord.const_get( opts[:class].to_s.classify )
+
+      ar_klass = opts[:class].to_s.camelize.constantize
       from_klass.factory_initializers[ factory ] = block if block_given?
 
       # make the valid attributes method      
       valid_attrs_method = :"valid_#{factory}_attributes"
-      Factory::ClassMethods.send :define_method, valid_attrs_method do |*args|
+      Factory.send :define_method, valid_attrs_method do |*args|
         action         = args.first.is_a?( TrueClass ) ? :create : :build
         attrs          = default_attrs.symbolize_keys
         attr_overrides = args.extract_options!
@@ -77,7 +65,7 @@ module FactoriesAndWorkers
 
       # make the valid attribute method, which only fetches a single attribute
       valid_attr_method  = :"valid_#{factory}_attribute"
-      Factory::ClassMethods.send :define_method, valid_attr_method do |arg|
+      Factory.send :define_method, valid_attr_method do |arg|
         return unless arg.is_a?( Symbol )
         base = default_attrs.dup
         base.reverse_merge!( opts[:chain].call ) if opts[:chain]
@@ -87,21 +75,21 @@ module FactoriesAndWorkers
       end
 
       # alias default_*_attributes to valid_*_attributes, for semantic equivalency
-      Factory::ClassMethods.send :alias_method, valid_attrs_method.to_s.gsub('valid','default').to_sym, valid_attrs_method
-      Factory::ClassMethods.send :alias_method,  valid_attr_method.to_s.gsub('valid','default').to_sym, valid_attr_method
+      Factory.send :alias_method, valid_attrs_method.to_s.gsub('valid','default').to_sym, valid_attrs_method
+      Factory.send :alias_method,  valid_attr_method.to_s.gsub('valid','default').to_sym, valid_attr_method
 
 
       after_initialize_block = from_klass.factory_initializers[ factory ]
 
       # make the create method
-      Factory::ClassMethods.send :define_method, :"create_#{factory}" do |*args|
+      Factory.send :define_method, :"create_#{factory}" do |*args|
         ar_klass.create!( self.send( valid_attrs_method, true, args.first ) ) do |obj|
           after_initialize_block.call( obj ) if after_initialize_block
         end
       end
 
       # make the build method
-      Factory::ClassMethods.send :define_method, :"build_#{factory}" do |*args|
+      Factory.send :define_method, :"build_#{factory}" do |*args|
         ar_klass.new( self.send( valid_attrs_method, false, args.first ) ) do |obj|
           after_initialize_block.call( obj ) if after_initialize_block
         end

data/lib/factories-and-workers/factory_worker.rb

@@ -5,6 +5,12 @@ module FactoriesAndWorkers
       FactoryWorker.find_and_work worker_name
     end
 
+    module ClassMethods
+      def factory_worker( worker, &block )
+        FactoryWorker.new( worker, &block )
+      end
+    end
+
     def self.included( base )
       base.extend ClassMethods
       # factory_worker methods are defined as class methods; this delegation will allow them to also be called as instance methods
@@ -17,12 +23,6 @@ module FactoriesAndWorkers
       end
     end
 
-    module ClassMethods
-      def factory_worker( worker, &block )
-        FactoryWorker.new( worker, &block )
-      end
-    end
-
   end
 
   class FactoryWorker

data/rails/init.rb

@@ -2,12 +2,12 @@ require 'fileutils'
 
 config.after_initialize do
 
-  if script_console_running = defined?(::IRB) && ::IRB.conf[:LOAD_MODULES] && ::IRB.conf[:LOAD_MODULES].include?('console_with_helpers')
-    # mixin to Object if we are running in ./script/console
+  # if script_console_running = defined?(::IRB) && ::IRB.conf[:LOAD_MODULES] && ::IRB.conf[:LOAD_MODULES].include?('console_with_helpers')
+  #   # mixin to Object if we are running in ./script/console
     obj = Object
-  else # otherwise just mix into Test::Unit to play it safe
-    obj = Test::Unit::TestCase
-  end
+  # else # otherwise just mix into Test::Unit to play it safe
+  #   obj = Test::Unit::TestCase
+  # end
 
   # mixin plugin
   obj.send :include, FactoriesAndWorkers::Factory

data/test/factories.rb

@@ -1,21 +1,19 @@
-# module TestFactories
-  include FactoriesAndWorkers::Factory
+include FactoriesAndWorkers::Factory
 
-  factory :monkey, {
-    :name    => "George",
-    :unique  => "$UNIQ(10)",
-    :counter => "$COUNT",
-    :number  => lambda{ increment! :foo }
-  }
+factory :monkey, {
+  :name    => "George",
+  :unique  => "$UNIQ(10)",
+  :counter => "$COUNT",
+  :number  => lambda{ increment! :foo }
+}
 
-  factory :pirate, {
-    :catchphrase => "Ahhrrrr, Matey!",
-    :monkey      => :belongs_to_model,
-    :created_on  => lambda{ 1.day.ago }
-  }
+factory :pirate, {
+  :catchphrase => "Ahhrrrr, Matey!",
+  :monkey      => :belongs_to_model,
+  :created_on  => lambda{ 1.day.ago }
+}
 
-  factory :ninja_pirate, {
-    :catchphrase => "(silent)"
-    }, :class => Pirate, :chain => lambda{ valid_pirate_attributes( :monkey => nil ) }
+factory :ninja_pirate, {
+  :catchphrase => "(silent)"
+  }, :class => Pirate, :chain => lambda{ valid_pirate_attributes( :monkey => nil ) }
 
-# end

data/test/factory_builder_test.rb

@@ -10,7 +10,7 @@ class FactoryBuilderTest < Test::Unit::TestCase
         factory :foo, {}
       end
     end
-    assert_equal "uninitialized constant ActiveRecord::Foo", e.message
+    assert_equal "uninitialized constant Foo", e.message
   end
 
   def test_factory_with_initializer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dfl-factories-and-workers
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Nathan Herald
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-16 00:00:00 -07:00
+date: 2008-10-22 00:00:00 -07:00
 default_executable: 
 dependencies: []