birth_date_validator 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 637fbf5ffb1b89666920f75b64b28235675e6e05
-  data.tar.gz: ea0ae65a07369d83b7afb1a98a7bf2cd756f8f3b
+  metadata.gz: cdf56f43fbfe67dd19bc0acaf83e153d68d3e0e9
+  data.tar.gz: 889a7bb058a1fad32cc194a8cc960ce0de10e260
 SHA512:
-  metadata.gz: 6abb63db105fd429c30576ffee9576715f8c62305b67b8711cc33a90403239221a546704e510cd9c7316461089d861d7fa739e78780407f322e75c0c81b3db79
-  data.tar.gz: 8239879492d557669c5186c78a7776d6384b1de59017019209b69e6b7a964f50a75fb413ba5748c58c2f5397955e991d4f5c05fefed70f882bc5a8a6f842e2b3
+  metadata.gz: 401052166287b650a981d935c56d9be68d8747ce92c387bab52885790fd93d28556523eb961a775ac254153bb82985428923a66e27b5199bd09f6a3a6c165bec
+  data.tar.gz: 92d01741c4825da57e3385572570dec00a681de5e02d4c52ea5ceb85ac362fd32d1a5a3a5c5583437c8123723efa168dcca963b31ca857e471dd99a2c9a61680

data/lib/birth_date_validator/validator.rb

@@ -10,14 +10,23 @@
 
 class BirthDateValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
+    age_to_validate = age(value)
+
     invalid = if options[:at_least].present?
-      value.year > options[:at_least].year
+      age_to_validate < age(options[:at_least])
     elsif options[:less_then].present?
-      value.year <= options[:less_then].year
+      age_to_validate >= age(options[:less_then])
     elsif options[:range].present?
-      value.year > options[:range].first.year || value.year < options[:range].last.year
+      age_to_validate < age(options[:range].first) || age_to_validate > age(options[:range].last)
     end
 
     record.errors.add(attribute, options.fetch(:message, :invalid)) if invalid
   end
+
+private
+
+  def age(birth_date)
+    now = Date.today
+    now.year - birth_date.year - ((now.month > birth_date.month || (now.month == birth_date.month && now.day >= birth_date.day)) ? 0 : 1)
+  end
 end

data/lib/birth_date_validator/version.rb

@@ -9,5 +9,5 @@
 #++
 
 class BirthDateValidator
-  VERSION = '0.1.1'
+  VERSION = '0.2'
 end

data/spec/birth_date_validator_spec.rb

@@ -2,6 +2,12 @@ require './spec_helper'
 
 describe BirthDateValidator do
   describe 'user has to have at least 18 years' do
+    context '18 years old' do
+      it 'is valid' do
+        expect(TestUserOverAge.new(birth_date: 18.years.ago)).to be_valid
+      end
+    end
+
     context '19 years old' do
       it 'is valid' do
         expect(TestUserOverAge.new(birth_date: 19.years.ago)).to be_valid
@@ -17,27 +23,21 @@ describe BirthDateValidator do
         expect(subject.errors[:birth_date][0]).to include 'older'
       end
     end
+  end
 
-    context '18 years old' do
+  describe 'user has to have less then 18 years' do
+    context '17 years old' do
       it 'is valid' do
-        expect(TestUserOverAge.new(birth_date: 18.years.ago)).to be_valid
+        expect(TestUserUnderAge.new(birth_date: 17.years.ago)).to be_valid
       end
     end
-  end
 
-  describe 'user has to have less then 18 years' do
     context '19 years old' do
       it 'is not valid' do
         expect(TestUserUnderAge.new(birth_date: 19.years.ago)).to_not be_valid
       end
     end
 
-    context '17 years old' do
-      it 'is valid' do
-        expect(TestUserUnderAge.new(birth_date: 17.years.ago)).to be_valid
-      end
-    end
-
     context '18 years old' do
       it 'is not valid' do
         expect(TestUserUnderAge.new(birth_date: 18.years.ago)).to_not be_valid
@@ -46,18 +46,18 @@ describe BirthDateValidator do
   end
 
   describe 'user has to have from 18 and 30 years' do
-    context '17 years old' do
-      it 'is not valid' do
-        expect(TestUserRange.new(birth_date: 17.years.ago)).to_not be_valid
-      end
-    end
-
     context '30 years old' do
       it 'is valid' do
         expect(TestUserRange.new(birth_date: 30.years.ago)).to be_valid
       end
     end
 
+    context '17 years old' do
+      it 'is not valid' do
+        expect(TestUserRange.new(birth_date: 17.years.ago)).to_not be_valid
+      end
+    end
+
     context '31 years old' do
       it 'is not valid' do
         expect(TestUserRange.new(birth_date: 31.years.ago)).to_not be_valid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: birth_date_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - Giovanni Capuano
@@ -66,8 +66,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Set through various parameters the minimum or the range of ages in which
-  your users have to be.
+description: Minimal birth date validator to check if the user has the right age to
+  sign in the website.
 email: webmaster@giovannicapuano.net
 executables: []
 extensions: []