miniskirt 0.9.1 → 1.0.0

data/miniskirt.rb

@@ -1,4 +1,5 @@
-require "active_support"
+require 'active_support/inflector'
+require 'active_support/core_ext/hash'
 # Factory girl, relaxed.
 #
 #   Factory.define :user do |f|
@@ -11,38 +12,42 @@ require "active_support"
 #     f.user { Factory :user }                     # Blocks, if you must.
 #   end
 class Miniskirt < Struct.new(:__klass__)
-  undef_method *instance_methods.grep(/^(?!__|object_id)/) # BlankerSlate.
-  @@factories = {} and private_class_method :new
+  undef_method *instance_methods.grep(/^(?!__|object_id)/)
+  @@attrs = {} and private_class_method :new
 
   class << self
-    def define(name)
-      @@factories[name = name.to_s] = {} and yield new(name)
+    def define name, options = {}
+      @@attrs[name = name.to_s] = [{}, options] and yield new(name)
     end
 
-    def build(name, attrs = {})
-      (name, n = name.to_s) and (m = name.classify.constantize).new do |rec|
-        attrs.symbolize_keys!.reverse_update(@@factories[name]).each do |k, v|
-          rec.send "#{k}=", case v when String # Sequence and interpolate.
+    def build name, attrs = {}
+      (h, opts, n = @@attrs[name = name.to_s]) and klass = opts[:class] || name
+      p = opts[:parent] and (h, klass = @@attrs[p = p.to_s][0].merge(h), p)
+      (m = klass.is_a?(Class) ? klass : klass.classify.constantize).new do |r|
+        attrs.symbolize_keys!.reverse_update(h).each do |k, v|
+          r.send "#{k}=", case v when String # Sequence and interpolate.
             v.sub(/%\d*d/) {|d| d % n ||= m.maximum(:id).to_i + 1} % attrs % n
-          when Proc then v.call(rec) else v
+          when Proc then v.call(r) else v
           end
         end
       end
     end
 
-    def create(name, attrs = {})
+    def create name, attrs = {}
       build(name, attrs).tap { |record| record.save! }
     end
   end
 
-  def method_missing(name, value = nil, &block)
-    @@factories[__klass__][name] = block || value
+  def method_missing name, value = nil, &block
+    @@attrs[__klass__][0][name] = block || value
   end
 end
 
-def Miniskirt(name, attrs = {})
+def Miniskirt name, attrs = {}
   Miniskirt.create(name, attrs)
 end
 
-Factory = Miniskirt
-alias Factory Miniskirt
+unless Object.const_defined? :Factory
+  Factory = Miniskirt
+  alias Factory Miniskirt
+end

data/miniskirt_test.rb

@@ -1,11 +1,11 @@
-require 'miniskirt'
+require './miniskirt'
 require 'test/unit'
 
 class MiniskirtTest < Test::Unit::TestCase
   def test_should_define_factories
-    factories = Miniskirt.class_variable_get :@@factories
+    factories = Miniskirt.class_variable_get :@@attrs
     assert_not_nil factories["user"]
-    assert_not_nil factories["post"]
+    assert_not_nil factories["blog_entry"]
   end
 
   def test_should_build_object
@@ -60,13 +60,24 @@ class MiniskirtTest < Test::Unit::TestCase
   def test_should_sequence
     user1 = Factory.create :user
     user2 = Factory.create :user
-    assert_equal user1.login.succ, user2.login
+    assert_equal user1.login.sub(/\d+$/) { |n| n.to_i.succ.to_s }, user2.login
   end
 
   def test_should_interpolate
     user = Factory.create :user
     assert_equal user.email, "#{user.login}@example.com"
   end
+
+  def test_should_inherit
+    admin = Factory.create :admin
+    assert_equal 'admin', admin.login
+    assert_equal 'admin@example.com', admin.email
+  end
+
+  def test_should_alias
+    blog_entry = Factory.create :blog_entry
+    assert_equal 'admin', blog_entry.user.login
+  end
 end
 
 class Mock
@@ -79,7 +90,7 @@ class Mock
     yield self
   end
 
-  def save
+  def save!
     @@maximum = @@maximum.to_i + 1 unless @saved
     @saved = true
   end
@@ -97,12 +108,16 @@ class Post < Mock
   attr_accessor :user
 end
 
+Miniskirt.define :admin, :parent => :user do |f|
+  f.login "admin"
+end
+
 Miniskirt.define :user do |f|
   f.login "johndoe%d"
   f.email "%{login}@example.com"
   f.password f.password_confirmation("foobarbaz")
 end
 
-Miniskirt.define :post do |f|
-  f.user { Miniskirt :user }
+Miniskirt.define :blog_entry, :class => Post do |f|
+  f.user { Miniskirt :admin }
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: miniskirt
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Stephen Celis
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 -06:00
+date: 2011-01-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
         version: "2.2"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Test::Unit begot MiniTest; factory_girl begets Miniskirt.
 email: stephen@stephencelis.com
 executables: []
@@ -32,8 +41,9 @@ extra_rdoc_files: []
 
 files: 
 - miniskirt.rb
+- miniskirt_test.rb
 has_rdoc: true
-homepage: http://gist.github.com/273579
+homepage: http://github.com/stephencelis/miniskirt
 licenses: []
 
 post_install_message: 
@@ -42,21 +52,27 @@ rdoc_options: []
 require_paths: 
 - .
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: factory_girl, relaxed