va 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5887c31b6f007a988c252d4c52cb1f8c4598250c
-  data.tar.gz: 793b15b2a9fc46e065342f9b1fd31558769773cd
+  metadata.gz: 0c2d90020330d06782347f0a78de34f49d02649f
+  data.tar.gz: 7f35f588cda7e35ef2eb675e39bff9031e8496a6
 SHA512:
-  metadata.gz: ea237ac47df122348a36a5035ce5c16e401248c5cafbfff4d7b0d9663e7914d4c5105cdf61e36249eece04bc1b12f5c59160176751d9f246a61148b63123132a
-  data.tar.gz: 89e94ab72b764d42943eecea80c52399b57e3b299d067611e8f8c945404262d3dff271368a790a63d714efb742ef14a3c683148d23999ae109721627326ec136
+  metadata.gz: b0f2484df8044cbadd7a1a4f0e7131246c31bd80c274fae99f8a68c41d78f4d7b00e4c4475a79d610bb42427dcbbf623cd3c9a908c942dbfe09bde9597cef62a
+  data.tar.gz: cb2e88857bc6ebf2ada32ce9020eefb9903e2852986bd2e40f9714994ae2f8fcd2cf4569638a245e1ebc8f9665ecb2be71c6c3be4604d55bc532dacd1bb155ec

data/Rakefile

@@ -1,7 +1,12 @@
 require "bundler/gem_tasks"
 
 task :test do
-  exec "matest spec/*_spec.rb"
+  arg_files = ENV["FILES"] && ENV["FILES"].split(/[\s,]+/)
+  all_files = Rake::FileList["./spec/**/*_spec.rb"]
+  files = arg_files || all_files
+  puts "\nRuning tests for: #{ files.join(" ") }\n\n"
+
+  system *["matest"].concat(files)
 end
 
 task :default => :test

data/lib/va/version.rb

@@ -1,3 +1,3 @@
 module Va
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/va.rb

@@ -3,6 +3,7 @@ require "va/version"
 module Va
   class Model
     attr_reader :attributes
+    attr_reader :errors
 
     def initialize(args={})
       @attributes = {}
@@ -10,12 +11,26 @@ module Va
         key = k.to_sym
         @attributes[key] = v if self.class.keys.include?(key)
       end
+      @errors = {}
+      @valid = validate
     end
 
-    def valid?
-      self.class.validations.all? { |attrs, validation|
-        validation.call(*attrs.map { |attr| self.send(attr)})
+    def validate
+      invalid_validations = self.class.validations.select { |attrs, msg, validation|
+        is_invalid = !validation.call(*attrs.map { |attr| self.send(attr)})
+        key = attrs.count == 1 ? attrs.first : attrs
+        errors[key] = msg || "is invalid" if is_invalid
+        is_invalid
       }
+      invalid_validations.empty?
+    end
+
+    def message(msg="", *attrs)
+      raise __callee__.inspect
+    end
+    
+    def valid?
+      @valid
     end
 
     private
@@ -24,10 +39,13 @@ module Va
     end
 
     def self.validate(*attrs, &block)
+      msg = if attrs.last.is_a? String
+              attrs.pop
+            end
       attrs.each do |attr|
         raise UnknownAttribute unless keys.include?(attr)
       end
-      validations << [attrs, block]
+      validations << [attrs, msg, block]
     end
 
     def self.validate_present(*attrs)

data/spec/errors_spec.rb

@@ -0,0 +1,50 @@
+require "./spec/spec_helper"
+
+scope "errors" do
+  class Truthy < Va::Model
+    attribute :t
+    validate(:t, "not truthy") do |t|
+      t
+    end
+  end
+
+  spec do
+    va = Truthy.new(t: false)
+    @errors = va.errors
+    @errors == { t: "not truthy"}
+  end
+
+  class Falsey < Va::Model
+    attribute :f1
+    attribute :f2
+    validate(:f1, :f2, "not falsey") do |f1, f2|
+      !f1 && !f2
+    end
+  end
+
+  spec do
+    va = Falsey.new(f1: false, f2: true)
+    @errors = va.errors
+    @errors == { [:f1, :f2] => "not falsey"}
+  end
+
+  class WithoutMessages < Va::Model
+    attribute :a
+    attribute :b
+
+    validate(:a) do |a|
+      false
+    end
+
+    validate(:a, :b) do |a, b|
+      false
+    end
+  end
+
+  spec do
+    va = WithoutMessages.new
+    @errors = va.errors
+    @errors == { :a => "is invalid", [:a, :b] => "is invalid" }
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: va
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Federico Iachetti
@@ -68,6 +68,7 @@ files:
 - Rakefile
 - lib/va.rb
 - lib/va/version.rb
+- spec/errors_spec.rb
 - spec/spec_helper.rb
 - spec/va_spec.rb
 - spec/validations_spec.rb
@@ -97,6 +98,7 @@ signing_key:
 specification_version: 4
 summary: Minimalistic framework agnostic Validator.
 test_files:
+- spec/errors_spec.rb
 - spec/spec_helper.rb
 - spec/va_spec.rb
 - spec/validations_spec.rb