japanese_calendar 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 911eaaf3d1894319e9d2f7349c303fa236f7c7eb
-  data.tar.gz: 3a240bb75f650ab1559123df1272e66deff033a9
+SHA256:
+  metadata.gz: d6bd70c70fd16b249bd21b5d7859ead4d393887170bbd28734cc58df5b6397dd
+  data.tar.gz: d1c54d42d05800862841d3f22c1b4be0ddb2f1282dfd7222abcfe36cbdbcf5ff
 SHA512:
-  metadata.gz: 1135f2ec0097a8c9763bc4ef9e048241d24449f9e195de64ade0e54e045c479065588d2ebdeb8ad82dc5803a0df2cf0b1ab6c93abc1e401b3515864295f0dbb7
-  data.tar.gz: 7ed0a7ec12be84cb46a8a0f58dff1b444272b5c0c9466a18c01d073215a5476c229cd0dee185db0bfc0db3b95371e5effb999d158ec1662c8944c3ff2c8893e0
+  metadata.gz: 736514a1cbce60600b39dc1a96aeb816b2c7f31d8297f720ca903d851eca7454f2c4785e5a514d189a7ada6f515c9f5648ed72c305b09e07771f4efbcde7f0c7
+  data.tar.gz: d3b12a19c5a160d85483410f79fc9a7974ebacf64e2225c0aa28f7c56b0293769fe4c6b7f63f69a9629bb1863dba04c3178fda888d88a6c4b0f17988cd7307d7

data/.travis.yml

@@ -1,11 +1,11 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.1.10
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
-before_install: gem install bundler -v 1.13.6
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.2
+before_install: gem install bundler -v 2.0.1
 addons:
   code_climate:
     repo_token: c542293583b86ca95015675c334c9fea63c14825709f7c9eb4c72a0c8cfc71b4

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Ryo Yamamoto
+Copyright (c) 2016-2019 Ryo Yamamoto
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -23,6 +23,7 @@ Or install it yourself as:
 To get the Japanese era name, use the `era_name` method:
 
 ```
+Time.new(2019,  5,  1).era_name # => "令和"
 Time.new(1989,  1,  8).era_name # => "平成"
 Time.new(1926, 12, 25).era_name # => "昭和"
 Time.new(1912,  7, 30).era_name # => "大正"
@@ -32,6 +33,7 @@ Time.new(1873,  1,  1).era_name # => "明治"
 If you want to get the Japanese era name in romaji, pass `:romaji`:
 
 ```
+Time.new(2019,  5,  1).era_name(:romaji) # => "Reiwa"
 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"
@@ -41,7 +43,8 @@ Time.new(1873,  1,  1).era_name(:romaji) # => "Meiji"
 You can convert to a Japanese year with the `era_year` method:
 
 ```
-Time.new(2016, 12, 11).era_year # => 28
+Time.new(2019,  5,  1).era_year # => 1
+Time.new(2019,  4, 30).era_year # => 31
 Time.new(1989,  1,  7).era_year # => 64
 Time.new(1926, 12, 24).era_year # => 15
 Time.new(1912,  7, 29).era_year # => 45
@@ -50,25 +53,25 @@ Time.new(1912,  7, 29).era_year # => 45
 To get a string representation of the Japanese calendar, use the `strftime` method:
 
 ```
-time = Time.new(1989, 1, 1)
+time = Time.new(2019, 5, 1)
 
 # Japanese era
-time.strftime("%K")  # => "平成"
-time.strftime("%O")  # => "Heisei"
-time.strftime("%^O") # => "HEISEI"
-time.strftime("%o")  # => "H"
-time.strftime("%J")  # => "01"
-time.strftime("%-J") # => "1"
-time.strftime("%_J") # => " 1"
+time.strftime("%JN")  # => "令和"
+time.strftime("%JR")  # => "Reiwa"
+time.strftime("%^JR") # => "REIWA"
+time.strftime("%Jr")  # => "R"
+time.strftime("%Jy")  # => "01"
+time.strftime("%-Jy") # => "1"
+time.strftime("%_Jy") # => " 1"
 
 # Japanese weekday name
-time.strftime("%Q") # => "日曜日"
-time.strftime("%q") # => "日"
+time.strftime("%JA") # => "水曜日"
+time.strftime("%Ja") # => "水"
 
 # 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("%JN%-Jy年%-m月%-d日(%Ja)") # => "令和1年5月1日(水)"
+time.strftime("%Jr%Jy.%m.%d")            # => "R01.05.01"
+time.strftime("%B %-d, %-Y (%JR %-Jy)")  # => "May 1, 2019 (Reiwa 1)"
 ```
 
 ## Development

data/japanese_calendar.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.1"
+  spec.required_ruby_version = ">= 2.3"
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "simplecov"

data/lib/japanese_calendar/core_ext/date.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+require "date"
+require "japanese_calendar/era"
+require "japanese_calendar/weekday"
+
+class Date
+  prepend JapaneseCalendar::Era
+  prepend JapaneseCalendar::Weekday
+end

data/lib/japanese_calendar/core_ext/date_time.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+require "date"
+require "japanese_calendar/era"
+require "japanese_calendar/weekday"
+
+class DateTime
+  prepend JapaneseCalendar::Era
+  prepend JapaneseCalendar::Weekday
+end

data/lib/japanese_calendar/era.rb

@@ -48,26 +48,28 @@ module JapaneseCalendar
     #
     #   date_of_birth = Time.new(1978, 7, 19)
     #
-    #   date_of_birth.strftime("%K")  # => "昭和"
-    #   date_of_birth.strftime("%O")  # => "Showa"
-    #   date_of_birth.strftime("%^O") # => "SHOWA"
-    #   date_of_birth.strftime("%o")  # => "S"
-    #   date_of_birth.strftime("%J")  # => "53"
+    #   date_of_birth.strftime("%JN")  # => "昭和"
+    #   date_of_birth.strftime("%JR")  # => "Showa"
+    #   date_of_birth.strftime("%^JR") # => "SHOWA"
+    #   date_of_birth.strftime("%Jr")  # => "S"
+    #   date_of_birth.strftime("%Jy")  # => "53"
     #
-    #   date_of_birth.strftime("%K%-J年")  # => "昭和53年"
+    #   date_of_birth.strftime("%JN%-Jy年")  # => "昭和53年"
     #
     # Raises an error when the Japanese year cannot be found.
     #
-    #   Time.new(1872, 12, 31).strftime("%K%-J年") # => RuntimeError
+    #   Time.new(1872, 12, 31).strftime("%JN%-Jy年") # => RuntimeError
     def strftime(format)
       string = format.dup
-      string.gsub!(/%K/,   era_name)
-      string.gsub!(/%O/,   era_name(:romaji))
-      string.gsub!(/%\^O/, era_name(:romaji).upcase)
-      string.gsub!(/%o/,   era_name(:romaji)[0])
-      string.gsub!(/%J/,   "%02d" % era_year)
-      string.gsub!(/%-J/,  "%d"   % era_year)
-      string.gsub!(/%_J/,  "%2d"  % era_year)
+      string.gsub!(/%JN/,   era_name)
+      string.gsub!(/%JR/,   era_name(:romaji))
+      string.gsub!(/%\^JR/, era_name(:romaji).upcase)
+      string.gsub!(/%Jr/,   era_name(:romaji)[0])
+      string.gsub!(/%Jy/,   "%02d" % era_year)
+      string.gsub!(/%-Jy/,  "%d"   % era_year)
+      string.gsub!(/%_Jy/,  "%2d"  % era_year)
+      deprecated_japanese_calendar_era_name_strftime(string)
+      deprecated_japanese_calendar_era_year_strftime(string)
       super(string)
     end
 
@@ -76,18 +78,55 @@ module JapaneseCalendar
       Period = Struct.new(:beginning_of_period, :kanji_name, :romaji_name)
 
       PERIODS = [
-        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
+        Period.new(Date.new(2019,  5,  1), "令和", "Reiwa").freeze,
+        Period.new(Date.new(1989,  1,  8), "平成", "Heisei").freeze,
+        Period.new(Date.new(1926, 12, 25), "昭和", "Showa" ).freeze,
+        Period.new(Date.new(1912,  7, 30), "大正", "Taisho").freeze,
+        Period.new(Date.new(1868,  1, 25), "明治", "Meiji" ).freeze
       ].freeze
 
-      MEIJI_6 = Time.new(1873, 1, 1)
+      MEIJI_6 = Date.new(1873, 1, 1)
 
       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 }
+        error_proc.call if self.to_date < MEIJI_6
+        PERIODS.find(error_proc) do |period|
+          period.beginning_of_period <= self.to_date
+        end
+      end
+
+      def deprecated_japanese_calendar_era_name_strftime(string)
+        if string =~ /%K/
+          warn "%K is deprecated. Please use %JN instead."
+          string.gsub!(/%K/, era_name)
+        end
+        if string =~ /%O/
+          warn "%O is deprecated. Please use %JR instead."
+          string.gsub!(/%O/, era_name(:romaji))
+        end
+        if string =~ /%\^O/
+          warn "%^O is deprecated. Please use %^JR instead."
+          string.gsub!(/%\^O/, era_name(:romaji).upcase)
+        end
+        if string =~ /%o/
+          warn "%o is deprecated. Please use %Jr instead."
+          string.gsub!(/%o/, era_name(:romaji)[0])
+        end
+      end
+
+      def deprecated_japanese_calendar_era_year_strftime(string)
+        if string =~ /%J/
+          warn "%J is deprecated. Please use %Jy instead."
+          string.gsub!(/%J/, "%02d" % era_year)
+        end
+        if string =~ /%-J/
+          warn "%-J is deprecated. Please use %-Jy instead."
+          string.gsub!(/%-J/, "%d" % era_year)
+        end
+        if string =~ /%_J/
+          warn "%_J is deprecated. Please use %_Jy instead."
+          string.gsub!(/%_J/, "%2d" % era_year)
+        end
       end
   end
 end

data/lib/japanese_calendar/version.rb

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

data/lib/japanese_calendar/weekday.rb

@@ -7,15 +7,29 @@ module JapaneseCalendar
     #
     #   date_of_birth = Time.new(1978, 7, 19)
     #
-    #   date_of_birth.strftime("%Q")  # => "水曜日"
-    #   date_of_birth.strftime("%q")  # => "水"
+    #   date_of_birth.strftime("%JA")  # => "水曜日"
+    #   date_of_birth.strftime("%Ja")  # => "水"
     #
     #   date_of_birth.strftime("%-Y年%-m月%-d日(%q)") # => "1978年7月19日(水)"
     def strftime(format)
       string = format.dup
-      string.gsub!(/%Q/, NAMES[wday])
-      string.gsub!(/%q/, NAMES[wday][0])
+      string.gsub!(/%JA/, NAMES[wday])
+      string.gsub!(/%Ja/, NAMES[wday][0])
+      deprecated_japanese_calendar_weekday_strftime(string)
       super(string)
     end
+
+    private
+
+      def deprecated_japanese_calendar_weekday_strftime(string)
+        if string =~ /%Q/
+          warn "%Q is deprecated. Please use %JA instead."
+          string.gsub!(/%Q/, NAMES[wday])
+        end
+        if string =~ /%q/
+          warn "%q is deprecated. Please use %Ja instead."
+          string.gsub!(/%q/, NAMES[wday][0])
+        end
+      end
   end
 end

data/lib/japanese_calendar.rb

@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 require "japanese_calendar/version"
+require "japanese_calendar/core_ext/date_time"
+require "japanese_calendar/core_ext/date"
 require "japanese_calendar/core_ext/time"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: japanese_calendar
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryo Yamamoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-25 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +117,8 @@ files:
 - exe/japanese_calendar
 - japanese_calendar.gemspec
 - lib/japanese_calendar.rb
+- lib/japanese_calendar/core_ext/date.rb
+- lib/japanese_calendar/core_ext/date_time.rb
 - lib/japanese_calendar/core_ext/time.rb
 - lib/japanese_calendar/era.rb
 - lib/japanese_calendar/version.rb
@@ -133,15 +135,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Japanese calendar utility for Ruby