modelizer 1.3.1 → 2.0.0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 2.0.0 / 2010-07-15
+
+* Remove ActiveSupport assumption, tweak for Rails 3.
+* Allow empty default attribute sets.
+
 === 1.3.1 / 2009-11-30
 
 * Squash warning, require 'active_support' instead of 'activesupport'.

data/README.rdoc

@@ -74,11 +74,11 @@ The third argument is optional.
 
 == Installation
 
-    $ sudo gem install modelizer
+    $ gem install modelizer
 
 == License
 
-Copyright 2009 John Barnette (jbarnette@rubyforge.org)
+Copyright 2009-10 John Barnette (code@jbarnette.com)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -4,7 +4,7 @@ require "hoe"
 Hoe.plugin :doofus, :git
 
 Hoe.spec "modelizer" do
-  developer "John Barnette", "jbarnette@rubyforge.org"
+  developer "John Barnette", "code@jbarnette.com"
 
   self.extra_rdoc_files = FileList["*.rdoc"]
   self.history_file     = "CHANGELOG.rdoc"

data/lib/modelizer.rb

@@ -1,12 +1,10 @@
-require "active_support"
-
 require "modelizer/assertions"
 require "modelizer/validations"
 
 module Modelizer
 
   # Duh.
-  VERSION = "1.3.1"
+  VERSION = "2.0.0"
 
   include Modelizer::Assertions
 
@@ -18,6 +16,14 @@ module Modelizer
     target.extend Modelizer::Validations
   end
 
+  def self.underscore classname
+    classname.gsub(/::/, '_').
+      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+      gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      tr("-", "_").
+      downcase
+  end
+
   def assign_model_template_attributes model, attributes
     model.send :attributes=, attributes, false
     model
@@ -37,14 +43,14 @@ module Modelizer
 
   module ClassMethods
     def model_template_for klass, defaults = {}, &block
-      if defaults.empty? && !block
+      if defaults.nil? && !block
         raise ArgumentError, "default attributes or lazy block required"
       end
 
       ::Modelizer.cache[klass] = [defaults, block]
 
       klass = klass.name
-      model = klass.underscore.tr "/", "_"
+      model = ::Modelizer.underscore klass
 
       module_eval <<-END, __FILE__, __LINE__ + 1
         def valid_#{model}_attributes extras = {}

data/lib/modelizer/assertions.rb

@@ -4,9 +4,11 @@ module Modelizer
       assert !model.valid?,
         "#{model.class.name} should have invalid #{attribute}, but it's valid."
 
-      assert !model.errors.on(attribute).blank?,
+      errors = model.errors[attribute]
+      
+      assert !errors.nil? && !errors.empty?,
       "No error on #{attribute}, but: " +
-        model.errors.full_messages.to_sentence
+        model.errors.full_messages.join(", ")
 
       assert_match match, model.errors.on(attribute) if match
     end

data/lib/modelizer/validations.rb

@@ -2,7 +2,7 @@ module Modelizer
   module Validations
     def test_validations_for attribute, *validations
       @klass ||= name.gsub(/Test$/, "").constantize
-      @model ||= @klass.name.underscore.tr("/", "_")
+      @model ||= ::Modelizer.underscore @klass.name
 
       unless instance_methods.collect { |m| m.to_s }.include? "new_#{@model}"
         raise "no model template for #{@klass.name}"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: modelizer
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
-  - 1
-  - 3
-  - 1
-  version: 1.3.1
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - John Barnette
@@ -14,27 +15,46 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -08:00
+date: 2010-07-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rubyforge
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
-        - 3
-        - 3
-        version: 2.3.3
+        - 0
+        - 4
+        version: 2.0.4
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 2
+        - 6
+        - 1
+        version: 2.6.1
+  type: :development
+  version_requirements: *id002
 description: |-
   Need a simple, consistent way to create model instances and check
   validations in your Rails tests? Use the Modelizer.
 email: 
-- jbarnette@rubyforge.org
+- code@jbarnette.com
 executables: []
 
 extensions: []
@@ -65,23 +85,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: modelizer
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Need a simple, consistent way to create model instances and check validations in your Rails tests? Use the Modelizer.