age_jp 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6272b2d23018dac1ebbc09e95fba7451b5252577
-  data.tar.gz: 0d3539915128036711c665758edff451347cebcb
+  metadata.gz: c6e5f82f1001e56b0520f64d3c9ccf71eb1f52d0
+  data.tar.gz: 85bb623b269d19d63e48852e3f2df65d38c04f54
 SHA512:
-  metadata.gz: 5abce402708d389e45665bccf2bb9399d64bf8ea659fc75a22378d0ad4f499ee2940c22d7b9a0ce4ca8e362800c3bb676d1fd7076066ce4ee9c378d0f2124d7f
-  data.tar.gz: 546cf36d8c61e9a0133f117fbe81fb394a4a2419c1bd9d71ee416d1556d93930be2c54b7e663bc0b40a691609243eee7c8d14fc92adfbe40ecf2f323f8cc97be
+  metadata.gz: bc08771533fb350e0e8b007fae3243ebf892dd358cbc85092ad4e369daa03f384d7aca3b3a64fa5d40f8971c8419f79b9a1b8c5c7906f49c6641ac31b0ab946b
+  data.tar.gz: 3c5f3c2d95fb7a547767db168b9f0e00c13676cacacff78c166dcdf814b3fab67ec19043b7a3dc069a6701b4eff1238a2df0588001c7dad451192743ef25ac3c

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 2.2.9
+  - 2.3.5
+  - 2.4.3
+  - 2.5.0
+before_install:
+  - gem update --system
+  - gem install bundler -v 1.16.1
+cache: bundler

data/README.md

@@ -1,5 +1,7 @@
 # AgeJp
 
+[![Build Status](https://travis-ci.org/ryoff/age_jp.svg?branch=master)](https://travis-ci.org/ryoff/age_jp)
+
 日本の法律に則った年齢計算です
 [年齢計算ニ関スル法律 - Wikipedia](http://ja.wikipedia.org/wiki/%E5%B9%B4%E9%BD%A2%E8%A8%88%E7%AE%97%E3%83%8B%E9%96%A2%E3%82%B9%E3%83%AB%E6%B3%95%E5%BE%8B)
 
@@ -28,13 +30,13 @@ Timecop.freeze(Time.new(2014, 12, 31))
 
 birthday = Date.new(2000, 1, 1)
 birthday.age                                      # 14 (通常の年齢)
-birthday.age_at(Date.today)                       # same as birthday.age_at
+birthday.age_at(Date.today)                       # same as birthday.age
 birthday.age_jp                                   # 15 (日本の法律準拠)
-birthday.age_jp_at(Date.today)                    # same as birthday.age_jp_at
+birthday.age_jp_at(Date.today)                    # same as birthday.age_jp
 birthday.east_asian_age_reckoning                 # 15 (数え年)
-birthday.east_asian_age_reckoning_at(Date.today)  # same as birthday.east_asian_age_reckoning_at
+birthday.east_asian_age_reckoning_at(Date.today)  # same as birthday.east_asian_age_reckoning
 birthday.insurance_age                            # 14 (保険年齢)
-birthday.insurance_age_at(Date.today)             # same as birthday.insurance_age_at
+birthday.insurance_age_at(Date.today)             # same as birthday.insurance_age
 birthday.to_years_old(17)                         # 2017/01/01. 17歳の誕生日を返却
 birthday.to_years_old_jp(17)                      # 2016/12/31. 17歳の年齢加算日(日本の法律準拠)を返却
 ```

data/Rakefile

@@ -1,2 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/age_jp.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport", '>= 3.2'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "timecop", '~> 0.7'
+  spec.add_development_dependency "bundler", ">= 1.0"
+  spec.add_development_dependency "rake", ">= 10.0"
+  spec.add_development_dependency "rspec", '~> 3.0'
+  spec.add_development_dependency "timecop"
 end

data/lib/age_jp/calculator.rb

@@ -1,36 +1,38 @@
 module AgeJp
   class Calculator
+    attr_reader :birthday
+
     def initialize(birthday)
       @birthday = birthday
     end
 
-    def age_at(date = today)
+    def age_at(date = Date.current)
       return unless valid_birthday? && valid_date?(date)
 
       calculate_age(date)
     end
 
-    def age_jp_at(date = today)
+    def age_jp_at(date = Date.current)
       return unless valid_birthday? && valid_date?(date)
 
       calculate_age_jp(date)
     end
 
-    def east_asian_age_reckoning_at(date = today)
+    def east_asian_age_reckoning_at(date = Date.current)
       return unless valid_birthday? && valid_date?(date)
 
       age = calculate_age(date)
       until_birthday_this_year?(date) ? age + 2 : age + 1
     end
 
-    def insurance_age_at(date = today)
+    def insurance_age_at(date = Date.current)
       return unless valid_birthday? && valid_date?(date)
 
       # date時点での満年齢を取得
       age = calculate_age(date)
 
       # その年齢に到達した誕生日を取得
-      last_birthday = @birthday.next_year(age)
+      last_birthday = birthday.next_year(age)
 
       # 前回の誕生日から計算基準日までの月差分を取得
       month_diff = (date.year * 12 + date.month) - (last_birthday.year * 12 + last_birthday.month)
@@ -58,38 +60,35 @@ module AgeJp
 
     private
 
-    def today
-      Date.today
-    end
-
     def calculate_age_jp(date)
       # 誕生日が閏日の場合は、日本の民法ではdateが閏年であろうとなかろうと、2/28に年齢加算される
       # つまり、誕生日が閏日 かつ dateが2/27の場合は、閏年であろうと無かろうと、年齢加算しない
-      return calculate_age(date) if leap_date?(@birthday) && february_twenty_seven?(date)
+      return calculate_age(date) if leap_date?(birthday) && february_twenty_seven?(date)
 
       (calculate_age(date) - calculate_age(date.tomorrow)).zero? ? calculate_age(date) : calculate_age(date.tomorrow)
     end
 
     def calculate_age(date)
       date_ymd_to_i     = date.strftime('%Y%m%d').to_i
-      birthday_ymd_to_i = @birthday.strftime('%Y%m%d').to_i
+      birthday_ymd_to_i = birthday.strftime('%Y%m%d').to_i
 
       # 誕生日が閏日 かつ dateが閏年ではない場合
-      birthday_ymd_to_i -= 1 if leap_date?(@birthday) && !date.leap?
+      birthday_ymd_to_i -= 1 if leap_date?(birthday) && !date.leap?
 
       (date_ymd_to_i - birthday_ymd_to_i) / 10_000
     end
 
     def until_birthday_this_year?(date)
-      date.strftime('%m%d').to_i < @birthday.strftime('%m%d').to_i
+      date.strftime('%m%d').to_i < birthday.strftime('%m%d').to_i
     end
 
     def valid_birthday?
-      valid_date?(@birthday)
+      valid_date?(birthday)
     end
 
     def valid_date?(date)
-      fail ArgumentError, 'invalid date' unless date && date.is_a?(Date)
+      raise ArgumentError, 'invalid date' unless date && date.is_a?(Date)
+
       true
     end
 

data/lib/age_jp/version.rb

@@ -1,3 +1,3 @@
 module AgeJp
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: age_jp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - ryoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,58 +28,58 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 description: A simpel age calculator for a law of Japan.
 email:
 - ryoffes@gmail.com
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -119,11 +120,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simpel age calculator for a law of Japan.
 test_files:
 - spec/age_jp_spec.rb
 - spec/spec_helper.rb
-has_rdoc: