modelizer 1.2.0 → 1.3.0

data/.autotest

@@ -0,0 +1,5 @@
+require "autotest/restart"
+
+Autotest.add_hook :initialize do |at|
+  at.testlib = "minitest/autorun"
+end

data/CHANGELOG.rdoc

@@ -1,15 +1,21 @@
-=== 1.2.0 (2009-03-17)
+=== 1.3.0 / 2009-07-10
+
+* Switch to modern Hoe.
+* Support default values when testing presence validations.
+* Require explicit 'include Modelizer', don't be fancy with Rails init.
+
+=== 1.2.0 / 2009-03-17
 
 * Added a simple stab at some validation tests.
 
-=== 1.1.1 (2009-03-16)
+=== 1.1.1 / 2009-03-16
 
 * Fixed <tt>assert_invalid</tt>'s misleading message.
 
-=== 1.1.0 (2009-03-04)
+=== 1.1.0 / 2009-03-04
 
 * Added <tt>assert_invalid</tt>.
 
-=== 1.0.0 (2009-02-24)
+=== 1.0.0 / 2009-02-24
 
 * Birthday!

data/Manifest.txt

@@ -1,3 +1,4 @@
+.autotest
 CHANGELOG.rdoc
 Manifest.txt
 README.rdoc
@@ -5,6 +6,5 @@ Rakefile
 lib/modelizer.rb
 lib/modelizer/assertions.rb
 lib/modelizer/validations.rb
-rails/init.rb
-test/modelizer/assertions_test.rb
-test/modelizer_test.rb
+test/test_assertions.rb
+test/test_modelizer.rb

data/README.rdoc

@@ -1,14 +1,24 @@
 = Modelizer
 
+* http://github.com/jbarnette/modelizer
+
+== Description
+
 Need a simple, consistent way to create model instances and check
 validations in your Rails tests? Use the Modelizer.
 
 == Examples
 
-First, define a model template. I generally do this in the unit test
+First, enable the Modelizer. I do it in <tt>test/test_helper.rb</tt>:
+
+    class ActiveSupport::TestCase
+      include Modelizer
+    end
+
+Next, define a model template. I generally do this in the unit test
 for the model until I need to use the template somewhere else. As soon
 as it's used in multiple places, I move it to a reopened
-<tt>Test::Unit::TestCase</tt> in <tt>test/test_helper.rb</tt>.
+<tt>ActiveSupport::TestCase</tt> in <tt>test/test_helper.rb</tt>.
 
     class UserTest < ActiveSupport::TestCase
 
@@ -24,14 +34,14 @@ as it's used in multiple places, I move it to a reopened
 
 This declaration generates a bunch of instance methods for you:
 
-* def valid_user_attributes(extras = {})
-* def valid_user_attributes_without(*excluded)
-* def new_user(extras = {})
-* def new_user_without(*excluded)
-* def create_user(extras = {})
-* def create_user!(extras = {})
-* def create_user_without(*excluded)
-* def create_user_without!(*excluded)
+* <tt>def valid_user_attributes(extras = {})</tt>
+* <tt>def valid_user_attributes_without(*excluded)</tt>
+* <tt>def new_user(extras = {})</tt>
+* <tt>def new_user_without(*excluded)</tt>
+* <tt>def create_user(extras = {})</tt>
+* <tt>def create_user!(extras = {})</tt>
+* <tt>def create_user_without(*excluded)</tt>
+* <tt>def create_user_without!(*excluded)</tt>
 
 It also generates a test to make sure your model template is valid.
 
@@ -39,7 +49,7 @@ It also generates a test to make sure your model template is valid.
 
 Modelizer adds one additional assertion, <tt>assert_invalid</tt>.
 
-    assert_invalid(:email, model, /is bad/)
+    assert_invalid :email, model, /is bad/
 
 The third argument is optional.
 

data/Rakefile

@@ -1,14 +1,13 @@
 require "rubygems"
 require "hoe"
 
-Hoe.new "modelizer", "1.2.0" do |p|
-  p.developer "John Barnette", "jbarnette@rubyforge.org"
+Hoe.plugin :doofus, :git
 
-  p.url              = "http://github.com/jbarnette/modelizer"
-  p.history_file     = "CHANGELOG.rdoc"
-  p.readme_file      = "README.rdoc"
-  p.extra_rdoc_files = [p.readme_file]
-  p.need_tar         = false
-  p.test_globs       = %w(test/**/*_test.rb)
-  p.testlib          = :minitest
+Hoe.spec "modelizer" do
+  developer "John Barnette", "jbarnette@rubyforge.org"
+
+  self.extra_rdoc_files = FileList["*.rdoc"]
+  self.history_file     = "CHANGELOG.rdoc"
+  self.readme_file      = "README.rdoc"
+  self.testlib          = :minitest
 end

data/lib/modelizer.rb

@@ -1,9 +1,21 @@
+require "activesupport"
+
+require "modelizer/assertions"
+require "modelizer/validations"
+
 module Modelizer
+
+  # Duh.
+  VERSION = "1.3.0"
+
+  include Modelizer::Assertions
+
   @@cache = {}
   def self.cache; @@cache end
 
   def self.included target
     target.extend ClassMethods
+    target.extend Modelizer::Validations
   end
 
   def assign_model_template_attributes model, attributes
@@ -26,7 +38,7 @@ module Modelizer
   module ClassMethods
     def model_template_for klass, defaults = {}, &block
       if defaults.empty? && !block
-        raise "default attributes or lazy block required"
+        raise ArgumentError, "default attributes or lazy block required"
       end
 
       ::Modelizer.cache[klass] = [defaults, block]
@@ -78,7 +90,7 @@ module Modelizer
       file, line = caller.first.split ":"
       line = line.to_i
 
-      test =<<-END
+      test = <<-END
         def test_model_template_for_#{model}
           assert (m = new_#{model}).valid?,
             "#{klass} template is invalid: " +
@@ -86,7 +98,7 @@ module Modelizer
         end
       END
 
-      if self == Test::Unit::TestCase
+      if [Test::Unit::TestCase, ActiveSupport::TestCase].include? self
         eval <<-END, nil, file, line - 2
           class ::ModelTemplateFor#{klass}Test < ActiveSupport::TestCase
             #{test}

data/lib/modelizer/validations.rb

@@ -8,6 +8,8 @@ module Modelizer
         raise "no model template for #{@klass.name}"
       end
 
+      # FIX: location in original test file
+
       validations.each do |v|
         test = send "validation_lambda_for_#{v}", @klass, @model, attribute
         define_method "test_#{attribute}_#{v}", &test
@@ -18,7 +20,7 @@ module Modelizer
 
     def validation_lambda_for_presence klass, model, attribute
       lambda do
-        assert_invalid attribute, send("new_#{model}_without", attribute)
+        assert_invalid attribute, send("new_#{model}", attribute => nil)
       end
     end
 

data/test/{modelizer/assertions_test.rb → test_assertions.rb}

@@ -1,9 +1,8 @@
-require "minitest/unit"
-require "activesupport"
+require "minitest/autorun"
 require "modelizer/assertions"
 
 module Modelizer
-  class AssertionsTest < MiniTest::Unit::TestCase
+  class TestAssertions < MiniTest::Unit::TestCase
     include Modelizer::Assertions
 
     class MockModel

data/test/{modelizer_test.rb → test_modelizer.rb}

@@ -1,8 +1,7 @@
-require "minitest/unit"
-require "activesupport"
+require "minitest/autorun"
 require "modelizer"
 
-class ModelizerTest < MiniTest::Unit::TestCase
+class TestModelizer < MiniTest::Unit::TestCase
   def setup
     @klass = Class.new
     @klass.send :include, Modelizer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: modelizer
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - John Barnette
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-17 00:00:00 -07:00
+date: 2009-07-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,9 +20,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.11.0
+        version: 2.3.2
     version: 
-description: ""
+description: |-
+  Need a simple, consistent way to create model instances and check
+  validations in your Rails tests? Use the Modelizer.
 email: 
 - jbarnette@rubyforge.org
 executables: []
@@ -31,8 +33,10 @@ extensions: []
 
 extra_rdoc_files: 
 - Manifest.txt
+- CHANGELOG.rdoc
 - README.rdoc
 files: 
+- .autotest
 - CHANGELOG.rdoc
 - Manifest.txt
 - README.rdoc
@@ -40,11 +44,12 @@ files:
 - lib/modelizer.rb
 - lib/modelizer/assertions.rb
 - lib/modelizer/validations.rb
-- rails/init.rb
-- test/modelizer/assertions_test.rb
-- test/modelizer_test.rb
+- test/test_assertions.rb
+- test/test_modelizer.rb
 has_rdoc: true
 homepage: http://github.com/jbarnette/modelizer
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -66,10 +71,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: modelizer
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
-summary: ""
+specification_version: 3
+summary: Need a simple, consistent way to create model instances and check validations in your Rails tests? Use the Modelizer.
 test_files: 
-- test/modelizer/assertions_test.rb
-- test/modelizer_test.rb
+- test/test_assertions.rb
+- test/test_modelizer.rb

data/rails/init.rb

@@ -1,5 +0,0 @@
-class ::Test::Unit::TestCase
-  include Modelizer
-  include Modelizer::Assertions
-  extend  Modelizer::Validations
-end