modelfactory 0.9.1 → 0.9.2

data/History.txt

@@ -1,23 +1,34 @@
+== 0.9.2 2009-08-10
+
+* Fall back on parent class factory definitions.
+
 == 0.9.1 2009-06-04
+
 * Error was being raised when nil is passed to create, fixed.
 * Corrected API documentation in README.txt.
 
 == 0.9.0 2009-06-04
+
 * More API changes
 * Built-in counters for generating values
 
 == 0.8.9 2009-05-19
+
 * Renamed the required lib to 'modelfactory'
 * Completely redesigned API, see the documentation in README.txt
 
 == 0.8.1 2009-05-08
+
 * Ruby 1.9.1 compatibility
 
 == 0.8.0 2008-12-10
+
 * added the ability to specify multiple named types of defaults
 
 == 0.7.0 2008-11-11
+
 * Documentation and rubygem
 
 == 0.0.1 2008-01-25
+
 * Initial release

data/Manifest.txt

@@ -3,14 +3,12 @@ License.txt
 Manifest.txt
 README.txt
 Rakefile
-lib/fixture_converter.rb
 lib/model_factory.rb
 lib/modelfactory.rb
 lib/modelfactory/factory.rb
 lib/modelfactory/legacy.rb
 lib/modelfactory/version.rb
 script/destroy
-script/fixtures2factories
 script/generate
 script/txt2html
 setup.rb

data/README.txt

@@ -26,7 +26,7 @@ opaque ActiveRecord objects whose contents are unimportant.
 
  ModelFactory[User].create.name  # => 'Factory User'
 
-Defaults can be overriden on instance creation. By not specifying unimportant
+Defaults can be overridden on instance creation. By not specifying unimportant
 values, the intention of your tests becomes clearer:
 
  def test_welcome

data/Rakefile

@@ -1,10 +1,11 @@
+$:.unshift(File.dirname(__FILE__) + '/lib')
 require 'rubygems'
 require 'hoe'
 require 'hanna/rdoctask'
-$:.unshift(File.dirname(__FILE__) + "/lib")
 require 'modelfactory/version'
 
-Hoe.new('ModelFactory', ModelFactory::VERSION::STRING) do |p|
+Hoe.spec('ModelFactory') do |p|
+  p.version = ModelFactory::VERSION::STRING
   p.name = "modelfactory"
   p.author = ['Justin Balthrop', 'Zack Hobson']
   p.description = "A replacement for fixtures."
@@ -22,4 +23,3 @@ Hoe.new('ModelFactory', ModelFactory::VERSION::STRING) do |p|
   ]
 end
 
-

data/lib/modelfactory.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'active_record'
 require File.dirname(__FILE__) + '/modelfactory/factory'
 require File.dirname(__FILE__) + '/modelfactory/legacy'
@@ -39,7 +38,12 @@ module ModelFactory
 
     # Wraps a given class in a configured Factory instance.
     def wrap(klass)
-      @factory[klass] ||= Factory.new(klass, @config.class_opts[klass])
+      # We might have a definition for a parent class. If so, use that.
+      target = klass
+      while target && !@config.class_opts.key?(target)
+        target = target.superclass
+      end
+      @factory[klass] ||= Factory.new(klass, @config.class_opts[target])
     end
   end
 
@@ -57,5 +61,16 @@ module ModelFactory
       @class_opts[klass] ||= {}
       @class_opts[klass][method] = block
     end
+
+    # Route common method names to method_missing.
+    # XXX There must be a better way to do this, assuming we should be doing
+    # this at all. BasicObject doesn't work because I lose instance_eval.
+    [ :inspect, :send, :id, :object_id ].each do |meth|
+      eval %{
+        def #{meth}(*args, &block)
+          method_missing(:#{meth}, *args, &block)
+        end
+      }
+    end
   end
 end

data/lib/modelfactory/factory.rb

@@ -42,8 +42,8 @@ module ModelFactory # :nodoc:
 
     def create_named(name, opt, &block)
       instance = new_named(name, opt, &block)
-      instance.save!
-      instance.reload
+      instance.save!  if instance.respond_to? :save!
+      instance.reload if instance.respond_to? :reload
       instance
     end
 

data/lib/modelfactory/version.rb

@@ -2,7 +2,7 @@ module ModelFactory #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/fixtures/schema.rb

@@ -4,6 +4,7 @@ ActiveRecord::Schema.define do
     t.decimal  "price"
     t.string   "type"
     t.integer  "category_id"
+    t.string   "puts"
   end
 
   create_table "categories", :force => true do |t|

data/test/modelfactory_test.rb

@@ -18,7 +18,34 @@ class ModelFactoryTest < Test::Unit::TestCase
   should "not raise on nil params" do
     assert_nothing_raised { Widget.factory.create(nil) }
   end
-  
+
+  should "permit use of overloaded names in configs" do
+   assert_nothing_raised do
+     ModelFactory.configure do
+       inspect(Widget) { name {'foobaz' } }
+       self.puts(Widget) { name {'fooboo' } }
+     end
+   end
+   assert_equal Widget.factory.create_inspect.name, 'foobaz'
+   assert_equal Widget.factory.create_puts.name, 'fooboo'
+  end
+
+  should "permit use of overloaded names in fields" do
+   assert_nothing_raised do
+     ModelFactory.configure do
+       default(Widget) { self.puts {'shazbot' } }
+     end
+   end
+   assert_equal Widget.factory.create.puts, 'shazbot'
+  end
+
+  should "use parent class options" do
+   ModelFactory.configure do
+     default(Widget) { name { 'shazbot' } }
+   end
+   assert_equal AnotherWidget.factory.create.name, 'shazbot'
+  end
+
   context "with a specified default" do
     setup do
       ModelFactory.configure do

data/test/non_orm_test.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/../lib/modelfactory'
+
+class ModelFactoryTest < Test::Unit::TestCase
+  foo = Struct.new('Foo', :name)
+
+  context "configured for a non-relational type" do
+    setup do
+      ModelFactory.configure do
+        default(foo) { name { 'wubbo' } }
+      end
+    end
+  
+    should "apply config to a created instance" do
+      assert_equal 'wubbo', ModelFactory[foo].create.name
+    end
+
+    should "apply config to a new instance" do
+      assert_equal 'wubbo', ModelFactory[foo].new.name
+    end
+  end
+end
+

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
 require 'test/unit'
 require 'rubygems'
 require 'mocha'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: modelfactory
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-04 00:00:00 -07:00
+date: 2009-08-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,7 +81,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.2
+        version: 2.3.1
     version: 
 description: A replacement for fixtures.
 email: justin@geni.com
@@ -100,14 +100,12 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- lib/fixture_converter.rb
 - lib/model_factory.rb
 - lib/modelfactory.rb
 - lib/modelfactory/factory.rb
 - lib/modelfactory/legacy.rb
 - lib/modelfactory/version.rb
 - script/destroy
-- script/fixtures2factories
 - script/generate
 - script/txt2html
 - setup.rb
@@ -152,5 +150,6 @@ test_files:
 - test/counter_test.rb
 - test/modelfactory_test.rb
 - test/relation_test.rb
+- test/non_orm_test.rb
 - test/legacy_test.rb
 - test/named_test.rb

data/lib/fixture_converter.rb

@@ -1,97 +0,0 @@
-class FixtureConverter # :nodoc:
-  def initialize(opts = {})
-    @body   = []
-    @header = []
-    @indent_depth = opts[:indent_depth] || 0
-    @output_style = opts[:output_style]
-  end
-  
-  def powder?
-    @output_style == :clay
-  end
-  
-  def convert_fixture(path)
-    fixture = YAML.load_file(path)
-    return if not fixture
-
-    plural_model_name = path.basename.to_s.split('.').first
-    model_name        = plural_model_name.singularize
-    header do
-      "#{plural_model_name} = {}"
-    end
-
-    body 'before(:all) do' if powder?
-    indent(powder?) do
-      body "# Setup #{plural_model_name}"
-      body "# Generated from fixture in #{path.dirname.basename}/#{path.basename}"
-      body '#'
-      body ''
-      fixture.each do |name, record|
-        max_length = record.keys.collect {|key| key.length}.max
-      
-        body "#{plural_model_name}[:#{name}] = Factory.create_#{model_name}("
-        indent do
-          body do
-            record.collect do |key,value|
-              value = "\"#{value}\"" if value.kind_of?(String)
-              key   = key.ljust(max_length)
-              ":#{key} => #{value}"
-            end
-          end
-        end
-        body ')'
-      end
-    end
-    body 'end' if powder?
-    body ''
-  end
-
-  def convert_scenario(path)
-    path.each_entry do |file|
-      next if file.extname != '.yml'
-      next if file.basename.to_s =~ /relationships/
-      convert_fixture( path + file )
-    end
-  end
-
-  def out
-    puts @header.join("\n")
-    puts "\n"
-    puts @body.join("\n")
-  end
-
-private
-  INDENT = '  '
-
-  def indent(enabled = true)
-    @indent_depth += 1 if enabled
-    yield
-    @indent_depth -= 1 if enabled
-  end
-
-  def body(*lines)
-    lines = yield if block_given?
-    lines = [lines].flatten
-    
-    lines.each do |line|
-      @body << indent_line(line, @indent_depth)
-    end
-  end
-
-  def header(*lines)
-    lines = yield if block_given?
-    lines = [lines].flatten
-    
-    lines.each do |line|
-      @header << line
-    end
-  end
-  
-  def indent_line(line, indent_depth)
-    ws = ''
-    indent_depth.times do
-      ws += INDENT
-    end
-    ws + line
-  end
-end

data/script/fixtures2factories

@@ -1,18 +0,0 @@
-#!/usr/bin/ruby
-require 'rubygems'
-require 'active_support'
-require 'pp'
-require 'pathname'
-require 'yaml'
-require File.dirname(__FILE__) + '/../lib/fixture_converter'
-
-path = Pathname.new(ARGV[0])
-
-fc = FixtureConverter.new
-if path.file?
-  fc.convert_fixture(path)
-else
-  fc.convert_scenario(path)
-end
-fc.out
-