modelizer 2.1.0 → 3.0.0

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== 3.0.0 / 2010-12-18
+
+* Remove ill-advised namespace= introduced in 2.1.0.
+* Add public API for class -> method name transformations.
+* Remove assert_not_nil assumption.
+
 === 2.1.0 / 2010-12-18
 
 * Allow namespaces in helper names to be disabled.

data/lib/modelizer.rb

@@ -4,7 +4,7 @@ require "modelizer/validations"
 module Modelizer
 
   # Duh.
-  VERSION = "2.1.0"
+  VERSION = "3.0.0"
 
   include Modelizer::Assertions
 
@@ -28,9 +28,13 @@ module Modelizer
     target.extend Modelizer::Validations
   end
 
-  @@namespace = true
-  def self.namespace?; @@namespace end
-  def self.namespace= ns; @@namespace = ns end
+  def self.method_name_for model_class
+    underscore model_class.name
+  end
+
+  def self.model_class_for test_class
+    test_class.name.gsub(/Test$/, "").constantize
+  end
 
   def self.underscore classname
     classname.gsub(/::/, '_').
@@ -65,9 +69,8 @@ module Modelizer
 
       ::Modelizer.cache[klass] = [defaults, block]
 
-      klass   = klass.name
-      nsklass = Modelizer.namespace? ? klass : klass.split("::").last
-      model   = ::Modelizer.underscore nsklass
+      model = ::Modelizer.method_name_for klass
+      klass = klass.name
 
       module_eval <<-END, __FILE__, __LINE__ + 1
         def valid_#{model}_attributes extras = {}

data/lib/modelizer/validations.rb

@@ -1,8 +1,8 @@
 module Modelizer
   module Validations
     def test_validations_for attribute, *validations
-      @klass ||= name.gsub(/Test$/, "").constantize
-      @model ||= ::Modelizer.underscore @klass.name
+      @klass ||= ::Modelizer.model_class_for self
+      @model ||= ::Modelizer.method_name_for @klass
 
       unless instance_methods.collect { |m| m.to_s }.include? "new_#{@model}"
         raise "no model template for #{@klass.name}"
@@ -27,7 +27,7 @@ module Modelizer
     def validation_lambda_for_uniqueness klass, model, attribute
       lambda do
         existing = klass.first
-        assert_not_nil existing, "There's at least one #{model} fixture."
+        assert existing, "There's at least one #{model} fixture."
 
         assert_invalid attribute,
           send("new_#{model}", attribute => existing.send(attribute))

metadata

@@ -3,10 +3,10 @@ name: modelizer
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 2
-  - 1
+  - 3
   - 0
-  version: 2.1.0
+  - 0
+  version: 3.0.0
 platform: ruby
 authors: 
 - John Barnette