age_calculator 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bada8221cdeadfc09ed63a8f275efcc302b3084e
-  data.tar.gz: 9c3fb7c34164a261153b64723a2ce4e713842bd2
+SHA256:
+  metadata.gz: aee3d23e9bb225c4c03eb269c6a14da8c0f02c2bc8f0b389e0df617523f468d7
+  data.tar.gz: f5efaf19f902905a43cac4d84ffb3b3f2b69a4fa2d09a09fe3079041d3a7d399
 SHA512:
-  metadata.gz: a2ffd2f24b305147d379716ab71e216f8ba0d0910b9054ca83d95759499f51518f456d437a2e65d5959fd1808bedf71b9789f52be03f8ca3a65c553eedd4f8eb
-  data.tar.gz: a3ad1f02314fdc79975b2a059c171e818e4b29a1cda9ff5380e27661cc75371d322e12fc59a7b39201c00bc0ba68948ffff3a843b30a196495b91735de8074f7
+  metadata.gz: 3d764ffaef4eaab4c5021055098d5c28e3ddb1a9ece41893aae16e4731a85c355c19caee51fcfb4f631d1e83660682c53432c7b891239dfb63a84f877715d194
+  data.tar.gz: 8a8b31faa16c1e51a77c4f06e69dac481b7e7115cacc839d54a1d284597cab40a0b769c3af9c79361a8a176942c4407ddcdb8b04f8130967e834ac264a48e937

data/README.md

@@ -12,14 +12,14 @@ Here's the simplest, cleanest way:
 (today.to_s(:number).to_i - birthday.to_s(:number).to_i) / 10000
 ```
 
-Suppose today is May 16, 2014 and calculate the age of people whose birthdays are May 15, 1996 (should be 18 years old) and May 17, 1996 (should be 17 years old) respectively.
+Suppose today is May 16, 2018 and calculate the age of people whose birthdays are May 15, 2000 (should be 18 years old) and May 17, 2000 (should be 17 years old) respectively.
 
 ```ruby
-> 20140516 - 19960517
+> 20180516 - 20000517
  => 179999
 > 179999 / 10000
  => 17
-> 20140516 - 19960515
+> 20180516 - 20000515
  => 180001
 > 180001 / 10000
  => 18
@@ -27,6 +27,8 @@ Suppose today is May 16, 2014 and calculate the age of people whose birthdays ar
 
 Couldn't be simpler. Note that Ruby truncates the decimal fraction.
 
+AgeCalculator is a small library to do just that.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -46,10 +48,14 @@ $ gem install age_calculator
 For a basic usage:
 
 ```ruby
-birthday = Date.new(1987,12,31)
+birthday = Date.new(2000,1,1)
+ac = AgeCalculator.new(birthday)
+
+ac.age
+=> 18
 
-AgeCalculator.new(birthday).age
- => 26
+ac.age(asof: Date.new(2020,1,1))
+=> 20
 ```
 
 For a model with a validation on the age:
@@ -58,6 +64,11 @@ For a model with a validation on the age:
 class Adult < ActiveRecord::Base
   validates :birthday, age: { over: 18 }
 
+end
+
+class Adult < ActiveRecord::Base
+  validates :birthday, age: { over: 18, asof: Date.today.beginning_of_year }
+
 end
 ```
 

data/age_calculator.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 

data/bin/console

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'age_calculator'
+
+require_relative '../test/load_models'
+
+require 'irb'
+IRB.start

data/lib/age_calculator.rb

@@ -5,11 +5,14 @@ require 'age_calculator/railtie' if defined?(Rails)
 class AgeCalculator
   def initialize(birthday)
     @birthday = birthday
+
+    unless @birthday.is_a?(Date)
+      fail ArgumentError, "#{@birthday.inspect} is not a date"
+    end
   end
 
-  def age
-    return unless @birthday
-    (today.strftime('%Y%m%d').to_i - @birthday.strftime('%Y%m%d').to_i) / 10000
+  def age(asof: nil)
+    ((asof || today).strftime('%Y%m%d').to_i - @birthday.strftime('%Y%m%d').to_i) / 10000
   end
 
   def today

data/lib/age_calculator/railtie.rb

@@ -3,8 +3,7 @@ class AgeCalculator
     initializer 'age_calculator.active_model' do |app|
       require 'age_calculator/validator'
 
-      locale_path = Dir.glob(File.expand_path('../../../config/locales/*.yml', __FILE__))
-      I18n.load_path += locale_path unless I18n.load_path.include?(locale_path)
+      I18n.load_path += Pathname.new(__FILE__).dirname.parent.parent.glob('config/locales/*.yml')
     end
   end
 end

data/lib/age_calculator/validator.rb

@@ -5,7 +5,7 @@ class AgeValidator < ActiveModel::EachValidator
     return record.errors.add(attribute, :blank, options) if value.blank?
     return record.errors.add(attribute, :not_date, options) unless value.is_a?(Date)
 
-    age = AgeCalculator.new(value).age
+    age = AgeCalculator.new(value).age(asof: options[:asof])
 
     options.slice(*COMPARATORS.keys).each do |option_key, option_value|
       unless age.send(COMPARATORS[option_key], option_value.to_i)

data/lib/age_calculator/version.rb

@@ -1,3 +1,3 @@
 class AgeCalculator
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/test/age_calculator_test.rb

@@ -2,15 +2,28 @@ require 'test_helper'
 
 describe AgeCalculator do
   it 'calculates age from birthday' do
-    travel_to Date.new(2014,1,2) do
-      ac = AgeCalculator.new Date.new(1996,1,1)
+    travel_to Date.new(2018,1,2) do
+      ac = AgeCalculator.new Date.new(2000,1,1)
       ac.age.must_equal 18
 
-      ac = AgeCalculator.new Date.new(1996,1,2)
+      ac = AgeCalculator.new Date.new(2000,1,2)
       ac.age.must_equal 18
 
-      ac = AgeCalculator.new Date.new(1996,1,3)
+      ac = AgeCalculator.new Date.new(2000,1,3)
       ac.age.must_equal 17
     end
   end
+
+  it 'calculates age based on a given date' do
+    ac = AgeCalculator.new Date.new(2000,1,2)
+
+    ac.age(asof: Date.new(2018,1,1)).must_equal 17
+    ac.age(asof: Date.new(2018,1,2)).must_equal 18
+    ac.age(asof: Date.new(2018,1,3)).must_equal 18
+  end
+
+  it 'raises an error with an invalid date' do
+    error = -> { AgeCalculator.new nil }.must_raise ArgumentError
+    error.message.must_match(/nil is not a date/)
+  end
 end

data/test/age_validator_test.rb

@@ -6,24 +6,21 @@ describe AgeValidator do
   end
 
   it 'validates age' do
-    travel_to Date.new(2014,1,2) do
-      @adult.birthday = Date.new(1996,1,1)
-      @adult.age.must_equal 18
+    travel_to Date.new(2018,1,2) do
+      @adult.birthday = Date.new(2000,1,1)
       @adult.valid?.must_equal true
 
-      @adult.birthday = Date.new(1996,1,2)
-      @adult.age.must_equal 18
+      @adult.birthday = Date.new(2000,1,2)
       @adult.valid?.must_equal true
 
-      @adult.birthday = Date.new(1996,1,3)
-      @adult.age.must_equal 17
+      @adult.birthday = Date.new(2000,1,3)
       @adult.valid?.must_equal false
       @adult.errors.full_messages.first.must_equal 'Birthday must be over 18'
     end
   end
 
   it 'validates presence' do
-    travel_to Date.new(2014,1,2) do
+    travel_to Date.new(2018,1,2) do
       @adult.birthday = nil
       @adult.valid?.must_equal false
       @adult.errors.full_messages.first.must_equal "Birthday can't be blank"
@@ -31,7 +28,7 @@ describe AgeValidator do
   end
 
   it 'validates date' do
-    travel_to Date.new(2014,1,2) do
+    travel_to Date.new(2018,1,2) do
       @adult.birthday = 'invalid'
       @adult.valid?.must_equal false
       @adult.errors.full_messages.first.must_equal 'Birthday is not a valid date'
@@ -41,9 +38,22 @@ describe AgeValidator do
   it 'allows blank' do
     adult = AdultAllowBlank.new
 
-    travel_to Date.new(2014,1,2) do
+    travel_to Date.new(2018,1,2) do
       adult.birthday = nil
       adult.valid?.must_equal true
     end
   end
+
+  it 'validates age as of 2018-01-02' do
+    adult = AdultAsOf.new
+
+    adult.birthday = Date.new(2000,1,1)
+    adult.valid?.must_equal true
+
+    adult.birthday = Date.new(2000,1,2)
+    adult.valid?.must_equal true
+
+    adult.birthday = Date.new(2000,1,3)
+    adult.valid?.must_equal false
+  end
 end

data/test/load_models.rb

@@ -0,0 +1,36 @@
+require 'active_model'
+require 'age_calculator/validator'
+
+# Set timezone
+require 'active_support/time' # For testing Date and TimeWithZone objects
+Time.zone = 'Hawaii'
+
+# Enable travel_to
+require 'active_support/testing/time_helpers'
+include ActiveSupport::Testing::TimeHelpers
+
+# Locale
+I18n.enforce_available_locales = true
+I18n.load_path += Pathname.new(__FILE__).dirname.parent.glob('config/locales/*.yml')
+
+class Adult
+  include ActiveModel::Validations
+  attr_accessor :birthday
+  validates :birthday, age: { over: 18 }
+
+  def age(asof: nil)
+    AgeCalculator.new(birthday).age(asof: asof)
+  end
+end
+
+class AdultAllowBlank
+  include ActiveModel::Validations
+  attr_accessor :birthday
+  validates :birthday, age: { over: 18 }, allow_blank: true
+end
+
+class AdultAsOf
+  include ActiveModel::Validations
+  attr_accessor :birthday
+  validates :birthday, age: { over: 18, asof: Date.new(2018,1,2) }
+end

data/test/test_helper.rb

@@ -1,37 +1,6 @@
 require 'minitest/autorun'
+require 'minitest/pride'
 require 'minitest/spec'
-require 'active_model'
 require 'age_calculator'
-require 'age_calculator/validator'
 
-# Set timezone
-require 'active_support/time' # For testing Date and TimeWithZone objects
-Time.zone = 'Hawaii'
-
-# Enable travel_to
-require 'active_support/testing/time_helpers'
-include ActiveSupport::Testing::TimeHelpers
-
-# Locale
-I18n.enforce_available_locales = true
-I18n.load_path += Dir.glob(File.expand_path('../../config/locales/*.yml', __FILE__))
-
-class Adult
-  include ActiveModel::Validations
-  attr_accessor :birthday
-  validates :birthday, age: { over: 18 }
-
-  def age
-    AgeCalculator.new(birthday).age
-  end
-end
-
-class AdultAllowBlank
-  include ActiveModel::Validations
-  attr_accessor :birthday
-  validates :birthday, age: { over: 18 }, allow_blank: true
-
-  def age
-    AgeCalculator.new(birthday).age
-  end
-end
+require 'load_models'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: age_calculator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -65,6 +65,7 @@ files:
 - README.md
 - Rakefile
 - age_calculator.gemspec
+- bin/console
 - config/locales/en.yml
 - lib/age_calculator.rb
 - lib/age_calculator/railtie.rb
@@ -72,6 +73,7 @@ files:
 - lib/age_calculator/version.rb
 - test/age_calculator_test.rb
 - test/age_validator_test.rb
+- test/load_models.rb
 - test/test_helper.rb
 homepage: https://github.com/kenn/age_calculator
 licenses:
@@ -93,11 +95,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A simple age calculator that just works
 test_files:
 - test/age_calculator_test.rb
 - test/age_validator_test.rb
+- test/load_models.rb
 - test/test_helper.rb