minifacture 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8cf0b4bc7f9136c12fd1d1d3e246522b841ce90
-  data.tar.gz: 7528cb84a0828ca7a45769fa1a499dcf6fceb060
+  metadata.gz: 827bc343ae326748c408044a36f99b0f9ac16d4e
+  data.tar.gz: 5bf92242ed3d369d125a36d5f89b53f7c1a03c43
 SHA512:
-  metadata.gz: 6034327a1c3291fd72715b66949a2a7b72db6a261e613706b5b66d7759c3a6147272d1856e5608ecba8efe5b1af0d164b2ee5c1e9fd3ee3c3e4ade7439bd6419
-  data.tar.gz: d2b9355f7f769e8276dba00a441c2d834ff8b4fa9db8fe86be9f8c5d5f690e7bbe4fdc95c785bba2a1f091de0f9bf9849ebb72e70b6852bbeaf64788e69fe1f2
+  metadata.gz: a065832618175d374c6be09070639c97652afd1a5bc0d92ed6a7c89be670577af097099c047958debdec401f16974fe670598bf85192a71cb409e4b4f3f7556b
+  data.tar.gz: 889afe00efa9725ed6efbf867996ebd83a35e2a5b2c26ebbc32fc21a3c8872a53c93ca248ceeeebe0c41e1af8d7f59d4e54492c4b32552e041166e58c9eb5727

data/minifacture.rb

@@ -13,7 +13,7 @@ require 'active_support/core_ext/hash'
 #   end
 class Minifacture < Struct.new(:__klass__)
   undef_method *instance_methods.grep(/^(?!__|object_id)/)
-  @@attrs = {} and private_class_method :new
+  @@attrs = {} and @@counts = Hash.new(0) and private_class_method :new
 
   class << self
     def define name, options = {}
@@ -24,11 +24,10 @@ class Minifacture < Struct.new(:__klass__)
       (h, opts, n = @@attrs[name = name.to_s]) and m = opts[:class] || name
       p = opts[:parent] and (h, m = @@attrs[p = p.to_s][0].merge(h), p)
       (m = m.is_a?(Class) ? m : m.to_s.camelize.constantize).new.tap do |r|
+        c = @@counts[p || name] += 1
         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.respond_to?(:maximum) ? m.maximum(:id) : m.max(:id)
-            ).to_i + 1} % attrs % n
+            v.sub(/%\d*d/) { |d| d % n ||= c } % attrs % n
           when Proc then v.call(r) else v
           end
         end

data/minifacture_test.rb

@@ -1,11 +1,11 @@
 require './minifacture'
-require 'test/unit'
+require 'minitest/autorun'
 
-class MinifactureTest < Test::Unit::TestCase
+class MinifactureTest < Minitest::Test
   def test_should_define_factories
     factories = Minifacture.class_variable_get :@@attrs
-    assert_not_nil factories["user"]
-    assert_not_nil factories["blog_entry"]
+    refute_nil factories["user"]
+    refute_nil factories["blog_entry"]
   end
 
   def test_should_build_object
@@ -27,10 +27,10 @@ class MinifactureTest < Test::Unit::TestCase
 
   def test_should_assign_attributes
     user = Factory.create :user
-    assert_not_nil user.login
-    assert_not_nil user.email
-    assert_not_nil user.password
-    assert_not_nil user.password_confirmation
+    refute_nil user.login
+    refute_nil user.email
+    refute_nil user.password
+    refute_nil user.password_confirmation
   end
 
   def test_should_chain_attributes
@@ -51,10 +51,10 @@ class MinifactureTest < Test::Unit::TestCase
 
     user = Factory.create :user
 
-    assert_not_equal login, user.login
-    assert_not_equal email, user.email
-    assert_not_equal password, user.password
-    assert_not_equal password_confirmation, user.password_confirmation
+    refute_equal login, user.login
+    refute_equal email, user.email
+    refute_equal password, user.password
+    refute_equal password_confirmation, user.password_confirmation
   end
 
   def test_should_sequence
@@ -63,6 +63,13 @@ class MinifactureTest < Test::Unit::TestCase
     assert_equal user1.login.sub(/\d+$/) { |n| n.to_i.succ.to_s }, user2.login
   end
 
+  def test_should_sequence_with_parent
+    user  = Factory.create :user
+    admin = Factory.create :admin
+    assert_equal user.login, 'johndoe1'
+    assert_equal admin.login, 'admin2'
+  end
+
   def test_should_interpolate
     user = Factory.create :user
     assert_equal user.email, "#{user.login}@example.com"
@@ -70,36 +77,28 @@ class MinifactureTest < Test::Unit::TestCase
 
   def test_should_inherit
     admin = Factory.create :admin
-    assert_equal 'admin', admin.login
-    assert_equal 'admin@example.com', admin.email
+    assert_equal 'admin1', admin.login
+    assert_equal 'admin1@example.com', admin.email
   end
 
   def test_should_alias
     blog_entry = Factory.create :blog_entry
-    assert_equal 'admin', blog_entry.user.login
+    assert_equal 'admin1', blog_entry.user.login
   end
 
   def test_should_accept_class_as_symbol
-    assert_nothing_raised do
-      guest = Factory.create :guest
-    end
-  end
-end
-
-class Mock
-  @@maximum = nil
-  def self.maximum(column)
-    @@maximum
+    guest = Factory.create :guest
   end
 
-  def save!
-    @@maximum = @@maximum.to_i + 1 unless @saved
-    @saved = true
+  def teardown
+    counts = Minifacture.class_variable_get(:@@counts)
+    counts.each { |k,_| counts[k] = 0 }
   end
+end
 
-  def new_record?
-    !@saved
-  end
+class Mock
+  def save!() @saved = true end
+  def new_record?() !@saved end
 end
 
 class User < Mock
@@ -111,7 +110,7 @@ class Post < Mock
 end
 
 Minifacture.define :admin, :parent => :user do |f|
-  f.login "admin"
+  f.login "admin%d"
 end
 
 Minifacture.define :user do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minifacture
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Stephen Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -92,9 +92,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: factory_girl for minitest.
 test_files:
 - minifacture_test.rb
+has_rdoc: false