va 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bf31c73ebe433e7c002db7ab59834a2ad6c87ae
-  data.tar.gz: 14def0ad67e9cf393772f7d450c6b53654586718
+  metadata.gz: 71852c4aa71d300422814133cf073f6ddef674f3
+  data.tar.gz: 98f5f50bf80557f9e76a2f401845c0754700a39f
 SHA512:
-  metadata.gz: 84d8f492bc1b1426b80e9c18147de0ea48fbfdf1cc83f661fecf7fece1a90fb02c3971fa18b1d8cb86e50eeebcbc58f09cef0be783960a5e9bff6d94743c386d
-  data.tar.gz: e54e0ee3b0a6ddf4a865da55a7def06dede7f76e67c631a95af19f397aa2294632495ed448201a3474bf4f48573f598a00e366c515b919073f48351b20c4ba7d
+  metadata.gz: dbf0f57ab08834eed1ed195ffc4696f332b5f43bc4290e51466b133e99c69ffc158decc1b14ffebd6f3e86bf1da921ec6e562d07c128df62e25a24fd1071f071
+  data.tar.gz: 2ff88a638807598c7e219fc02e0e38f96d827d6cb6a5bc44dd5103db29a68144f65671353f5c85c14b568c880084d0f9ef8d12572d7a4991a4c453273613c0e8

data/README.md

@@ -59,6 +59,31 @@ And if you pass a non-declared attribute, it will be ignored:
   # => #<Signup:0x000000015f8dd0 @attributes={:email=>"fede@example.com"}>
 ```
 
+### Default Values
+
+You can assign a default value for an attribute, in which case, if no value is provided, it will get assigned either way:
+
+```ruby
+  class UserValidator < Va::Model
+    attribute :name, default: "N/A"
+    attribute :admin,  default: false
+    attribute :editor, default: true
+    attribute :remember_me, default: true
+    attribute :age
+    attribute :height
+  end
+  
+  u = UserValidator.new(age: 30, remember_me: false)
+  u.attributes
+  # => {:name=>"N/A",
+  #     :admin=>false,
+  #     :editor=>true,
+  #     :remember_me=>false,
+  #     :age=>30}
+```
+
+Note that `age` and `remember_me` were set explicitly, `name`, `admin` and `editor` where set by default, and `height wasn't set at all.
+
 ### Custom Validations
 
 

data/lib/va.rb

@@ -1,7 +1,7 @@
 require "va/version"
 
 module Va
-  class Model
+  class Validator
     attr_reader :attributes
     attr_reader :errors
 
@@ -48,11 +48,21 @@ module Va
       validations << [attrs, msg, block]
     end
 
-    def self.validate_present(*attrs)
+    def self.validate_multiple(*attrs, &block)
       attrs.each do |attr|
-        validate(attr) do |a|
-          a && a != ""
-        end
+        validate(attr, &block)
+      end
+    end
+
+    def self.validate_present(*attrs)
+      validate_multiple(*attrs) do |attr|
+        attr && attr != ""
+      end
+    end
+
+    def self.validate_not_nil(*attrs)
+      validate_multiple(*attrs) do |attr|
+          attr != nil
       end
     end
 

data/lib/va/string_validations.rb

@@ -0,0 +1,15 @@
+module StringValidations
+  module ClassMethods
+
+    def validate_string(*attrs)
+      validate_multiple(*attrs) do |attr|
+          attr.is_a?(String) || attr.nil?
+      end
+    end
+
+  end
+
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+end

data/lib/va/version.rb

@@ -1,3 +1,3 @@
 module Va
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/errors_spec.rb

@@ -1,7 +1,7 @@
 require "./spec/spec_helper"
 
 scope "errors" do
-  class Truthy < Va::Model
+  class Truthy < Va::Validator
     attribute :t
     validate(:t, "not truthy") do |t|
       t
@@ -14,7 +14,7 @@ scope "errors" do
     @errors == { t: "not truthy"}
   end
 
-  class Falsey < Va::Model
+  class Falsey < Va::Validator
     attribute :f1
     attribute :f2
     validate(:f1, :f2, "not falsey") do |f1, f2|
@@ -28,7 +28,7 @@ scope "errors" do
     @errors == { [:f1, :f2] => "not falsey"}
   end
 
-  class WithoutMessages < Va::Model
+  class WithoutMessages < Va::Validator
     attribute :a
     attribute :b
 

data/spec/spec_helper.rb

@@ -1 +1,2 @@
-require File.expand_path("../../lib/va", __FILE__)
+$:.unshift(File.expand_path("../lib/", __dir__))
+require "va"

data/spec/string_validations_spec.rb

@@ -0,0 +1,29 @@
+require "./spec/spec_helper"
+
+require "va/string_validations"
+
+scope "string validations" do
+  scope "is string" do
+    class Person < Va::Validator
+      include StringValidations
+      attribute :name
+      
+      validate_string(:name)
+    end
+
+    spec "is a string" do
+      @p = Person.new(name: "Fede")
+      @p.valid?
+    end
+
+    spec "not a string" do
+      @p = Person.new(name: 5)
+      ! @p.valid?
+    end
+
+    spec "accepts nils" do
+      @p = Person.new
+      @p.valid?
+    end
+  end
+end

data/spec/va_spec.rb

@@ -1,7 +1,7 @@
 require "./spec/spec_helper"
 
 scope do
-  class Login < Va::Model
+  class Login < Va::Validator
     attribute :email
     attribute :pass
   end
@@ -33,7 +33,7 @@ end
 
 scope "custom validations" do
   spec "basic passing validation" do
-    class VeryValid < Va::Model
+    class VeryValid < Va::Validator
       validate do
         true
       end
@@ -44,7 +44,7 @@ scope "custom validations" do
   end
 
   spec "basic passing validation" do
-    class VeryInvalid < Va::Model
+    class VeryInvalid < Va::Validator
       validate do
         false
       end
@@ -55,7 +55,7 @@ scope "custom validations" do
   end
 
   scope "A range validation" do
-    class MyRange < Va::Model
+    class MyRange < Va::Validator
       attribute :from
       attribute :to
 
@@ -78,7 +78,7 @@ scope "custom validations" do
   scope "can't validate" do
     spec "invalid arguments" do
       begin
-        class FaceValidator < Va::Model
+        class FaceLidator < Va::Validator
           attribute :face
 
           validate(:leg) do |leg|
@@ -92,8 +92,35 @@ scope "custom validations" do
   end
 end
 
+scope "validate multiple" do
+  class Name < Va::Validator
+    attribute :first
+    attribute :last
+
+    validate_multiple(:first, :last) do |attr|
+      attr.size > 0
+    end
+  end
+
+  spec "passing" do
+    @va = Name.new(first: "Federico", last: "Iachetti")
+    @va.valid?
+  end
+
+  spec "all failing" do
+    @va = Name.new(first: "", last: "")
+    ! @va.valid?
+  end
+  
+  spec "one failing" do
+    @va = Name.new(first: "Federico", last: "")
+    ! @va.valid?
+  end
+end
+
+
 scope "default values" do
-  class MyDefaults < Va::Model
+  class MyDefaults < Va::Validator
     attribute :name, default: "N/A"
     attribute :age
   end
@@ -103,7 +130,7 @@ scope "default values" do
     @attributes == {name: "N/A", age: 30}
   end
 
-  class BooleanDefaults < Va::Model
+  class BooleanDefaults < Va::Validator
     attribute :me_true,  default: true
     attribute :me_false, default: false
     attribute :not_me

data/spec/validations_spec.rb

@@ -2,7 +2,7 @@ require "./spec/spec_helper"
 
 scope "basic validations" do
   scope "non-blank" do
-    class ANonBlankAttribute < Va::Model
+    class ANonBlankAttribute < Va::Validator
       attribute :name
       attribute :age
       validate_present(:name, :age)
@@ -28,4 +28,38 @@ scope "basic validations" do
       ! @va.valid?
     end
   end
+
+  scope "non-nil" do
+    class ANotNilAttribute < Va::Validator
+      attribute :name
+      attribute :age
+      validate_not_nil(:name, :age)
+    end
+
+    spec "passing" do
+      @va = ANotNilAttribute.new(name: "Fede", age: :of_ultron)
+      @va.valid?
+    end
+
+    spec "one empty string" do
+      @va = ANotNilAttribute.new(name: "", age: :of_ultron)
+      @va.valid?
+    end
+
+    spec "one nil" do
+      @va = ANotNilAttribute.new(name: "Fede", age: nil)
+      ! @va.valid?
+    end
+
+    spec "both empty" do
+      @va = ANotNilAttribute.new(name: nil, age: "")
+      ! @va.valid?
+    end
+
+    spec "both nil" do
+      @va = ANotNilAttribute.new(name: nil, age: nil)
+      ! @va.valid?
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: va
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Federico Iachetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,9 +67,11 @@ files:
 - README.md
 - Rakefile
 - lib/va.rb
+- lib/va/string_validations.rb
 - lib/va/version.rb
 - spec/errors_spec.rb
 - spec/spec_helper.rb
+- spec/string_validations_spec.rb
 - spec/va_spec.rb
 - spec/validations_spec.rb
 - va.gemspec
@@ -100,5 +102,6 @@ summary: Minimalistic framework agnostic Validator.
 test_files:
 - spec/errors_spec.rb
 - spec/spec_helper.rb
+- spec/string_validations_spec.rb
 - spec/va_spec.rb
 - spec/validations_spec.rb