valuedate 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/valuedate.rb

@@ -1,5 +1,22 @@
 class Valuedate
 
+  class ValidationFailed < StandardError
+    attr_reader :errors
+
+    def initialize(errors)
+      super("validation failed with #{errors.size} errors")
+      @errors = errors
+    end
+  end
+
+  class Error
+    attr_reader :options
+
+    def initialize(options={})
+      @options = options
+    end
+  end
+
   class Scope
     def value
       Value.new
@@ -19,8 +36,10 @@ class Valuedate
     end
   end
 
+  attr_reader :errors
 
   def initialize(&block)
+    @errors = []
     @validators = []
     if block
       validator = Scope.new.instance_eval(&block)
@@ -32,13 +51,18 @@ class Valuedate
     valid? do |value|
       value ||= {}
       schema.all? do |(key, validator)|
-        validator.validate(value[key])
+        validator.call(value[key]) || collect_errors!(validator, :key => key)
       end
     end
   end
 
   def validate(value = nil)
-    @validators.all? { |validator| validator.call(value) }
+    @errors.clear
+    @validators.all? { |validator| validator.call(value) || collect_errors!(validator) }
+  end
+
+  def validate!(value = nil)
+    validate(value) or raise ValidationFailed.new(@errors)
   end
 
   def call(value)
@@ -50,9 +74,28 @@ class Valuedate
     self
   end
 
+  def collect_errors!(validator, options = {})
+    case validator
+    when Valuedate
+      @errors.concat(validator.errors.map { |error| error.options.update(options); error })
+    end
+    false
+  end
+
+  def errors
+    @errors.uniq
+  end
+
+  def error(options={})
+    @errors << Error.new(options)
+    false
+  end
+
   def method_missing(method, *args, &block)
     if matcher = Valuedate.matchers[method]
-      valid? { |value| matcher.call(value, *args, &block) }
+      valid? do |value|
+        matcher.call(value, *args, &block) || error(:matcher => method, :value => value, :args => args)
+      end
     else
       super
     end

data/test/test_valuedate.rb

@@ -6,6 +6,22 @@ class Riot::Situation
   end
 end
 
+class Riot::Context
+  def asserts_validation_error(options={}, &block)
+    asserts("validation_error with #{options.inspect}") do
+      begin
+        instance_eval(&block)
+        false
+      rescue Valuedate::ValidationFailed => e
+        error = e.errors.first
+        options.all? do |key, value|
+          error.options[key] == value
+        end
+      end
+    end
+  end
+end
+
 context "Valuedate" do
 
   asserts(:class) { Valuedate.schema }.equals(Valuedate)
@@ -179,4 +195,38 @@ context "Valuedate" do
     asserts("valid array size") { v([1,2]) { value.is { |value| value.size == 2 } } }
     asserts("invalid array size") { !v([1,2]) { value.not { |value| value.size == 2 } } }
   end
+
+  context "errors" do
+    setup do
+      Valuedate.schema {}
+    end
+
+    asserts("empty") { topic.errors.empty? }
+    asserts("with error") do
+      topic.error(:value => "value")
+      topic.errors.first.options[:value]
+    end.equals("value")
+
+    context "aggregate" do
+      setup do
+        Valuedate.schema do
+          value.hash(
+            :key1 => value.is_a(String).equals("key"),
+            :key2 => value.hash(
+              :key3 => value.is_a(Fixnum)
+            )
+          )
+        end
+      end
+
+      asserts("fails") { !topic.validate({}) }
+      asserts_validation_error(:key => :key1, :matcher => :is_a) { topic.validate!({}) }
+      asserts_validation_error(:key => :key1, :matcher => :is_a) { topic.validate!(:key1 => 23) }
+      asserts_validation_error(:key => :key1, :matcher => :equals) { topic.validate!(:key1 => "value") }
+      asserts_validation_error(:key => :key2, :matcher => :is_a) { topic.validate!(:key1 => "key") }
+      asserts_validation_error(:key => :key2, :matcher => :is_a) { topic.validate!(:key1 => "key", :key2 => {}) }
+      asserts_validation_error(:key => :key2, :matcher => :is_a) { topic.validate!(:key1 => "key", :key2 => {:key3 => 0.0}) }
+      asserts("passes") { topic.validate(:key1 => "key", :key2 => {:key3 => 23}) }
+    end
+  end
 end

data/valuedate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{valuedate}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Suschlik"]
-  s.date = %q{2010-01-28}
+  s.date = %q{2010-01-30}
   s.email = %q{peter-valuedate@suschlik.de}
   s.extra_rdoc_files = [
     "README.rdoc"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: valuedate
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Peter Suschlik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-28 00:00:00 +01:00
+date: 2010-01-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency