jnunemaker-validatable 1.8.3 → 1.8.4

data/Rakefile

@@ -1,18 +1,23 @@
 require 'rubygems'
 require 'rake'
 
-require File.dirname(__FILE__) + '/lib/validatable'
+require File.expand_path('../lib/validatable', __FILE__)
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
-  gem.name        = "jnunemaker-validatable"
-  gem.summary     = %Q{Validatable is a library for adding validations.}
-  gem.description = %Q{Validatable is a library for adding validations.}
-  gem.email       = "nunemaker@gmail.com"
-  gem.homepage    = "http://github.com/jnunemaker/validatable"
+  gem.name        = 'jnunemaker-validatable'
+  gem.summary     = 'Validatable is a library for adding validations.'
+  gem.description = 'Validatable is a library for adding validations.'
+  gem.email       = 'nunemaker@gmail.com'
+  gem.homepage    = 'http://github.com/jnunemaker/validatable'
   gem.authors     = ['Jay Fields', 'John Nunemaker']
   gem.files       = FileList['lib/**/*.rb', '[A-Z]*', 'test/**/*'].to_a
   gem.version     = Validatable::Version
+  
+  gem.add_dependency('activesupport', '>= 2.3.4')
+  gem.add_development_dependency('mocha', '>= 0.9.8')
+  gem.add_development_dependency('dust')
+  gem.add_development_dependency('expectations')
 end
 
 Jeweler::GemcutterTasks.new

data/lib/validatable.rb

@@ -1,5 +1,11 @@
+# gem 'activesupport', '2.3.5'
+
+begin
+  require 'active_support/core_ext/object/blank' # newer versions of active_support (>= 3.0)
+rescue LoadError => e
+  require 'active_support/all' # support older versions of active_support (<= 2.3.5)
+end
 require 'forwardable'
-require 'active_support/all'
 
 require 'validatable/object_extension'
 require 'validatable/errors'
@@ -24,5 +30,5 @@ require 'validatable/validations/validates_each'
 require 'validatable/validations/validates_associated'
 
 module Validatable
-  Version = '1.8.3'
+  Version = '1.8.4'
 end

data/lib/validatable/errors.rb

@@ -19,6 +19,19 @@ module Validatable
       !@errors[attribute.to_sym].nil?
     end
 
+    # Adds an error to the base object instead of any particular attribute. This is used
+    # to report errors that don't tie to any specific attribute, but rather to the object
+    # as a whole. These error messages don't get prepended with any field name when iterating
+    # with +each_full+, so they should be complete sentences.
+    def add_to_base(msg)
+      add(:base, msg)
+    end
+
+    # Returns errors assigned to the base object through +add_to_base+ according to the normal rules of <tt>on(attribute)</tt>.
+    def on_base
+      on(:base)
+    end    
+
     # call-seq: on(attribute)
     #
     # * Returns nil, if no errors are associated with the specified +attribute+.

data/test/test_helper.rb

@@ -1,7 +1,7 @@
+require 'set'
 require 'test/unit'
 require 'mocha'
 require 'dust'
-require 'set'
 require 'expectations'
 
 require File.expand_path(File.dirname(__FILE__) + '/../lib/validatable')
@@ -19,12 +19,6 @@ class << Test::Unit::TestCase
   end
 end
 
-class Test::Unit::TestCase
-  def assert_array_equal a, b
-    assert_equal Set.new(a), Set.new(b)
-  end
-end
-
 class Array
   def to_blank_options_hash
     self.inject({}) {|hash, value| hash[value] = nil; hash }

data/test/unit/test_errors.rb

@@ -7,6 +7,12 @@ Expectations do
     errors.on(:attribute)
   end
   
+  expect "message" do
+    errors = Validatable::Errors.new
+    errors.add_to_base("message")
+    errors.on_base
+  end
+  
   expect ["message"] do
     errors = Validatable::Errors.new
     errors.add(:attribute, "message")

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-validatable
 version: !ruby/object:Gem::Version 
-  version: 1.8.3
+  prerelease: false
+  segments: 
+  - 1
+  - 8
+  - 4
+  version: 1.8.4
 platform: ruby
 authors: 
 - Jay Fields
@@ -10,10 +15,61 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -05:00
+date: 2010-04-18 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 4
+        version: 2.3.4
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: dust
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: expectations
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Validatable is a library for adding validations.
 email: nunemaker@gmail.com
 executables: []
@@ -88,18 +144,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Validatable is a library for adding validations.