validation_scopes 0.3.1 → 0.4.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 0.4.0 2011-05-23
+
+* Fixed problem with #model_name on proxy class (dynamic_form plugin)
+* Fixed problem with scoped errors being lost by error_messages_for (dynamic_form plugin)
+* Fixed Rails3 deprecation warnings
+
 == 0.3.1 2011-02-24
 
 * Added Rails3 compatibility

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/validation_scopes.rb

@@ -11,10 +11,7 @@ module ValidationScopes
       base_class = self
       deferred_proxy_class_declaration = Proc.new do
         proxy_class = Class.new(DelegateClass(base_class)) do
-          validations_module = defined?(ActiveModel) ? ActiveModel::Validations : ActiveRecord::Validations
-          errors_class = defined?(ActiveModel) ? ActiveModel::Errors : ActiveRecord::Errors
-
-          include validations_module
+          include ActiveModel::Validations
 
           def initialize(record)
             @base_record = record
@@ -23,7 +20,19 @@ module ValidationScopes
 
           # Hack since DelegateClass doesn't seem to be making AR::Base class methods available.
           define_method("errors") do
-            @errors ||= errors_class.new(@base_record)
+            @errors ||= ActiveModel::Errors.new(@base_record)
+          end
+
+          # Hacks to support dynamic_model helpers
+          def to_model
+            self
+          end
+
+          # Rails 3 default implementation of model_name blows up for anonymous classes
+          class << self; self; end.class_eval do
+            define_method(:model_name) do
+              base_class.model_name
+            end
           end
         end
 

data/test/models/user.rb

@@ -20,6 +20,6 @@ class User < ActiveRecord::Base
   end
 
   def age_under_100
-    alerts.add_to_base("We have a centenarian on our hands") if age && age >= 100
+    alerts.add(:base, "We have a centenarian on our hands") if age && age >= 100
   end
-end
+end

data/test/test_validation_scopes.rb

@@ -18,13 +18,13 @@ class TestValidationScopes < Test::Unit::TestCase
     should "raise warning if age set negative" do
       @user.age = -1
       assert @user.has_warnings?
-      assert @user.warnings.on(:age)
+      assert @user.warnings[:age].any?
     end
 
     should "raise warning for inline validation" do
       @user.sponsor_id = 12345
       assert @user.has_warnings?
-      assert @user.warnings.on(:sponsor_id)
+      assert @user.warnings[:sponsor_id].any?
     end
 
     should "not add warning to main errors instance" do
@@ -48,12 +48,29 @@ class TestValidationScopes < Test::Unit::TestCase
 
       should "set alerts but not errors" do
         assert @user.has_alerts?, "no alerts raised"
-        assert @user.alerts.on(:base), "centenarian alert not raised"
-        assert @user.alerts.on(:email), "hotmail alert not raised"
+        assert @user.alerts[:base], "centenarian alert not raised"
+        assert @user.alerts[:email], "hotmail alert not raised"
         assert @user.valid?, "user not valid"
         assert @user.errors.empty?, "user errors not empty"
       end
     end
   end
 
+  context "proxy class" do
+    setup do
+      @user = User.find(1)
+    end
+
+    # Because error_messages_for in dynamic_model gem calls this and delegation
+    # causes base object to be returned, thus losing scoped errors.
+    should "return self for to_model" do
+      assert_equal @user.validation_scope_proxy_for_warnings.class,
+                   @user.validation_scope_proxy_for_warnings.to_model.class
+    end
+
+    should "return model_name of base_class" do
+      assert_equal 'User',
+                   @user.validation_scope_proxy_for_warnings.class.model_name
+    end
+  end
 end

data/validation_scopes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{validation_scopes}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabe da Silveira"]
-  s.date = %q{2011-02-24}
+  s.date = %q{2011-05-23}
   s.description = %q{Define additional sets of validations beyond the standard "errors" that is tied to the ActiveRecord life-cycle.  These additional sets can be defined with all the standard ActiveRecord::Validation macros, and the resulting collection is a standard ActiveRecord::Errors object.}
   s.email = %q{gabe@websaviour.com}
   s.extra_rdoc_files = [
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/dasil003/validation_scopes}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Create sets of validations independent of the life-cycle of an ActiveRecord object}
   s.test_files = [
     "test/db/schema.rb",
@@ -43,7 +43,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: validation_scopes
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Gabe da Silveira
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -08:00
+date: 2011-05-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -67,6 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -75,13 +78,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Create sets of validations independent of the life-cycle of an ActiveRecord object