japanese_calendar 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d5904f38ba5b838626a46e31be45e2a73329a3d
-  data.tar.gz: 814f791883585675c6799577b5a4c3d1bf0a0b62
+  metadata.gz: 32d4ce4f513c811d200136af280c962486e32bd5
+  data.tar.gz: 95395e12fd637cf92b479d1ee14cde9f090aa969
 SHA512:
-  metadata.gz: 853d9e4c2dd6a751f0e45ba58fb432f6e346b4ffbdfdd77f5996ae694e72e2f16a398ae2e85a0b6e8496e8de80e43c249f024136cdf2993f2df8209febda7167
-  data.tar.gz: 79dd32bb385d535d081a94400065cef92d7066d7e1d3097afc33473724e9b75d9db1c6580d2727e7717b2875ef10968176010a3a44fedbe19ed1e4e87bb1c0da
+  metadata.gz: a8665096c0364ab4a25ff043ba4e3a2ed23f60c8c7a7f5b641315621ff2a9a417375afead38a702727d1f5c8fc8a2da198ade9f4770a1b935a0f3828e2bba088
+  data.tar.gz: f2fadd2f711e4524bcb880e77bdd0d5bc4eb6ffe05e455a1bd19b84ea3d0ab3a9d5f996c87f1dfbff8db1992e8cb307785c5bec6765a410d68cb9ab00289b7d1

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
-To get a Japanese era name, use the `era_name` method:
+To get the Japanese era name, use the `era_name` method:
 
 ```
 Time.new(1989,  1,  8).era_name # => "平成"
@@ -29,6 +29,15 @@ Time.new(1912,  7, 30).era_name # => "大正"
 Time.new(1873,  1,  1).era_name # => "明治"
 ```
 
+If you want to get the Japanese era name in romaji, pass `:romaji`:
+
+```
+Time.new(1989,  1,  8).era_name(:romaji) # => "Heisei"
+Time.new(1926, 12, 25).era_name(:romaji) # => "Showa"
+Time.new(1912,  7, 30).era_name(:romaji) # => "Taisho"
+Time.new(1873,  1,  1).era_name(:romaji) # => "Meiji"
+```
+
 You can convert to a Japanese year with the `era_year` method:
 
 ```
@@ -58,8 +67,8 @@ time.strftime("%q") # => "日"
 
 # More examples
 time.strftime("%K%-J年%-m月%-d日(%q)") # => "平成1年1月1日(日)"
-time.strftime("%o%J.%m.%d")           # => H01.01.01
-time.strftime("%B %-d, %-Y (%O %-J)") # => January 1, 1989 (Heisei 1)
+time.strftime("%o%J.%m.%d")           # => "H01.01.01"
+time.strftime("%B %-d, %-Y (%O %-J)") # => "January 1, 1989 (Heisei 1)"
 ```
 
 ## Development

data/lib/japanese_calendar/era.rb

@@ -3,17 +3,31 @@ module JapaneseCalendar
   module Era
     # Returns the Japanese era name (nengo) since 1 January 1873 (Meiji 6).
     #
-    #   Time.new(1989,  1,  8).era_name # => "平成"
-    #   Time.new(1926, 12, 25).era_name # => "昭和"
-    #   Time.new(1912,  7, 30).era_name # => "大正"
-    #   Time.new(1873,  1,  1).era_name # => "明治"
+    #   heisei = Time.new(1989, 1, 8)  # => 1989-01-08 00:00:00 +0900
+    #   heisei.era_name                # => "平成"
+    #   heisei.era_name(:romaji)       # => "Heisei"
+    #
+    #   showa = Time.new(1926, 12, 25) # => 1926-12-25 00:00:00 +0900
+    #   showa.era_name                 # => "昭和"
+    #   showa.era_name(:romaji)        # => "Showa"
+    #
+    #   taisho = Time.new(1912, 7, 30) # => 1912-07-30 00:00:00 +0900
+    #   taisho.era_name                # => "大正"
+    #   taisho.era_name(:romaji)       # => "Taisho"
+    #
+    #   meiji = Time.new(1873, 1, 1)   # => 1873-01-01 00:00:00 +0900
+    #   meiji.era_name                 # => "明治"
+    #   meiji.era_name(:romaji)        # => "Meiji"
     #
     # Raises an error when the Japanese era name cannot be found.
     #
     #   Time.new(1872, 12, 31).era_name # => RuntimeError
     def era_name(character = :kanji)
-      raise ArgumentError unless %i(kanji romaji).include?(character)
-      find_era[:name][character]
+      unless %i(kanji romaji).include?(character)
+        raise ArgumentError, "invalid character"
+      end
+
+      current_era.send("#{character}_name")
     end
 
     # Returns the Japanese year since 1 January 1873 (Meiji 6).
@@ -27,7 +41,7 @@ module JapaneseCalendar
     #
     #   Time.new(1872, 12, 31).era_year # => RuntimeError
     def era_year
-      year - find_era[:beginning_of_period].year + 1
+      year - current_era.beginning_of_period.year + 1
     end
 
     # Formats time according to the directives in the given format string.
@@ -58,20 +72,21 @@ module JapaneseCalendar
     end
 
     private
+      Period = Struct.new(:beginning_of_period, :kanji_name, :romaji_name)
+
       MEIJI_6 = Time.new(1873, 1, 1)
 
       PERIODS = [
-        { name: { kanji: "平成", romaji: "Heisei" }, beginning_of_period: Time.new(1989,  1,  8) },
-        { name: { kanji: "昭和", romaji: "Showa" },  beginning_of_period: Time.new(1926, 12, 25) },
-        { name: { kanji: "大正", romaji: "Taisho" }, beginning_of_period: Time.new(1912,  7, 30) },
-        { name: { kanji: "明治", romaji: "Meiji" },  beginning_of_period: Time.new(1868,  1, 25) }
+        Period.new(Time.new(1989,  1,  8), "平成", "Heisei").freeze,
+        Period.new(Time.new(1926, 12, 25), "昭和", "Showa" ).freeze,
+        Period.new(Time.new(1912,  7, 30), "大正", "Taisho").freeze,
+        Period.new(Time.new(1868,  1, 25), "明治", "Meiji" ).freeze
       ].freeze
 
-      def find_era
-        raise "#{self.class.name.downcase} out of range" if self < MEIJI_6
-
-        ifnone = proc { raise "#{self.class.name.downcase} out of range" }
-        PERIODS.find(ifnone) { |period| period[:beginning_of_period] <= self }
+      def current_era
+        error_proc = proc { raise "#{self.class.name.downcase} out of range" }
+        error_proc.call if self < MEIJI_6
+        PERIODS.find(error_proc) { |period| period.beginning_of_period <= self }
       end
   end
 end

data/lib/japanese_calendar/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module JapaneseCalendar
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: japanese_calendar
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ryo Yamamoto