zakuro 0.7.2 → 0.8.0

data/lib/zakuro/calculation/summary/japan/range.rb

@@ -10,6 +10,8 @@ require_relative '../internal/operation'
 
 require_relative './specifier/single_day'
 
+require_relative './specifier/specified_range'
+
 # :nodoc:
 module Zakuro
   # :nodoc:
@@ -22,134 +24,153 @@ module Zakuro
         # Range 期間
         #
         module Range
-          #
-          # 生成する
-          #
-          # @param [Context::Context] context 暦コンテキスト
-          # @param [Japan::Calendar] start_date 和暦開始日
-          # @param [Japan::Calendar] last_date 和暦終了日
-          #
-          # @return [Result::Range] 期間検索結果（和暦日）
-          #
-          def self.get(context:, start_date: Japan::Calendar.new,
-                       last_date: Japan::Calendar.new)
-            years = get_full_range_years(
-              context: context, start_date: start_date, last_date: last_date
-            )
-            operated_years = get_operation_range_years(
-              context: context, years: years, start_date: start_date, last_date: last_date
-            )
-
-            japan_start_date = Specifier::SingleDay.get(
-              years: operated_years, date: start_date
-            )
-            japan_last_date = Specifier::SingleDay.get(
-              years: operated_years, date: last_date
-            )
-
-            list = create_list(
-              context: context,
-              operated_years: operated_years, years: years,
-              start_date: japan_start_date, last_date: japan_last_date
-            )
-
-            Result::Range.new(list: list)
-          end
+          class << self
+            #
+            # 生成する
+            #
+            # @param [Context::Context] context 暦コンテキスト
+            # @param [Japan::Calendar] start_date 和暦開始日
+            # @param [Japan::Calendar] last_date 和暦終了日
+            #
+            # @return [Result::Range] 期間検索結果（和暦日）
+            #
+            def get(context:, start_date: Japan::Calendar.new,
+                    last_date: Japan::Calendar.new)
+              years = get_full_range_years(
+                context: context, start_date: start_date, last_date: last_date
+              )
+              operated_years = get_operation_range_years(
+                context: context, years: years, start_date: start_date, last_date: last_date
+              )
 
-          #
-          # 1日検索結果リストを生成する
-          #
-          # @param [Context::Context] context 暦コンテキスト
-          # @param [Array<Base::OperatedYear>] operated_years 運用結果範囲
-          # @param [Array<Base::Year>] years 完全範囲
-          # @param [Result::Data::SingleDay] start_date 和暦開始日
-          # @param [Result::Data::SingleDay] last_date 和暦終了日
-          #
-          # @return [Array<Result::Single>] 結果リスト
-          #
-          def self.create_list(context:, operated_years: [], years: [],
-                               start_date:, last_date:)
-            western_start_date = start_date.day.western_date
-            western_last_date = last_date.day.western_date
-
-            operated_dates = Western::Specifier::MultipleDay.get(
-              context: context, years: operated_years, start_date: western_start_date, last_date: western_last_date
-            )
-
-            dates = Western::Specifier::MultipleDay.get(
-              context: context, years: years, start_date: western_start_date, last_date: western_last_date
-            )
-
-            create_result_list(dates: dates, operated_dates: operated_dates)
-          end
-          private_class_method :create_list
-
-          #
-          # 完全範囲を取得する
-          #
-          # @param [Context::Context] context 暦コンテキスト
-          # @param [Japan::Calendar] start_date 和暦開始日
-          # @param [Japan::Calendar] last_date 和暦終了日
-          #
-          # @return [Array<Base::Year>] 完全範囲
-          #
-          def self.get_full_range_years(context:, start_date: Japan::Calendar.new,
-                                        last_date: Japan::Calendar.new)
-            full_range = Calculation::Range::NamedFullRange.new(
-              context: context, start_name: start_date.gengou, last_name: last_date.gengou
-            )
-            full_range.get
-          end
-          private_class_method :get_full_range_years
-
-          #
-          # 運用結果範囲を取得する
-          #
-          # @param [Context::Context] context 暦コンテキスト
-          # @param [Array<Base::Year>] years 完全範囲
-          # @param [Japan::Calendar] start_date 和暦開始日
-          # @param [Japan::Calendar] last_date 和暦終了日
-          #
-          # @return [Array<Base::OperatedYear>] 運用結果範囲
-          #
-          def self.get_operation_range_years(context:, years:, start_date: Japan::Calendar.new,
-                                             last_date: Japan::Calendar.new)
-            operation_range = Calculation::Range::NamedOperationRange.new(
-              context: context, years: years,
-              start_name: start_date.gengou, last_name: last_date.gengou
-            )
-            operation_range.get
-          end
-          private_class_method :get_operation_range_years
-
-          #
-          # 結果リストを生成する
-          #
-          # @param [Array<Result::Data::SingleDay>] dates 検索結果（計算値）
-          # @param [Array<Result::Data::SingleDay>] operated_dates 検索結果（運用値）
-          #
-          # @return [Array<Result::Single>] 結果リスト
-          #
-          def self.create_result_list(dates:, operated_dates:)
-            result = []
-
-            return result if dates.size != operated_dates.size
-
-            (0..(dates.size - 1)).each do |index|
-              data = operated_dates[index]
-
-              date = dates[index]
-              operation = Operation.create(calc_date: date)
-
-              result.push(
-                Result::Single.new(
-                  data: data,
-                  operation: operation
-                )
+              range = specified_range(
+                operated_years: operated_years, start_date: start_date, last_date: last_date
               )
+
+              list = create_list(
+                context: context,
+                operated_years: operated_years, years: years, range: range
+              )
+
+              Result::Range.new(list: list)
+            end
+
+            private
+
+            #
+            # 特定範囲を取得する
+            #
+            # @param [Array<Base::OperatedYear>] operated_years 運用結果範囲
+            # @param [Japan::Calendar] start_date 和暦開始日
+            # @param [Japan::Calendar] last_date 和暦終了日
+            #
+            # @return [SpecifiedRange] 特定範囲
+            #
+            def specified_range(operated_years: [], start_date: Japan::Calendar.new,
+                                last_date: Japan::Calendar.new)
+              japan_start_date = Specifier::SingleDay.get(
+                years: operated_years, date: start_date
+              )
+              japan_last_date = Specifier::SingleDay.get(
+                years: operated_years, date: last_date
+              )
+
+              SpecifiedRange.new(start_date: japan_start_date, last_date: japan_last_date)
             end
 
-            result
+            #
+            # 1日検索結果リストを生成する
+            #
+            # @param [Context::Context] context 暦コンテキスト
+            # @param [Array<Base::OperatedYear>] operated_years 運用結果範囲
+            # @param [Array<Base::Year>] years 完全範囲
+            # @param [SpecifiedRange] range 特定範囲
+            #
+            # @return [Array<Result::Single>] 結果リスト
+            #
+            def create_list(context:, operated_years: [], years: [],
+                            range:)
+              western_start_date = range.start_date.day.western_date
+              western_last_date = range.last_date.day.western_date
+
+              operated_dates = Western::Specifier::MultipleDay.get(
+                context: context, years: operated_years,
+                start_date: western_start_date, last_date: western_last_date
+              )
+
+              dates = Western::Specifier::MultipleDay.get(
+                context: context, years: years,
+                start_date: western_start_date, last_date: western_last_date
+              )
+
+              create_result_list(dates: dates, operated_dates: operated_dates)
+            end
+
+            #
+            # 完全範囲を取得する
+            #
+            # @param [Context::Context] context 暦コンテキスト
+            # @param [Japan::Calendar] start_date 和暦開始日
+            # @param [Japan::Calendar] last_date 和暦終了日
+            #
+            # @return [Array<Base::Year>] 完全範囲
+            #
+            def get_full_range_years(context:, start_date: Japan::Calendar.new,
+                                     last_date: Japan::Calendar.new)
+              full_range = Calculation::Range::NamedFullRange.new(
+                context: context, start_name: start_date.gengou, last_name: last_date.gengou
+              )
+              full_range.get
+            end
+
+            #
+            # 運用結果範囲を取得する
+            #
+            # @param [Context::Context] context 暦コンテキスト
+            # @param [Array<Base::Year>] years 完全範囲
+            # @param [Japan::Calendar] start_date 和暦開始日
+            # @param [Japan::Calendar] last_date 和暦終了日
+            #
+            # @return [Array<Base::OperatedYear>] 運用結果範囲
+            #
+            def get_operation_range_years(context:, years:, start_date: Japan::Calendar.new,
+                                          last_date: Japan::Calendar.new)
+              operation_range = Calculation::Range::NamedOperationRange.new(
+                context: context, years: years,
+                start_name: start_date.gengou, last_name: last_date.gengou
+              )
+              operation_range.get
+            end
+
+            #
+            # 結果リストを生成する
+            #
+            # @param [Array<Result::Data::SingleDay>] dates 検索結果（計算値）
+            # @param [Array<Result::Data::SingleDay>] operated_dates 検索結果（運用値）
+            #
+            # @return [Array<Result::Single>] 結果リスト
+            #
+            def create_result_list(dates:, operated_dates:)
+              result = []
+
+              return result if dates.size != operated_dates.size
+
+              (0..(dates.size - 1)).each do |index|
+                data = operated_dates[index]
+
+                date = dates[index]
+                operation = Operation.create(calc_date: date)
+
+                result.push(
+                  Result::Single.new(
+                    data: data,
+                    operation: operation
+                  )
+                )
+              end
+
+              result
+            end
           end
         end
       end

data/lib/zakuro/calculation/summary/japan/single.rb

@@ -22,95 +22,95 @@ module Zakuro
         # Single 一日
         #
         module Single
-          #
-          # 生成する
-          #
-          # @param [Context::Context] context 暦コンテキスト
-          # @param [Japan::Calendar] date 和暦日
-          #
-          # @return [Result::Single] 一日検索結果（和暦日）
-          #
-          def self.get(context:, date: Japan::Calendar.new)
-            years = get_full_range_years(context: context, date: date)
-
-            data = get_data(context: context, years: years, date: date)
-
-            western_date = data.day.western_date
-            operation = get_operation(years: years, date: western_date)
-
-            Result::Single.new(
-              data: data,
-              operation: operation
-            )
-          end
+          class << self
+            #
+            # 生成する
+            #
+            # @param [Context::Context] context 暦コンテキスト
+            # @param [Japan::Calendar] date 和暦日
+            #
+            # @return [Result::Single] 一日検索結果（和暦日）
+            #
+            def get(context:, date: Japan::Calendar.new)
+              years = get_full_range_years(context: context, date: date)
 
-          #
-          # 完全範囲を取得する
-          #
-          # @param [Context::Context] context 暦コンテキスト
-          # @param [Japan::Calendar] date 和暦日
-          #
-          # @return [Array<Base::Year>] 完全範囲
-          #
-          def self.get_full_range_years(context:, date: Japan::Calendar.new)
-            full_range = Calculation::Range::NamedFullRange.new(
-              context: context, start_name: date.gengou
-            )
-            full_range.get
-          end
-          private_class_method :get_full_range_years
-
-          #
-          # 1日を取得する
-          #
-          # @param [Context::Context] context 暦コンテキスト
-          # @param [Array<Base::Year>] years 完全範囲
-          # @param [Japan::Calendar] date 和暦日
-          #
-          # @return [Data::SingleDay] 1日
-          #
-          def self.get_data(context:, years:, date: Japan::Calendar.new)
-            operated_years = get_operation_range_years(context: context, years: years, date: date)
-
-            Specifier::SingleDay.get(
-              years: operated_years, date: date
-            )
-          end
-          private_class_method :get_data
-
-          #
-          # 運用結果範囲を取得する
-          #
-          # @param [Context::Context] context 暦コンテキスト
-          # @param [Array<Calculation::Base::Year>] years 完全範囲
-          # @param [Japan::Calendar] date 和暦日
-          #
-          # @return [Array<Base::OperatedYear>] 運用結果範囲
-          #
-          def self.get_operation_range_years(context:, years:, date: Japan::Calendar.new)
-            operation_range = Calculation::Range::NamedOperationRange.new(
-              context: context, start_name: date.gengou, years: years
-            )
-            operation_range.get
-          end
-          private_class_method :get_operation_range_years
-
-          #
-          # 完全範囲を取得する
-          #
-          # @param [Array<Calculation::Base::Year>] years 完全範囲
-          # @param [Western::Calendar] date 和暦日
-          #
-          # @return [Array<Base::Year>] 完全範囲
-          #
-          def self.get_operation(years:, date: Western::Calendar.new)
-            calc_date = Western::Specifier::SingleDay.get(
-              years: years, date: date
-            )
-
-            Operation.create(calc_date: calc_date)
+              data = get_data(context: context, years: years, date: date)
+
+              western_date = data.day.western_date
+              operation = get_operation(years: years, date: western_date)
+
+              Result::Single.new(
+                data: data,
+                operation: operation
+              )
+            end
+
+            private
+
+            #
+            # 完全範囲を取得する
+            #
+            # @param [Context::Context] context 暦コンテキスト
+            # @param [Japan::Calendar] date 和暦日
+            #
+            # @return [Array<Base::Year>] 完全範囲
+            #
+            def get_full_range_years(context:, date: Japan::Calendar.new)
+              full_range = Calculation::Range::NamedFullRange.new(
+                context: context, start_name: date.gengou
+              )
+              full_range.get
+            end
+
+            #
+            # 1日を取得する
+            #
+            # @param [Context::Context] context 暦コンテキスト
+            # @param [Array<Base::Year>] years 完全範囲
+            # @param [Japan::Calendar] date 和暦日
+            #
+            # @return [Data::SingleDay] 1日
+            #
+            def get_data(context:, years:, date: Japan::Calendar.new)
+              operated_years = get_operation_range_years(context: context, years: years, date: date)
+
+              Specifier::SingleDay.get(
+                years: operated_years, date: date
+              )
+            end
+
+            #
+            # 運用結果範囲を取得する
+            #
+            # @param [Context::Context] context 暦コンテキスト
+            # @param [Array<Calculation::Base::Year>] years 完全範囲
+            # @param [Japan::Calendar] date 和暦日
+            #
+            # @return [Array<Base::OperatedYear>] 運用結果範囲
+            #
+            def get_operation_range_years(context:, years:, date: Japan::Calendar.new)
+              operation_range = Calculation::Range::NamedOperationRange.new(
+                context: context, start_name: date.gengou, years: years
+              )
+              operation_range.get
+            end
+
+            #
+            # 完全範囲を取得する
+            #
+            # @param [Array<Calculation::Base::Year>] years 完全範囲
+            # @param [Western::Calendar] date 和暦日
+            #
+            # @return [Array<Base::Year>] 完全範囲
+            #
+            def get_operation(years:, date: Western::Calendar.new)
+              calc_date = Western::Specifier::SingleDay.get(
+                years: years, date: date
+              )
+
+              Operation.create(calc_date: calc_date)
+            end
           end
-          private_class_method :get_operation
         end
       end
     end

data/lib/zakuro/calculation/summary/japan/specifier/single_day.rb

@@ -27,67 +27,69 @@ module Zakuro
             # @return [Output::Logger] ロガー
             LOGGER = Output::Logger.new(location: 'specifier')
 
-            #
-            # 取得する
-            #
-            # @param [Array<Year>] yeas 範囲
-            # @param [Japan::Calendar] date 和暦日
-            #
-            # @return [Result::Data::SingleDay] 和暦日
-            #
-            def self.get(years: [], date: Japan::Calendar.new)
-              year, month = specify(years: years, date: date)
-              first_date = month.western_date.clone
-              days = date.day - 1
-              western_date = first_date + days
-              day = Day.get(month: month, date: western_date)
+            class << self
+              #
+              # 取得する
+              #
+              # @param [Array<Year>] yeas 範囲
+              # @param [Japan::Calendar] date 和暦日
+              #
+              # @return [Result::Data::SingleDay] 和暦日
+              #
+              def get(years: [], date: Japan::Calendar.new)
+                year, month = specify(years: years, date: date)
+                first_date = month.western_date.clone
+                days = date.day - 1
+                western_date = first_date + days
+                day = Day.get(month: month, date: western_date)
 
-              options = Option.create(month: month, day: day)
+                options = Option.create(month: month, day: day)
 
-              Output::Response::SingleDay.create(
-                year: year, month: month, day: day, options: options
-              )
-            end
-
-            #
-            # 年を特定する
-            #
-            # @param [Array<Year>] years 範囲
-            # @param [Japan::Calendar] date 和暦日
-            #
-            # @return [Base::Year] 対象年
-            # @return [Monthly::Month] 対象月
-            #
-            # @raise [ArgumentError] 引数エラー
-            #
-            def self.specify(years:, date:)
-              years.each do |year|
-                month = specify_month(year: year, date: date)
-                return year, month unless month.invalid?
+                Output::Response::SingleDay.create(
+                  year: year, month: month, day: day, options: options
+                )
               end
 
-              raise ArgumentError, "invalid year range. date: #{date.format}"
-            end
-            private_class_method :specify
+              private
 
-            #
-            # 月を特定する
-            #
-            # @param [Base::Year] year 年
-            # @param [Japan::Calendar] date 和暦日
-            #
-            # @return [Monthly::Month] 対象月
-            #
-            def self.specify_month(year:, date:)
-              months = year.months
+              #
+              # 年を特定する
+              #
+              # @param [Array<Year>] years 範囲
+              # @param [Japan::Calendar] date 和暦日
+              #
+              # @return [Base::Year] 対象年
+              # @return [Monthly::Month] 対象月
+              #
+              # @raise [ArgumentError] 引数エラー
+              #
+              def specify(years:, date:)
+                years.each do |year|
+                  month = specify_month(year: year, date: date)
+                  return year, month unless month.invalid?
+                end
 
-              months.each do |month|
-                return month if month.include_by_japan_date?(date: date)
+                raise ArgumentError, "invalid year range. date: #{date.format}"
               end
 
-              Monthly::Month.new
+              #
+              # 月を特定する
+              #
+              # @param [Base::Year] year 年
+              # @param [Japan::Calendar] date 和暦日
+              #
+              # @return [Monthly::Month] 対象月
+              #
+              def specify_month(year:, date:)
+                months = year.months
+
+                months.each do |month|
+                  return month if month.include_by_japan_date?(date: date)
+                end
+
+                Monthly::Month.new
+              end
             end
-            private_class_method :specify_month
           end
         end
       end

data/lib/zakuro/calculation/summary/japan/specifier/specified_range.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Summary
+      # :nodoc:
+      module Japan
+        #
+        # SpecifiedRange 特定範囲
+        #
+        class SpecifiedRange
+          # @return [Result::Data::SingleDay] 特定開始日
+          attr_reader :start_date
+          # @return [Result::Data::SingleDay] 特定終了日
+          attr_reader :last_date
+
+          #
+          # 初期化
+          #
+          # @param [Result::Data::SingleDay] start_date 特定開始日
+          # @param [Result::Data::SingleDay] last_date 特定終了日
+          #
+          def initialize(start_date:, last_date:)
+            @start_date = start_date
+            @last_date = last_date
+          end
+        end
+      end
+    end
+  end
+end