valuedate 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/valuedate.rb

@@ -51,7 +51,7 @@ class Valuedate
     valid? do |value|
       value ||= {}
       schema.all? do |(key, validator)|
-        validator.call(value[key]) || collect_errors!(validator, :key => key)
+        validator.call(value[key]) || collect_errors!(validator, key)
       end
     end
   end
@@ -74,10 +74,10 @@ class Valuedate
     self
   end
 
-  def collect_errors!(validator, options = {})
+  def collect_errors!(validator, key=nil)
     case validator
     when Valuedate
-      @errors.concat(validator.errors.map { |error| error.options.update(options); error })
+      @errors.concat(validator.errors.map { |error| error.options[:key] ||= key; error })
     end
     false
   end

data/test/test_valuedate.rb

@@ -196,6 +196,7 @@ context "Valuedate" do
     asserts("invalid array size") { !v([1,2]) { value.not { |value| value.size == 2 } } }
   end
 
+  # TODO refactor!
   context "errors" do
     setup do
       Valuedate.schema {}
@@ -220,12 +221,7 @@ context "Valuedate" do
       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_validation_error(:key => :key3, :matcher => :is_a) { topic.validate!(:key1 => "key", :key2 => {:key3 => 0.0}) }
       asserts("passes") { topic.validate(:key1 => "key", :key2 => {:key3 => 23}) }
     end
   end

data/test.watchr

@@ -17,4 +17,5 @@ watch('test/helper.rb')    { run_tests }
 watch('VERSION') do
   puts "Building gem"
   system "rake build"
+  system %{git commit -m "Spec" *.gemspec}
 end

data/valuedate.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{valuedate}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Suschlik"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: valuedate
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Peter Suschlik