japanese_calendar 0.4.1 → 0.4.2

data/lib/japanese_calendar/era/reflection.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module JapaneseCalendar
+  module Era
+    module Reflection #:nodoc:
+      include Era::Calculations
+
+      PERIODS.each do |period|
+        define_method "#{period.romaji_name.downcase}?" do
+          begin
+            period == current_era
+          rescue RuntimeError
+            false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/japanese_calendar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JapaneseCalendar
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/lib/japanese_calendar/weekday.rb

@@ -1,13 +1,22 @@
 # frozen_string_literal: true
 
-require 'japanese_calendar/weekday/deprecator'
+require 'japanese_calendar/deprecation/weekday_wrapper'
+require 'japanese_calendar/weekday/calculations'
 
 module JapaneseCalendar
+  # Weekday extensions to <tt>Date</tt>, <tt>DateTime</tt> and <tt>Time</tt>.
   module Weekday
-    prepend Weekday::Deprecator
+    include Weekday::Calculations
+    prepend Deprecation::WeekdayWrapper
 
-    # Formats time according to the directives in the given format string.
+    # Formats the day of the week according to the directives in the given
+    # format string.
     #
+    # Format directives:
+    #   %JA - The full weekday name in Japanese ("日曜日")
+    #   %Ja - The abbreviated weekday name in Japanese ("日")
+    #
+    # Examples:
     #   date_of_birth = Time.new(1978, 7, 19)
     #
     #   date_of_birth.strftime("%JA")  # => "水曜日"
@@ -15,29 +24,22 @@ module JapaneseCalendar
     #
     #   date_of_birth.strftime("%-Y年%-m月%-d日(%Ja)") # => "1978年7月19日(水)"
     def strftime(format)
-      string = format.gsub(weekday_pattern, weekday_conversion)
-      super(string)
+      string = super(format)
+      string.gsub(weekday_pattern, weekday_conversion)
     end
 
     private
 
-    def weekday_name
-      %w[日曜日 月曜日 火曜日 水曜日 木曜日 金曜日 土曜日][wday]
-    end
-
-    def weekday_abbreviation
-      weekday_name[0]
-    end
-
+    # Returns a hash representing the format directives of the day of the week.
     def weekday_conversion
       {
         '%JA' => weekday_name,
-        '%Ja' => weekday_abbreviation,
-        '%Q' => weekday_name,
-        '%q' => weekday_abbreviation
+        '%Ja' => weekday_abbreviation
       }
     end
 
+    # Returns a Regexp object representing the format directives of
+    # the day of the week (/%JA|%Ja/).
     def weekday_pattern
       Regexp.union(weekday_conversion.keys)
     end

data/lib/japanese_calendar/weekday/calculations.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module JapaneseCalendar
+  module Weekday #:nodoc:
+    NAMES = %w[日曜日 月曜日 火曜日 水曜日 木曜日 金曜日 土曜日].freeze
+
+    private_constant :NAMES
+
+    # Calculations module.
+    module Calculations
+      private
+
+      # Returns a string representing the full name of the day of the week in
+      # Japanese ("日曜日").
+      def weekday_name
+        NAMES[wday]
+      end
+
+      # Returns a string representing the abbreviated name of the day of the
+      # week in Japanese ("日").
+      def weekday_abbreviation
+        weekday_name[0]
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: japanese_calendar
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Ryo Yamamoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,12 +106,15 @@ files:
 - 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/deprecator.rb
+- lib/japanese_calendar/deprecation/era_wrapper.rb
+- lib/japanese_calendar/deprecation/reporting.rb
+- lib/japanese_calendar/deprecation/weekday_wrapper.rb
 - lib/japanese_calendar/era.rb
-- lib/japanese_calendar/era/deprecator.rb
+- lib/japanese_calendar/era/calculations.rb
+- lib/japanese_calendar/era/reflection.rb
 - lib/japanese_calendar/version.rb
 - lib/japanese_calendar/weekday.rb
-- lib/japanese_calendar/weekday/deprecator.rb
+- lib/japanese_calendar/weekday/calculations.rb
 homepage: https://github.com/RyoYamamotoJP/japanese_calendar
 licenses:
 - MIT

data/lib/japanese_calendar/deprecator.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module JapaneseCalendar
-  module Deprecator
-    private
-
-    def deprecate(directive, message)
-      warn "#{directive} is deprecated. #{message}"
-    end
-  end
-end

data/lib/japanese_calendar/era/deprecator.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'japanese_calendar/deprecator'
-
-module JapaneseCalendar
-  module Era
-    module Deprecator
-      include JapaneseCalendar::Deprecator
-
-      DEPRECATIONS = {
-        '%K' => 'Please use %JN instead.',
-        '%O' => 'Please use %JR instead.',
-        '%^O' => 'Please use %^JR instead.',
-        '%o' => 'Please use %Jr instead.',
-        '%J' => 'Please use %Jy instead.',
-        '%-J' => 'Please use %-Jy instead.',
-        '%_J' => 'Please use %_Jy instead.'
-      }.freeze
-
-      private_constant :DEPRECATIONS
-
-      def strftime(format)
-        deprecations = collect_era_deprecations(format)
-        deprecations.each { |deprecation| deprecate(*deprecation) }
-        super(format)
-      end
-
-      private
-
-      def collect_era_deprecations(format)
-        deprecation_pattern = Regexp.union(DEPRECATIONS.keys)
-        deprecated_directives = format.scan(deprecation_pattern).uniq
-        DEPRECATIONS.select do |directive, _|
-          deprecated_directives.include?(directive)
-        end
-      end
-    end
-  end
-end

data/lib/japanese_calendar/weekday/deprecator.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require 'japanese_calendar/deprecator'
-
-module JapaneseCalendar
-  module Weekday
-    module Deprecator
-      include JapaneseCalendar::Deprecator
-
-      DEPRECATIONS = {
-        '%Q' => 'Please use %JA instead.',
-        '%q' => 'Please use %Ja instead.'
-      }.freeze
-
-      private_constant :DEPRECATIONS
-
-      def strftime(format)
-        deprecations = collect_weekday_deprecations(format)
-        deprecations.each { |deprecation| deprecate(*deprecation) }
-        super(format)
-      end
-
-      private
-
-      def collect_weekday_deprecations(format)
-        deprecation_pattern = Regexp.union(DEPRECATIONS.keys)
-        deprecated_directives = format.scan(deprecation_pattern).uniq
-        DEPRECATIONS.select do |directive, _|
-          deprecated_directives.include?(directive)
-        end
-      end
-    end
-  end
-end