lotus-validations 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5d9ec74237f0617a38373fdabc7495a93426129
-  data.tar.gz: 2bc50b35391c302a6796615abd188b1d83af98b8
+  metadata.gz: 3108e0f651b886a399aad4ebd34bbb2a7cfc405f
+  data.tar.gz: 4a195aba653bc52553cd6c6c7bd583d5db3ca2e1
 SHA512:
-  metadata.gz: 16393d2d7241b5123673685f49317182f45fd01f2b98bfaf4d61c1fe2a9dc3db4768ab89bf630d59733dfc397670257695d4ef29a3e83da89c88730ac7a1241d
-  data.tar.gz: 141f632e5c63452f617563a786ff7284c906ec8e49b5f3397d04cc07f6bd7bcb925a051164c963860386644f856c87245d55c36dee4e33ba29ff4699ab015214
+  metadata.gz: 87ec3a0e492883bc32c64e6b754fb76bdec5080ab96135e70128db885c7aac7e10851d34fb25b7d551ba1b0437e4d131f0e0386fbc4d4191d559e7e7504d672f
+  data.tar.gz: 0f1f326609266e52b7626d9d558c8ad70bb7074cf390ff05d4fca97d6751ab5e5288e5c61d3a60f8fab158b5aa2f5b8cca765d6e1ca224493a794bd6aae32e0e

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Lotus::Validations
 Validations mixin for Ruby objects
 
+## v0.4.0 - 2016-01-12
+## Changed
+- [Hélio Costa e Silva & Luca Guidi] Ignore blank values for format and size validation
+
+### Fixed
+- [Pascal Betz] Ensure acceptance validation to reject blank strings
+
 ## v0.3.3 - 2015-09-30
 ### Added
 - [Luca Guidi] Official support for JRuby 9k+

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright © 2014-2015 Luca Guidi
+Copyright © 2014-2016 Luca Guidi
 
 MIT License
 

data/README.md

@@ -67,6 +67,34 @@ person.email # => "me@example.org"
 person.age   # => raises NoMethodError because `:age` wasn't defined as attribute.
 ```
 
+#### Blank Values
+
+The framework will treat as valid any blank attributes, __without__ `presence`, for both `format` and `size` predicates.
+
+```ruby
+require 'lotus/validations'
+
+class Person
+  include Lotus::Validations
+
+  attribute :name,    type: String, size: 5..45
+  attribute :email,   type: String, size: 20..80, format: /@/
+  attribute :skills,  type: Array,  size: 1..3
+  attribute :keys,    type: Hash,   size: 1..3
+end
+
+Person.new.valid?                             # < true
+Person.new(name: '').valid?                   # < true
+Person.new(skills: '').valid?                 # < true
+Person.new(skills: ['ruby', 'lotus']).valid?  # < true
+
+Person.new(skills: []).valid?                 # < false
+Person.new(keys: {}).valid?                   # < false
+Person.new(keys: {a: :b}, skills: []).valid?  # < false
+```
+
+If you want to _disable_ this behaviour, please, refer to [presence](https://github.com/lotus/validations#presence).
+
 ### Validations
 
 If you prefer Lotus::Validations to **only define validations**, but **not attributes**,
@@ -555,4 +583,4 @@ product.price # => 100
 
 ## Copyright
 
-Copyright © 2014-2015 Luca Guidi – Released under MIT License
+Copyright © 2014-2016 Luca Guidi – Released under MIT License

data/lib/lotus/validations/attribute.rb

@@ -85,7 +85,7 @@ module Lotus
       # This passes if the value is "truthy", it fails if not.
       #
       # Truthy examples: `Object.new`, `1`, `"1"`, `true`.
-      # Falsey examples: `nil`, `0`, `"0"`, `false`.
+      # Falsy examples: `nil`, `0`, `"0"`, `false`, `""`.
       #
       # @see Lotus::Validations::ClassMethods#attribute
       # @see http://www.rubydoc.info/gems/lotus-utils/Lotus/Utils/Kernel#Boolean-class_method
@@ -93,7 +93,9 @@ module Lotus
       # @since 0.2.0
       # @api private
       def acceptance
-        _validate(__method__) { Lotus::Utils::Kernel.Boolean(@value) }
+        _validate(__method__) do
+          !blank_value? && Lotus::Utils::Kernel.Boolean(@value)
+        end
       end
 
       # Validates format of the value.
@@ -106,7 +108,7 @@ module Lotus
       # @since 0.2.0
       # @api private
       def format
-        _validate(__method__) {|matcher| @value.to_s.match(matcher) }
+        _validate(__method__) {|matcher| @value.to_s.match(matcher) } unless blank_value?
       end
 
       # Validates inclusion of the value in the defined collection.
@@ -171,6 +173,8 @@ module Lotus
       #
       # If the quantity is a Range, the size of the value MUST be included.
       #
+      # If the attribute's value is blank, the size will not be considered
+      #
       # The value is an object which implements `#size`.
       #
       # @raise [ArgumentError] if the defined quantity isn't a Numeric or a
@@ -181,6 +185,8 @@ module Lotus
       # @since 0.2.0
       # @api private
       def size
+        return if blank_value?
+
         _validate(__method__) do |validator|
           case validator
           when Numeric, ->(v) { v.respond_to?(:to_int) }

data/lib/lotus/validations/attribute_definer.rb

@@ -76,8 +76,8 @@ module Lotus
         # @param name [#to_sym] the name of the attribute
         # @param options [Hash] optional set of validations
         # @option options [Class] :type the Ruby type used to coerce the value
-        # @option options [TrueClass,FalseClass] :acceptance requires Ruby
-        #   thruthiness of the value
+        # @option options [TrueClass,FalseClass] :acceptance requires a non-empty
+        # value which coerces to TrueClass
         # @option options [TrueClass,FalseClass] :confirmation requires the value
         #   to be confirmed twice
         # @option options [#include?] :exclusion requires the value NOT be

data/lib/lotus/validations/blank_value_checker.rb

@@ -38,8 +38,18 @@ module Lotus
       # @since 0.2.2
       # @api private
       def _empty_value?
+        return false if _enumerable?
         (@value.respond_to?(:empty?) and @value.empty?)
       end
+
+      # Collectable classes should not be considered as blank value
+      # even if it's responds _true_ to its own `empty?` method.
+      #
+      # @since 0.4.0
+      # @api private
+      def _enumerable?
+        @value.respond_to?(:each)
+      end
     end
   end
 end

data/lib/lotus/validations/version.rb

@@ -1,6 +1,6 @@
 module Lotus
   module Validations
     # @since 0.1.0
-    VERSION = '0.3.3'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/lotus-validations.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency 'lotus-utils', '~> 0.5'
+  spec.add_dependency 'lotus-utils', '~> 0.6'
 
   spec.add_development_dependency 'bundler',  '~> 1.6'
   spec.add_development_dependency 'minitest', '~> 5'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotus-validations
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-utils
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Validations mixin for Ruby objects