era_ja 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0cd9f5424cd1252076c713acee568acc088b793
-  data.tar.gz: 504477b56ccb23b8f4701905a65c109fb66220fb
+  metadata.gz: 3dc968407d2aa1d8d89f19820529c1ec39b646bf
+  data.tar.gz: 7c695884e466ccb5cd18fcdb60a5ac3b87bdda1f
 SHA512:
-  metadata.gz: 0237e8246990ae7463dc13995e8532280bcfb74a27fc91e9ec6e29ce58409962b9abd2dafdb7781c9eedef06d84ed8d38231190f338bff770bc262c65d37e306
-  data.tar.gz: e8c1ca1ab4fc487152966802bd8526ba4d7976ad91ff1b641b9df248c2e890016fb6184ad7fa622f5f904bbe5d639f60f048d441b9ab94b8f48049db974e0ad0
+  metadata.gz: 058f66ea666f5f3a158061d26fcb0a7f696ae1973cbc3b0adb2150bddb2e0f0b1ff03d34247375df55a6974cc99e61fbbb13c76d5657213cdeb44445a0d2e1c3
+  data.tar.gz: 21f3aa1bd3ab10df432c69d827d6624d8f1df1b548ae562c0304577ec3f04cf6d944f9e0084ec06780af0d7be6ae8ad79fd453b7811fd6e7471c9bdc2e152ca6

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
+  - 2.3.0
 script: bundle exec rspec spec

data/README.ja.md

@@ -62,6 +62,13 @@ Date.new(2012,4,29).to_era("%Jy年%Jm月%Jd日")    # => "二千十二年四月
 
 ### Era names ###
 
+もし１桁の元号文字列でコンバートしたい場合、 `%1O` を使用することができます。
+
+```ruby
+require 'era_ja'
+Time.mktime(2012,4,29).to_era("%1O%E年%m月%d日") # => "平24年4月29日"
+```
+
 もしデフォルトの元号文字列以外の文字列でコンバートしたい場合、 `era_names` を使用することができます。
 
 ```ruby

data/README.md

@@ -26,16 +26,17 @@ See [.travis.yml](https://github.com/tomiacannondale/era_ja/blob/master/.travis.
 
 ### format string
 
-Strftime format string can be used as an argument.
+strftime format string can be used as an argument.
 
-EraJa#to_era of extra format string is follow.
+Extra format strings provided by EraJa#to_era are:
 
-* %o: era(alphabet)
-* %O: era(kanzi)
-* %E: era year
-* %J: kanzi number
+* %o:  era(alphabet)
+* %O:  era(kanzi)
+* %1O: era(single kanzi)
+* %E:  era year
+* %J:  kanzi numeral
 
-### Time instance to japanese era
+### Time instance to Japanese era
 
 ```ruby
 require 'era_ja'
@@ -44,7 +45,7 @@ Time.mktime(2012,4,29).to_era("%O%E年%m月%d日") # => "平成24年4月29日"
 Time.mktime(2012,4,29).to_era("%O%JE年%Jm月%Jd日") # => "平成二十四年四月二十九日"
 ```
 
-### Date instance to japanese era
+### Date instance to Japanese era
 
 ```ruby
 require 'era_ja'
@@ -53,7 +54,7 @@ Date.new(2012,4,29).to_era("%O%E年%m月%d日") # => "平成24年4月29日"
 Date.new(2012,4,29).to_era("%O%JE年%Jm月%Jd日") # => "平成二十四年四月二十九日"
 ```
 
-### Change number to kansuuzi ###
+### Convert numerals to kanzi ###
 
 ```ruby
 Time.mktime(2012,4,29).to_era("%Jy年%Jm月%Jd日") # => "二千十二年四月二十九日"
@@ -62,7 +63,14 @@ Date.new(2012,4,29).to_era("%Jy年%Jm月%Jd日")    # => "二千十二年四月
 
 ### Era names ###
 
-If you want to convert custom ara string, you can set `era_names` .
+To convert to single kanji era strings, you can use `%1O`.
+
+```ruby
+require 'era_ja'
+Time.mktime(2012,4,29).to_era("%1O%E年%m月%d日") # => "平24年4月29日"
+```
+
+To convert to custom era strings, you can set `era_names` .
 
 ```ruby
 require 'era_ja'
@@ -82,14 +90,14 @@ Report issues and feature requests to github Issues. https://github.com/tomiacan
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create a new Pull Request
 
 ## Note
 
-I think about the era and there is a problem in the following.
+The following issues exist regarding era:
 
-* The date in the lunar calendar Although it is September 8, 1868 the start of the Meiji era.
-* Start date Taisho, Showa is the same day as the last day of the Meiji, Taisho, respectively.
+* The Meiji era starts at September 8, 1866, but that date is in the old Japanese lunar calendar.
+* The start dates of the Taisho and Showa eras are the same as the end dates of the Meiji and Taisho eras respectively.
   * [昭和ト改元](http://ja.wikisource.org/wiki/%e6%98%ad%e5%92%8c%e3%83%88%e6%94%b9%e5%85%83)
   * [大正十五年十二月ニ十五日以後ヲ改メテ昭和元年ト爲ス](http://ja.wikisource.org/wiki/%e5%a4%a7%e6%ad%a3%e5%8d%81%e4%ba%94%e5%b9%b4%e5%8d%81%e4%ba%8c%e6%9c%88%e3%83%8b%e5%8d%81%e4%ba%94%e6%97%a5%e4%bb%a5%e5%be%8c%e3%83%b2%e6%94%b9%e3%83%a1%e3%83%86%e6%98%ad%e5%92%8c%e5%85%83%e5%b9%b4%e3%83%88%e7%88%b2%e3%82%b9)
   * [明治45年（1912）7月｜大正と改元：日本のあゆみ](http://www.archives.go.jp/ayumi/kobetsu/m45_1912_01.html)
@@ -100,4 +108,4 @@ tomi tomiacannondale@gmail.com
 
 ## License
 
-MIT License. For more imformation, please see LICENSE.
+MIT License. For more information, please see LICENSE.

data/lib/era_ja/conversion.rb

@@ -10,6 +10,8 @@ module EraJa
       heisei: ["H", "平成"]
     }
 
+    ERR_DATE_OUT_OF_RANGE = "#to_era only works on dates after 1868,9,8"
+
     # Convert to Japanese era.
     # @param [String] format_string
     #   Time#strftime format string can be used
@@ -19,22 +21,23 @@ module EraJa
     #   * %E - era year
     #   * %J - kanzi number
     # @param [Hash] era_names
-    #    If you want to convert custom era string(ex `平`, `h`), you can set this argument.
+    #    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`.
-    #    value is ["alphabet era name"(ex `h`, `s`)(related to `%o`), "multibyte ara name"(ex `平`, `昭`)(related to `%O`)].
+    #    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]
     def to_era(format = "%o%E.%m.%d", era_names: ERA_NAME_DEFAULTS)
       @era_format = format.gsub(/%J/, "%J%")
       str_time = strftime(@era_format)
       if @era_format =~ /%E/
-        if self.to_time < ::Time.mktime(1868,9,8)
-          raise "#to_era is expeted later in 1868,9,8"
-        elsif self.to_time < ::Time.mktime(1912,7,30)
+        case
+        when self.to_time < ::Time.mktime(1868,9,8)
+          raise ERR_DATE_OUT_OF_RANGE
+        when self.to_time < ::Time.mktime(1912,7,30)
           str_time = era_year(year - 1867, :meiji, era_names)
-        elsif self.to_time < ::Time.mktime(1926,12,25)
+        when self.to_time < ::Time.mktime(1926,12,25)
           str_time = era_year(year - 1911, :taisho, era_names)
-        elsif self.to_time < ::Time.mktime(1989,1,8)
+        when self.to_time < ::Time.mktime(1989,1,8)
           str_time = era_year(year - 1925, :showa, era_names)
         else
           str_time = era_year(year - 1988, :heisei, era_names)
@@ -45,14 +48,17 @@ module EraJa
 
     private
     def era_year(year, era, era_names)
-      strftime(@era_format).sub(/(%J)?%E/) { format_year(year, $1) }.sub(/%o/i) { format_era(era, era_names) }
+      strftime(@era_format).sub(/(%J)?%E/) { format_year(year, $1) }.sub(/%1?o/i) { format_era(era, era_names) }
     end
 
     def format_era(era, era_names)
-      if @era_format =~ /%o/
-        return era_names.fetch(era)[0]
-      elsif @era_format =~ /%O/
-        return era_names.fetch(era)[1]
+      case
+      when @era_format =~ /%o/
+        era_names.fetch(era)[0]
+      when @era_format =~ /%1O/
+        era_names.fetch(era)[1][0]
+      when @era_format =~ /%O/
+        era_names.fetch(era)[1]
       end
     end
 

data/lib/era_ja/version.rb

@@ -1,3 +1,3 @@
 module EraJa
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ RSpec.shared_examples "should equal 'h24.04.29'" do
 
     context "when era_names have no heisei values" do
       let(:era_names) { { showa: ["s", "昭和"] } }
-      it { expect { subject.to_era(era_names: era_names) }.to raise_error }
+      it { expect { subject.to_era(era_names: era_names) }.to raise_error(KeyError) }
     end
   end
 
@@ -34,6 +34,12 @@ RSpec.shared_examples "should equal '平成24年04月29日'" do
   end
 end
 
+RSpec.shared_examples "should equal '平24年04月29日'" do
+  context "with '%1O%E年%m月%d日'" do
+    it { expect(subject.to_era("%1O%E年%m月%d日")).to eq "平24年04月29日" }
+  end
+end
+
 RSpec.shared_examples "should equal '24.04.29'" do
   context "with '%E.%m.%d'" do
     it { expect(subject.to_era("%E.%m.%d")).to eq "24.04.29" }
@@ -63,7 +69,7 @@ RSpec.shared_examples "should equal '平240429'" do
 
     context "when era_names have no heisei values" do
       let(:era_names) { { showa: ["S", "昭"] } }
-      it { expect { subject.to_era(format, era_names: era_names) }.to raise_error }
+      it { expect { subject.to_era(format, era_names: era_names) }.to raise_error(KeyError) }
     end
   end
 end
@@ -104,6 +110,10 @@ RSpec.shared_examples "should equal '昭和64.01.07'" do
   it { expect(subject.to_era("%O%E.%m.%d")).to eq "昭和64.01.07" }
 end
 
+RSpec.shared_examples "should equal '昭64.01.07'" do
+  it { expect(subject.to_era("%1O%E.%m.%d")).to eq "昭64.01.07" }
+end
+
 RSpec.shared_examples "should equal 'S01.12.25'" do
   it { expect(subject.to_era).to eq "S01.12.25" }
 end
@@ -120,6 +130,10 @@ RSpec.shared_examples "should equal '大正01.07.30'" do
   it { expect(subject.to_era("%O%E.%m.%d")).to eq "大正01.07.30" }
 end
 
+RSpec.shared_examples "should equal '大01.07.30'" do
+  it { expect(subject.to_era("%1O%E.%m.%d")).to eq "大01.07.30" }
+end
+
 RSpec.shared_examples "should equal 'M45.07.29'" do
   it { expect(subject.to_era).to eq "M45.07.29" }
 end
@@ -128,18 +142,23 @@ RSpec.shared_examples "should equal '明治45.07.29'" do
   it { expect(subject.to_era("%O%E.%m.%d")).to eq "明治45.07.29" }
 end
 
+RSpec.shared_examples "should equal '明45.07.29'" do
+  it { expect(subject.to_era("%1O%E.%m.%d")).to eq "明45.07.29" }
+end
+
 RSpec.shared_examples "should equal 'M01.09.08'" do
   it { expect(subject.to_era).to eq "M01.09.08" }
 end
 
 RSpec.shared_examples "should raise error" do
-  it { expect {subject.to_era}.to raise_error(RuntimeError, "#to_era is expeted later in 1868,9,8") }
+  it { expect {subject.to_era}.to raise_error(RuntimeError, EraJa::Conversion::ERR_DATE_OUT_OF_RANGE) }
 end
 
 RSpec.shared_examples "2012,4,29" do
   include_examples "should equal 'H24.04.29'"
   include_examples "should equal 'h24.04.29'"
   include_examples "should equal '平成24年04月29日'"
+  include_examples "should equal '平24年04月29日'"
   include_examples "should equal '24.04.29'"
   include_examples "should equal '2404'"
   include_examples "should equal '平成240429'"
@@ -156,6 +175,7 @@ end
 RSpec.shared_examples "1989,1,7" do
   include_examples "should equal 'S64.01.07'"
   include_examples "should equal '昭和64.01.07'"
+  include_examples "should equal '昭64.01.07'"
 end
 
 RSpec.shared_examples "1926,12,25" do
@@ -169,11 +189,13 @@ end
 RSpec.shared_examples "1912,7,30" do
   include_examples "should equal 'T01.07.30'"
   include_examples "should equal '大正01.07.30'"
+  include_examples "should equal '大01.07.30'"
 end
 
 RSpec.shared_examples "1912,7,29" do
   include_examples "should equal 'M45.07.29'"
   include_examples "should equal '明治45.07.29'"
+  include_examples "should equal '明45.07.29'"
 end
 
 RSpec.shared_examples "1868,9,8" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: era_ja
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - tomi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2016-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake