age_jp 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f44fd45916598f53ce0643a6a201317d91dc9235
-  data.tar.gz: bb9b82d8350e2f186f47376bad6d071350406be9
+  metadata.gz: 6272b2d23018dac1ebbc09e95fba7451b5252577
+  data.tar.gz: 0d3539915128036711c665758edff451347cebcb
 SHA512:
-  metadata.gz: 271b86089eb0341b1e3e98fd991595d0d1980155dc750078e6affdca72bfcad1f2baa75bd5d9ea65364305289cbab41619acdbc2a88ec615ddc37ddecc114b7a
-  data.tar.gz: 147d692c51cdce49cba2a29d64f1d37eb67ec9d18c6f90f449086c62cae4bad548f405cdea713d1d53c275e2f0e8772ab8a8fe375ad6b65b6a75cdab0612949c
+  metadata.gz: 5abce402708d389e45665bccf2bb9399d64bf8ea659fc75a22378d0ad4f499ee2940c22d7b9a0ce4ca8e362800c3bb676d1fd7076066ce4ee9c378d0f2124d7f
+  data.tar.gz: 546cf36d8c61e9a0133f117fbe81fb394a4a2419c1bd9d71ee416d1556d93930be2c54b7e663bc0b40a691609243eee7c8d14fc92adfbe40ecf2f323f8cc97be

data/.gitignore

@@ -1 +1,16 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log
 *.sw*
+.rspec

data/README.md

@@ -27,14 +27,16 @@ Or install it yourself as:
 Timecop.freeze(Time.new(2014, 12, 31))
 
 birthday = Date.new(2000, 1, 1)
-birthday.age                                # 14 (通常の年齢)
-birthday.age_at(date)                       # same as birthday.age_at(Date.today)
-birthday.age_jp                             # 15 (日本の法律準拠)
-birthday.age_jp_at(date)                    # same as birthday.age_jp_at(Date.today)
-birthday.east_asian_age_reckoning           # 15 (数え年)
-birthday.east_asian_age_reckoning_at(date)  # same as birthday.east_asian_age_reckoning_at(Date.today)
-birthday.to_years_old(17)                   # 2017/01/01. 17歳の誕生日を返却
-birthday.to_years_old_jp(17)                # 2016/12/31. 17歳の年齢加算日(日本の法律準拠)を返却
+birthday.age                                      # 14 (通常の年齢)
+birthday.age_at(Date.today)                       # same as birthday.age_at
+birthday.age_jp                                   # 15 (日本の法律準拠)
+birthday.age_jp_at(Date.today)                    # same as birthday.age_jp_at
+birthday.east_asian_age_reckoning                 # 15 (数え年)
+birthday.east_asian_age_reckoning_at(Date.today)  # same as birthday.east_asian_age_reckoning_at
+birthday.insurance_age                            # 14 (保険年齢)
+birthday.insurance_age_at(Date.today)             # same as birthday.insurance_age_at
+birthday.to_years_old(17)                         # 2017/01/01. 17歳の誕生日を返却
+birthday.to_years_old_jp(17)                      # 2016/12/31. 17歳の年齢加算日(日本の法律準拠)を返却
 ```
 
 ## Contributing

data/age_jp.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activesupport", '>= 3.2'
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/age_jp/calculator.rb

@@ -4,50 +4,64 @@ module AgeJp
       @birthday = birthday
     end
 
-    def age
-      return unless valid_birthday?
-
-      calculate_age(today)
-    end
-
-    def age_at(date)
+    def age_at(date = today)
       return unless valid_birthday? && valid_date?(date)
 
       calculate_age(date)
     end
 
-    def age_jp
-      return unless valid_birthday?
-
-      calculate_age_jp(today)
-    end
-
-    def age_jp_at(date)
+    def age_jp_at(date = today)
       return unless valid_birthday? && valid_date?(date)
 
       calculate_age_jp(date)
     end
 
-    def east_asian_age_reckoning
-      return unless valid_birthday?
+    def east_asian_age_reckoning_at(date = today)
+      return unless valid_birthday? && valid_date?(date)
 
-      age = calculate_age(today)
-      until_birthday_this_year?(today) ? age + 2 : age + 1
+      age = calculate_age(date)
+      until_birthday_this_year?(date) ? age + 2 : age + 1
     end
 
-    def east_asian_age_reckoning_at(date)
+    def insurance_age_at(date = today)
       return unless valid_birthday? && valid_date?(date)
 
+      # date時点での満年齢を取得
       age = calculate_age(date)
-      until_birthday_this_year?(date) ? age + 2 : age + 1
+
+      # その年齢に到達した誕生日を取得
+      last_birthday = @birthday.next_year(age)
+
+      # 前回の誕生日から計算基準日までの月差分を取得
+      month_diff = (date.year * 12 + date.month) - (last_birthday.year * 12 + last_birthday.month)
+
+      # 月差分だけlast_birthdayをmonths_sinceした日付と、dateを比較し、month_diffの値を調整する
+      # ex)
+      #   - last_birthday: 1/25
+      #   - date:          2/15
+      #   の場合、month_diffは、1だが、実際には0ヶ月差分としたい
+      #   - last_birthday.months_since(month_diff)  => 2/25
+      #   として、date < last_birthday.months_since(month_diff) の場合は、month_diff -= 1 を月差分とする
+      #
+      # last_birthday   date    month_diff    months_since後    adjusted_month_diff
+      # 2/25            2/27    0             2/25              0
+      # 2/25            3/1     1             3/25              0
+      # 2/25            3/27    1             3/25              1
+      # 2/25            4/1     2             4/25              1
+      # 2/25            4/27    2             4/25              2
+      month_diff -= 1 if date < last_birthday.months_since(month_diff)
+
+      age += 1 if month_diff > 6
+
+      age
     end
 
+    private
+
     def today
       Date.today
     end
 
-    private
-
     def calculate_age_jp(date)
       # 誕生日が閏日の場合は、日本の民法ではdateが閏年であろうとなかろうと、2/28に年齢加算される
       # つまり、誕生日が閏日 かつ dateが2/27の場合は、閏年であろうと無かろうと、年齢加算しない
@@ -75,7 +89,7 @@ module AgeJp
     end
 
     def valid_date?(date)
-      raise ArgumentError, 'invalid date' unless date && date.is_a?(Date)
+      fail ArgumentError, 'invalid date' unless date && date.is_a?(Date)
       true
     end
 

data/lib/age_jp/core_ext/date.rb

@@ -1,6 +1,6 @@
 class Date
   def age
-    AgeJp::Calculator.new(self).age
+    AgeJp::Calculator.new(self).age_at
   end
 
   def age_at(date)
@@ -8,7 +8,7 @@ class Date
   end
 
   def age_jp
-    AgeJp::Calculator.new(self).age_jp
+    AgeJp::Calculator.new(self).age_jp_at
   end
 
   def age_jp_at(date)
@@ -16,13 +16,21 @@ class Date
   end
 
   def east_asian_age_reckoning
-    AgeJp::Calculator.new(self).east_asian_age_reckoning
+    AgeJp::Calculator.new(self).east_asian_age_reckoning_at
   end
 
   def east_asian_age_reckoning_at(date)
     AgeJp::Calculator.new(self).east_asian_age_reckoning_at(date)
   end
 
+  def insurance_age
+    AgeJp::Calculator.new(self).insurance_age_at
+  end
+
+  def insurance_age_at(date)
+    AgeJp::Calculator.new(self).insurance_age_at(date)
+  end
+
   alias_method :to_years_old, :next_year
 
   def to_years_old_jp(n)

data/lib/age_jp/version.rb

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

data/spec/age_jp_spec.rb

@@ -76,6 +76,14 @@ describe AgeJp do
         it { expect(age_at).to eq 17 }
       end
     end
+
+    context 'invalid date' do
+      let(:birthday) { Date.new(2000, 1, 1) }
+      let(:invalid_date) { 'String' }
+      subject(:age_at) { birthday.age_at(invalid_date) }
+
+      it { expect { subject }.to raise_error(/invalid date/) }
+    end
   end
 
   describe '#age_jp' do
@@ -285,4 +293,56 @@ describe AgeJp do
       end
     end
   end
+
+  describe '#insurance_age' do
+    context "birthday is 2000/01/01. " do
+      let(:birthday) { Date.new(2000, 1, 1) }
+      subject(:insurance_age) { birthday.insurance_age }
+
+      context 'when today is 2015/01/01' do
+        before { Timecop.freeze(Date.new(2015, 1, 1)) }
+
+        it { expect(insurance_age).to eq 15 }
+      end
+
+      context 'when today is 2015/07/31' do
+        before { Timecop.freeze(Date.new(2015, 7, 31)) }
+
+        it { expect(insurance_age).to eq 15 }
+      end
+
+      context 'when today is 2015/08/01' do
+        before { Timecop.freeze(Date.new(2015, 8, 1)) }
+
+        it { expect(insurance_age).to eq 16 }
+      end
+
+      after { Timecop.return }
+    end
+
+    context "birthday is 2000/07/31. " do
+      let(:birthday) { Date.new(2000, 7, 31) }
+      subject(:insurance_age) { birthday.insurance_age }
+
+      context 'when today is 2016/02/28' do
+        before { Timecop.freeze(Date.new(2016, 2, 28)) }
+
+        it { expect(insurance_age).to eq 15 }
+      end
+
+      context 'when today is 2016/02/29' do
+        before { Timecop.freeze(Date.new(2016, 2, 29)) }
+
+        it { expect(insurance_age).to eq 16 }
+      end
+
+      context 'when today is 2016/03/01' do
+        before { Timecop.freeze(Date.new(2016, 3, 1)) }
+
+        it { expect(insurance_age).to eq 16 }
+      end
+
+      after { Timecop.return }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: age_jp
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - ryoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,9 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -128,3 +126,4 @@ summary: A simpel age calculator for a law of Japan.
 test_files:
 - spec/age_jp_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/.rspec

@@ -1,3 +0,0 @@
---color
---profile 3
---format documentation

data/Gemfile.lock

@@ -1,46 +0,0 @@
-PATH
-  remote: .
-  specs:
-    age_jp (0.0.2)
-      activesupport
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    diff-lcs (1.2.5)
-    i18n (0.7.0)
-    json (1.8.2)
-    minitest (5.5.1)
-    rake (10.4.0)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    thread_safe (0.3.5)
-    timecop (0.7.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  age_jp!
-  bundler (~> 1.7)
-  rake (~> 10.0)
-  rspec
-  timecop (~> 0.7)