era_ja 0.5.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3e6d411b206e4460b298f9aa2d98eb9e94e2fc2e
-  data.tar.gz: 18fdb71851b63ed43b398bf146df053d46e22f21
+SHA256:
+  metadata.gz: 58f5955178ca4a898c771451e6b33345acf59352ae6d89a1fc1334da5b0e2e3a
+  data.tar.gz: baef3d1dcc782d26d062095479f6f6121941d2a258e3870dbecbc1080fa3eaba
 SHA512:
-  metadata.gz: d1a156a3fcd0d4b379d16fbba05d6516051966a59938cdd8bb05fc2fbc3dc7eb5e9adc466139992b6d17ee793f21e0fa4f9380e1915bb1e42d47ffbf9fb524c0
-  data.tar.gz: fb3ff1d6ad6c8de4e0d2239dd3e25c1f6c5aa908e6a659183caa003a449422d1b713e1b093d5450947c292d03daf17b7b3bb1bda047ce86e7f39656c493cca8a
+  metadata.gz: a501415e87bc28d933553835d1baca333d5c67cd15becf01fca6cbe71ca662cf20e56e427e2bcbfb72dab2650026a1bdd96299ce37ca120614c4028420ac044b
+  data.tar.gz: f95522ba00aadfb7f3a97d3eaeb0b7a958f7817e20c3d0a76a618a9b34ef515022223792b794e04c568e8234c2d71607d3d237e7ba79ec203e9ffd91ce1760dd

data/.travis.yml

@@ -2,7 +2,9 @@ language: ruby
 rvm:
   - 2.0.0-p648
   - 2.1.10
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
+  - 2.2.10
+  - 2.3.8
+  - 2.4.5
+  - 2.5.5
+  - 2.6.2
 script: bundle exec rspec spec

data/lib/era_ja/conversion.rb

@@ -7,7 +7,8 @@ module EraJa
       meiji:  ["M", "明治"],
       taisho: ["T", "大正"],
       showa:  ["S", "昭和"],
-      heisei: ["H", "平成"]
+      heisei: ["H", "平成"],
+      reiwa: ["R", "令和"]
     }.freeze
 
     ERR_DATE_OUT_OF_RANGE = "#to_era only works on dates after 1868,9,8".freeze
@@ -22,7 +23,7 @@ module EraJa
     #   * %J - kanzi number
     # @param [Hash] era_names
     #    If you want to convert custom to era strings (eg `平`, `h`), you can set this argument.
-    #    key is `:meiji' or `:taisho' or `:showa` or `:heisei`.
+    #    key is `:meiji' or `:taisho' or `:showa` or `:heisei` or `:reiwa`.
     #    value is ["alphabet era name"(ex `h`, `s`)(related to `%o`), "multibyte era name"(eg `平`, `昭`)(related to `%O`)].
     #    this argument is same as one element of ERA_NAME_DEFAULTS.
     # @return [String]
@@ -39,8 +40,10 @@ module EraJa
           str_time = era_year(year - 1911, :taisho, era_names)
         when self.to_time < ::Time.mktime(1989,1,8)
           str_time = era_year(year - 1925, :showa, era_names)
-        else
+        when self.to_time < ::Time.mktime(2019, 5, 1)
           str_time = era_year(year - 1988, :heisei, era_names)
+        else
+          str_time = era_year(year - 2018, :reiwa, era_names)
         end
       end
       str_time.gsub(/%J(\d+)/) { to_kanzi($1) }
@@ -73,7 +76,7 @@ module EraJa
     def to_kanzi(numeric, kanzi = "")
       figures = (10 ** numeric.to_s.size) / 10
       numeric = numeric.to_i
-      kanzi_string = [nil, "一", "二", "三", "四", "五", "六", "七", "八", "九"]
+      kanzi_string = ["", "一", "二", "三", "四", "五", "六", "七", "八", "九"]
       figures_string = { 1000 => "千", 100 => "百", 10 => "十", 1 => "" }
       return kanzi + kanzi_string[numeric] if figures == 1
 

data/lib/era_ja/version.rb

@@ -1,3 +1,3 @@
 module EraJa
-  VERSION = "0.5.3"
+  VERSION = "1.0.0"
 end

data/spec/date_spec.rb

@@ -5,6 +5,21 @@ require File.expand_path('spec_helper', File.dirname(__FILE__))
 RSpec.describe Date do
   describe "#to_era" do
 
+    context "date is 2019,7,2" do
+      subject { Date.new(2019,7,2) }
+      include_examples "2019,7,2"
+    end
+
+    context 'date is 2019,5,1' do
+      subject { Date.new(2019,5,1) }
+      include_examples "2019,5,1"
+    end
+
+    context 'date is 2019,4,30' do
+      subject { Date.new(2019,4,30) }
+      include_examples "2019,4,30"
+    end
+
     context "date is 2012,4,29" do
       subject { Date.new(2012,4,29) }
       include_examples "2012,4,29"

data/spec/spec_helper.rb

@@ -1,6 +1,46 @@
 # -*- coding: utf-8 -*-
 require 'rspec'
 
+RSpec.shared_examples "should equal 'R01.07.02'" do
+  it { expect(subject.to_era).to eq "R01.07.02" }
+
+  context "with '%o%E.%m.%d'" do
+    it { expect(subject.to_era("%o%E.%m.%d")).to eq "R01.07.02" }
+  end
+end
+
+RSpec.shared_examples "should equal '令和01年07月02日'" do
+  context "with '%O%E年%m月%d日'" do
+    it { expect(subject.to_era("%O%E年%m月%d日")).to eq "令和01年07月02日" }
+  end
+end
+
+RSpec.shared_examples "should equal 'R01.05.01'" do
+  it { expect(subject.to_era).to eq "R01.05.01" }
+
+  context "with '%o%E.%m.%d'" do
+    it { expect(subject.to_era("%o%E.%m.%d")).to eq "R01.05.01" }
+  end
+end
+
+RSpec.shared_examples "should equal '令和01年05月01日'" do
+  context "with '%O%E年%m月%d日'" do
+    it { expect(subject.to_era("%O%E年%m月%d日")).to eq "令和01年05月01日" }
+  end
+end
+
+RSpec.shared_examples "should equal '平成三十一年四月三十日'" do
+  context "with '%O%JE年%Jm月%Jd日'" do
+    it { expect(subject.to_era("%O%JE年%Jm月%Jd日")).to eq "平成三十一年四月三十日" }
+  end
+end
+
+RSpec.shared_examples "should equal '二千十九年四月三十日'" do
+  context "with '%JY年%Jm月%Jd日'" do
+    it { expect(subject.to_era("%JY年%Jm月%Jd日")).to eq "二千十九年四月三十日" }
+  end
+end
+
 RSpec.shared_examples "should equal 'H24.04.29'" do
   it { expect(subject.to_era).to eq "H24.04.29" }
 
@@ -172,6 +212,21 @@ RSpec.shared_examples "should raise error" do
   it { expect {subject.to_era}.to raise_error(RuntimeError, EraJa::Conversion::ERR_DATE_OUT_OF_RANGE) }
 end
 
+RSpec.shared_examples "2019,7,2" do
+  include_examples "should equal 'R01.07.02'"
+  include_examples "should equal '令和01年07月02日'"
+end
+
+RSpec.shared_examples "2019,5,1" do
+  include_examples "should equal 'R01.05.01'"
+  include_examples "should equal '令和01年05月01日'"
+end
+
+RSpec.shared_examples "2019,4,30" do
+  include_examples "should equal '平成三十一年四月三十日'"
+  include_examples "should equal '二千十九年四月三十日'"
+end
+
 RSpec.shared_examples "2012,4,29" do
   include_examples "should equal 'H24.04.29'"
   include_examples "should equal 'h24.04.29'"

data/spec/time_spec.rb

@@ -5,6 +5,21 @@ require File.expand_path('spec_helper', File.dirname(__FILE__))
 RSpec.describe Time do
   describe "#to_era" do
 
+    context 'time is 2019,7,2' do
+      subject { Time.mktime(2019,7,2) }
+      include_examples "2019,7,2"
+    end
+
+    context 'time is 2019,5,1' do
+      subject { Time.mktime(2019,5,1) }
+      include_examples "2019,5,1"
+    end
+
+    context 'time is 2019,4,30' do
+      subject { Time.mktime(2019,4,30) }
+      include_examples "2019,4,30"
+    end
+
     context "time is 2012,4,29" do
       subject { Time.mktime(2012,4,29) }
       include_examples "2012,4,29"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: era_ja
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 1.0.0
 platform: ruby
 authors:
 - tomi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -139,8 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Convert Date or Time instance to String of Japanese era.