zakuro 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3e4e967b105b46ffc94cc792328a5020aa0535f797dbf5bc5bc1a8eb2786cd8
-  data.tar.gz: 71f0fce3e9592469062df9ef667b2e146754c79bde93647a020c942b21cf3fb1
+  metadata.gz: 294b07e6f6f82cad6ed7d5332d96a0c147ee1cbcbb842faa745918f1d8fbac2e
+  data.tar.gz: 41341f57aab606cea9a86c75aa4dbef8a8d247421d7428ddf5f1e442afc1b8db
 SHA512:
-  metadata.gz: d4acc827cebcebad50f33b3c255a23b28ebab62b05fc322ec0e304fa7d738df9479f3aded5e776e6d741d31f2c8812a30bde7ee777f3841eb140be3f44479ce8
-  data.tar.gz: c3a8304e0afdd13b2bc31d7107594816d185114bd7b67701bc3d2f1a395cc7dfeb7c19ff653febe57fc654f8f0feaac0857a0fa2ba2db6aba5d48f2ae87231f8
+  metadata.gz: 9f3aee8d972a13e41ae98cb6b600f2032e833380a845513b2a738bf045e7d36a719a2e31161fd90f23194bdee4e0a690dc931934ad30ab0940742f20ea0f7bc7
+  data.tar.gz: 8c8ea9c23b11c28910cbfcdad25dec4720f919a1bbb0551737f8cf82cc62cd59621dcdd4770580d81c7a4a1c8d8859765e3ae7cd39592369a25dd89e1da9932d

data/Makefile

@@ -1,2 +1,5 @@
 binstub:
 	bundle binstubs rspec-core --path exe
+
+count:
+	find . -type f -name "*.rb" | xargs cat | sed "/^\s*\(#\|\$\)/d" | wc -l

data/README.md

@@ -87,13 +87,15 @@ puts merchant.commit.to_json
 | 項目名         | キー名  | hash内キー名 | データ型 | 備考               |
 |----------------|---------|--------------|----------|--------------------|
 | 基準日         | date    |              | Date     | 西暦日             |
-|                |         |              | String   | 和暦日             |
-| 範囲（開始日） | range   | start        | Date     |                    |
-| 範囲（終了日） |         | last         | Date     |                    |
+|                |         |              | String   | 和暦日/西暦日      |
+| 範囲（開始日）   | range   | start        | Date     | 西暦日             |
+|                |         |              | String   | 和暦日/西暦日      |
+| 範囲（終了日）   |         | last         | Date     | 西暦日             |
+|                |         |              | String   | 和暦日/西暦日      |
 | 列             | columns |              | Array    | 取得したい列の列名 |
 | オプション     | options |              | Array    | 取得オプション     |
 
-現時点では `date` の西暦日のみ対応中です。
+現時点では `date` と `range` のみ対応中です。
 
 ## オプション
 

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/doc/operation/transfer.rb

@@ -39,25 +39,25 @@ table.each do |row|
     'diffs' => {
       'month' => {
         'number' => {
-          'calc' => month_str_to_number(row['月（計）']),
-          'actual' => month_str_to_number(row['月（実）'])
+          'src' => month_str_to_number(row['月（計）']),
+          'dest' => month_str_to_number(row['月（実）'])
         },
         'leaped' => {
-          'calc' => month_str_to_leaped(row['月（計）']),
-          'actual' => month_str_to_leaped(row['月（実）'])
+          'src' => month_str_to_leaped(row['月（計）']),
+          'dest' => month_str_to_leaped(row['月（実）'])
         },
         'days' => {
-          'calc' => row['月大小（計）'],
-          'actual' => row['月大小（実）']
+          'src' => row['月大小（計）'],
+          'dest' => row['月大小（実）']
         }
       },
       'solar_term' => {
-        'calc' => {
+        'src' => {
           'index' => row['中気番号（計）'],
           'to' => row['中気移動先'],
           'zodiac_name' => row['中気（計）']
         },
-        'actual' => {
+        'dest' => {
           'index' => row['中気番号（実）'],
           'from' => row['中気移動元'],
           'zodiac_name' => row['中気（実）']

data/lib/zakuro/calculation/base/gengou.rb

@@ -67,6 +67,52 @@ module Zakuro
           LinearGengou.new
         end
 
+        #
+        # 元号を取得する
+        #
+        # @param [String] name 元号名
+        #
+        # @return [LinearGengou] 元号
+        #
+        def match_by_name(name:)
+          result = match_first_line_by_name(name: name)
+          return result unless result.invalid?
+
+          result = match_second_line_by_name(name: name)
+
+          result
+        end
+
+        #
+        # 1行目元号を取得する
+        #
+        # @param [String] name 元号名
+        #
+        # @return [LinearGengou] 1行目元号
+        #
+        def match_first_line_by_name(name:)
+          @first_line.each do |line|
+            return line.clone if line.name == name
+          end
+
+          LinearGengou.new
+        end
+
+        #
+        # 2行目元号を取得する
+        #
+        # @param [String] name 元号名
+        #
+        # @return [LinearGengou] 2行目元号
+        #
+        def match_second_line_by_name(name:)
+          @second_line.each do |line|
+            return line.clone if line.name == name
+          end
+
+          LinearGengou.new
+        end
+
         #
         # 不正か
         #

data/lib/zakuro/calculation/era/gengou/{scroll.rb → abstract_scroll.rb}

@@ -3,7 +3,6 @@
 require_relative '../../../era/western/calendar'
 require_relative '../../base/gengou'
 require_relative '../../base/linear_gengou'
-require_relative './internal/reserve/range'
 require_relative './internal/connector'
 require_relative './internal/publisher'
 
@@ -13,16 +12,16 @@ module Zakuro
   module Calculation
     # :nodoc:
     module Gengou
-      # Scroll
+      # AbstractScroll
       #
       # 元号スクロール
       #
-      class Scroll
+      class AbstractScroll
         # @return [Western::Calendar] 月初日
         attr_reader :monthly_start_date
         # @return [Western::Calendar] 月末日
         attr_reader :monthly_last_date
-        # @return [Reserve::Range] 予約範囲
+        # @return [Reserve::AbstractRange] 予約範囲
         attr_reader :range
         # @return [Array<Counte>] 1行目元号
         attr_reader :first_gengou
@@ -34,13 +33,12 @@ module Zakuro
         #
         # 初期化
         #
-        # @param [Western::Calendar] start_date 西暦開始日（最大範囲）
-        # @param [Western::Calendar] last_date 西暦終了日（最大範囲）
+        # @param [Reserve::AbstractRange] range 予約範囲
         #
-        def initialize(start_date: Western::Calendar.new, last_date: Western::Calendar.new)
+        def initialize(range:)
           @monthly_start_date = Western::Calendar.new
           @monthly_last_date = Western::Calendar.new
-          @range = Reserve::Range.new(start_date: start_date, last_date: last_date)
+          @range = range
           @first_gengou = []
           @second_gengou = []
           @ignited = false

data/lib/zakuro/calculation/era/gengou/dated_scroll.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative './abstract_scroll'
+require_relative './internal/reserve/dated_range'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Gengou
+      # DatedScroll
+      #
+      # 元号スクロール
+      #
+      class DatedScroll < AbstractScroll
+        #
+        # 初期化
+        #
+        # @param [Western::Calendar] start_date 西暦開始日（最大範囲）
+        # @param [Western::Calendar] last_date 西暦終了日（最大範囲）
+        #
+        def initialize(start_date: Western::Calendar.new, last_date: Western::Calendar.new)
+          range = Reserve::DatedRange.new(start_date: start_date, last_date: last_date)
+          super(range: range)
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/era/gengou/internal/reserve/{list.rb → abstract_list.rb}

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: true
 
 require_relative '../../../../../era/japan/gengou/resource'
 require_relative '../../../../../era/japan/gengou'
@@ -7,6 +7,8 @@ require_relative '../../../../../era/western/calendar'
 
 require_relative '../counter'
 
+require_relative './empty_link'
+
 # :nodoc:
 module Zakuro
   # :nodoc:
@@ -15,11 +17,11 @@ module Zakuro
     module Gengou
       # :nodoc:
       module Reserve
-        # List
+        # AbstractList
         #
-        # 予約元号一覧
+        # 抽象予約元号一覧
         #
-        class List
+        class AbstractList
           # @return [Integer] 不正年
           INVALID_YEAR = -1
           # @return [Integer] 最大月日数
@@ -37,15 +39,15 @@ module Zakuro
           #
           # 初期化
           #
-          # @param [True, False] first true:1行目元号, false:2行目元号
+          # @param [Integer] index n行目元号
           # @param [Western::Calendar] start_date 開始日
           # @param [Western::Calendar] last_date 終了日
           #
-          def initialize(first: true, start_date: Western::Calendar.new,
+          def initialize(index:, start_date: Western::Calendar.new,
                          last_date: Western::Calendar)
-            @index = first ? Japan::Gengou::FIRST_LINE : Japan::Gengou::SECOND_LINE
+            @index = index
             @start_date = start_date.clone
-            @last_date = last_date.invalid? ? start_date.clone : last_date.clone
+            @last_date = last_date.clone
             @list = []
 
             update
@@ -91,41 +93,7 @@ module Zakuro
               )
             end
 
-            # TODO: refactor
-            if result.size.zero?
-              result.push(
-                Gengou::Counter.new(
-                  gengou: Japan::Resource::Gengou.new(
-                    both_start_date: Japan::Resource::Both::Date.new(
-                      western: start_date.clone
-                    ),
-                    last_date: last_date.clone
-                  )
-                )
-              )
-              return result
-            end
-
-            # FIXME: 有効元号の前後しか見ていない
-            if start_date < result[0].start_date
-              result.unshift(
-                Gengou::Counter.new(
-                  gengou: Japan::Resource::Gengou.new,
-                  start_date: start_date.clone,
-                  last_date: result[0].start_date.clone - 1
-                )
-              )
-            end
-
-            if last_date > result[-1].last_date
-              result.push(
-                Gengou::Counter.new(
-                  gengou: Japan::Resource::Gengou.new,
-                  start_date: result[0].last_date.clone + 1,
-                  last_date: last_date.clone
-                )
-              )
-            end
+            EmptyLink.fill(counters: result, start_date: start_date, last_date: last_date)
 
             result
           end
@@ -152,6 +120,17 @@ module Zakuro
             @list[0].gengou.both_start_date.western.clone
           end
 
+          #
+          # 西暦終了日を取得する
+          #
+          # @return [Western::Calendar] 西暦開始日
+          #
+          def western_last_date
+            return Western::Calendar.new if invalid?
+
+            @list[-1].gengou.last_date.clone
+          end
+
           #
           # 西暦開始年を取得する
           #
@@ -219,24 +198,31 @@ module Zakuro
           # 予約元号一覧を更新する
           #
           def update
-            # 開始日の30日前に前の元号がある場合は、前の元号を設定する
-            start_date = @start_date.clone - (MAX_MONTH_DAYS + 1)
-            # 開始日の30日後に次の元号がある場合は、次の元号を設定する
-            last_date = @last_date.clone + (MAX_MONTH_DAYS + 1)
-
-            @list |= line(start_date: start_date, last_date: last_date)
+            # override
           end
 
           #
-          # 元号
+          # 元号を取得する
           #
-          # @param [Western::Calendar] date 日付
+          # @param [Western::Calendar] start_date 開始日
+          # @param [Western::Calendar] last_date 終了日
           #
           # @return [Array<Japan::Alignment::LinearGengou>] 元号
           #
           def line(start_date:, last_date:)
             Japan::Gengou.line(line: @index, start_date: start_date, last_date: last_date)
           end
+
+          #
+          # 行番号に変換する
+          #
+          # @param [True, False] first 1行目/2行目
+          #
+          # @return [<Integer] 行番号
+          #
+          def parse_index(first: true)
+            first ? Japan::Gengou::FIRST_LINE : Japan::Gengou::SECOND_LINE
+          end
         end
       end
     end

data/lib/zakuro/calculation/era/gengou/internal/reserve/{range.rb → abstract_range.rb}

@@ -2,7 +2,7 @@
 
 require_relative '../../../../../era/western/calendar'
 
-require_relative './list'
+require_relative './dated_list'
 
 # :nodoc:
 module Zakuro
@@ -13,9 +13,9 @@ module Zakuro
       # :nodoc:
       module Reserve
         #
-        # Range 予約済み計算範囲
+        # AbstractRange 予約済み計算範囲
         #
-        class Range
+        class AbstractRange
           # @return [List] 1行目元号
           attr_reader :first_list
           # @return [List] 2行目元号
@@ -30,8 +30,8 @@ module Zakuro
           def initialize(start_date: Western::Calendar.new, last_date: Western::Calendar.new)
             last_date = start_date.clone if last_date.invalid?
 
-            @first_list = List.new(first: true, start_date: start_date, last_date: last_date)
-            @second_list = List.new(first: false, start_date: start_date, last_date: last_date)
+            @first_list = DatedList.new(first: true, start_date: start_date, last_date: last_date)
+            @second_list = DatedList.new(first: false, start_date: start_date, last_date: last_date)
 
             renew(last_date: last_date)
           end
@@ -59,10 +59,10 @@ module Zakuro
 
             return if native_start_date.invalid?
 
-            @first_list = List.new(first: true,
-                                   start_date: native_start_date, last_date: last_date)
-            @second_list = List.new(first: false,
-                                    start_date: native_start_date, last_date: last_date)
+            @first_list = DatedList.new(first: true, start_date: native_start_date,
+                                        last_date: last_date)
+            @second_list = DatedList.new(first: false, start_date: native_start_date,
+                                         last_date: last_date)
           end
 
           #
@@ -107,11 +107,11 @@ module Zakuro
           # @return [Japan::Calendar] 和暦開始日
           #
           def japan_start_date
-            gengou = oldest_gengou
+            list = oldest_list
 
-            return Japan::Calendar.new if gengou.invalid?
+            return Japan::Calendar.new if list.invalid?
 
-            gengou.japan_start_date
+            list.japan_start_date
           end
 
           #
@@ -120,11 +120,11 @@ module Zakuro
           # @return [Western::Calendar] 西暦開始日
           #
           def western_start_date
-            gengou = oldest_gengou
+            list = oldest_list
 
-            return Western::Calendar.new if gengou.invalid?
+            return Western::Calendar.new if list.invalid?
 
-            gengou.western_start_date
+            list.western_start_date
           end
 
           #
@@ -168,9 +168,9 @@ module Zakuro
           #
           # 最古の元号を取得する
           #
-          # @return [Japan::Gengou] 最古の元号
+          # @return [List] 最古の元号
           #
-          def oldest_gengou
+          def oldest_list
             return @first_list if @first_list.invalid?
 
             return @first_list if @second_list.invalid?

data/lib/zakuro/calculation/era/gengou/internal/reserve/dated_list.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require_relative './abstract_list'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Gengou
+      # :nodoc:
+      module Reserve
+        # List
+        #
+        # 予約元号一覧
+        #
+        class DatedList < AbstractList
+          #
+          # 初期化
+          #
+          # @param [True, False] first true:1行目元号, false:2行目元号
+          # @param [Western::Calendar] start_date 開始日
+          # @param [Western::Calendar] last_date 終了日
+          #
+          def initialize(first: true, start_date: Western::Calendar.new,
+                         last_date: Western::Calendar)
+            @index = parse_index(first: first)
+            @start_date = start_date.clone
+            @last_date = last_date.invalid? ? start_date.clone : last_date.clone
+            super(index: @index, start_date: start_date, last_date: last_date)
+          end
+
+          #
+          # 予約元号一覧を更新する
+          #
+          def update
+            # 開始日の30日前に前の元号がある場合は、前の元号を設定する
+            start_date = @start_date.clone - (MAX_MONTH_DAYS + 1)
+            # 開始日の30日後に次の元号がある場合は、次の元号を設定する
+            last_date = @last_date.clone + (MAX_MONTH_DAYS + 1)
+
+            @list |= line(start_date: start_date, last_date: last_date)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/era/gengou/internal/reserve/dated_range.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative './abstract_range'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Gengou
+      # :nodoc:
+      module Reserve
+        #
+        # DatedRange 予約済み計算範囲
+        #
+        class DatedRange < AbstractRange
+          #
+          # 初期化
+          #
+          # @param [Western::Calendar] start_date 西暦開始日
+          # @param [Western::Calendar] last_date 西暦終了日
+          #
+          def initialize(start_date: Western::Calendar.new, last_date: Western::Calendar.new)
+            super(start_date: start_date, last_date: last_date)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/era/gengou/internal/reserve/empty_link.rb

@@ -0,0 +1,158 @@
+# frozen_string_literal: true
+
+require_relative '../../../../../era/japan/gengou/resource'
+require_relative '../../../../../era/japan/gengou'
+require_relative '../../../../../era/japan/calendar'
+require_relative '../../../../../era/western/calendar'
+
+require_relative '../counter'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Gengou
+      # :nodoc:
+      module Reserve
+        # EmptyLink
+        #
+        # 空元号連結
+        #
+        #  * 開始日と終了日の間は常に元号で満たす必要がある
+        #  * もし元号が存在しない期間があれば、空の元号を生成する
+        #
+        module EmptyLink
+          #
+          # 空元号で満たす
+          #
+          # @param [Array<Gengou::Counter>] counters 加算元号リスト
+          # @param [Western::Calendar] start_date 開始日
+          # @param [Western::Calendar] last_date 終了日
+          #
+          def self.fill(counters:, start_date: Western::Calendar.new,
+                        last_date: Western::Calendar.new)
+            if counters.size.zero?
+              counters.push(
+                create_empty_counter(
+                  start_date: start_date.clone,
+                  last_date: last_date.clone
+                )
+              )
+              return counters
+            end
+
+            fill_both_ends(counters: counters, start_date: start_date, last_date: last_date)
+
+            fill_middle(counters: counters)
+          end
+
+          #
+          # リストの両端を空元号で満たす
+          #
+          # @param [Array<Gengou::Counter>] counters 加算元号リスト
+          # @param [Western::Calendar] start_date 開始日
+          # @param [Western::Calendar] last_date 終了日
+          #
+          def self.fill_both_ends(counters:, start_date: Western::Calendar.new,
+                                  last_date: Western::Calendar.new)
+            fill_by_start(counters: counters, start_date: start_date)
+
+            fill_by_last(counters: counters, last_date: last_date)
+          end
+          private_class_method :fill_both_ends
+
+          #
+          # 先頭要素の手前を空元号で満たす
+          #
+          # @param [Array<Gengou::Counter>] counters 加算元号リスト
+          # @param [Western::Calendar] start_date 開始日
+          #
+          def self.fill_by_start(counters:, start_date:)
+            return unless start_date < counters[0].start_date
+
+            counters.unshift(
+              create_empty_counter(
+                start_date: start_date.clone,
+                last_date: counters[0].start_date.clone - 1
+              )
+            )
+          end
+          private_class_method :fill_by_start
+
+          #
+          # 最終要素の手前を空元号で満たす
+          #
+          # @param [Array<Gengou::Counter>] counters 加算元号リスト
+          # @param [Western::Calendar] last_date 終了日
+          #
+          def self.fill_by_last(counters:, last_date:)
+            return unless last_date > counters[-1].last_date
+
+            counters.push(
+              create_empty_counter(
+                start_date: counters[-1].last_date.clone + 1,
+                last_date: last_date.clone
+              )
+            )
+          end
+          private_class_method :fill_by_last
+
+          #
+          # 元号間を空元号で満たす
+          #
+          # @param [Array<Gengou::Counter>] counters 加算元号リスト
+          #
+          def self.fill_middle(counters:)
+            return if counters.size.zero?
+
+            size = counters.size - 1
+            (0..size).reverse_each do |index|
+              break if index <= 0
+
+              insert(counters: counters, index: index)
+            end
+          end
+          private_class_method :fill_middle
+
+          #
+          # 対象要素に空元号を追加する
+          #
+          # @param [Array<Gengou::Counter>] counters 加算元号リスト
+          # @param [Integer] index 要素番号
+          #
+          def self.insert(counters:, index:)
+            before_last_date = counters[index - 1].last_date.clone
+            current_start_date = counters[index].start_date.clone
+
+            return if (before_last_date.clone + 1) == current_start_date
+
+            counters.insert(
+              index,
+              create_empty_counter(
+                start_date: before_last_date + 1, last_date: current_start_date - 1
+              )
+            )
+          end
+          private_class_method :insert
+
+          #
+          # 空元号を生成する
+          #
+          # @param [Western::Calendar] start_date 西暦開始日
+          # @param [Western::Calendar] last_date 西暦終了日
+          #
+          # @return [Gengou::Counter] 加算元号（空元号）
+          #
+          def self.create_empty_counter(start_date:, last_date:)
+            Gengou::Counter.new(
+              gengou: Japan::Gengou::Resource::Gengou.new,
+              start_date: start_date, last_date: last_date
+            )
+          end
+          private_class_method :create_empty_counter
+        end
+      end
+    end
+  end
+end