zakuro 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bd01ed3f0167a40a3c48e6c38c41b12229a0e46de4fb0c3fab8062ad81e74bf
-  data.tar.gz: 9c9b86b6d3ac88a70c5eaafe432182408124bf69d87ec9d6c8194aab4eef5df5
+  metadata.gz: b9760966b2231b53988a9d909ac51c29ecaafbeddda486ebe204ad06c3ce1d70
+  data.tar.gz: e937ea0d241f429e674d9027e9a0a22643a01cd438f4b273988d2b5fdba6acda
 SHA512:
-  metadata.gz: eaa23e0b9cb8622c181ecaecdcddaf6e31e22ebbf827fd3a2849f7085e65b37108fe4157fb4e2818102954f3fd89610345b05553674e0df15abf4be1cd5dc41a
-  data.tar.gz: c58e2b2923d43b9ef882aff3d658108a6093b772f0fa4d2c2abb70c1ebb3313b111aed0aa84ba52e371bb6ab306365e6aaddbb0855b45ae82482f0a49b827c15
+  metadata.gz: 49be7726c71d135ff35331a30e3b8c892e6790cf9bab1a7d8dac8ee33aa8658421aa3f45604cf012d8ec76111389c15fc11ad0e2165bfb2c3a1ba1718151f190
+  data.tar.gz: 8c3eeecb97ffb39c7dc637c580d4478ae12e409d6d1f104596d00fbeba8ffbc81fe2c90d4c02b283d66ed8430c4d7c443a4f9ea5aec1710e2c89fa1132a07389

data/.rubocop.yml

@@ -9,6 +9,9 @@ Layout/EndOfLine:
 Metrics/MethodLength:
   Max: 15
 
+Naming/VariableNumber:
+  EnforcedStyle: snake_case
+
 # https://lkml.org/lkml/2020/5/29/1038
 Layout/LineLength:
   Max: 100

data/lib/zakuro/condition.rb

@@ -137,6 +137,7 @@ module Zakuro
     class Options
       # @return [Array<String>] オプション
       attr_reader :options
+
       #
       # 初期化
       #

data/lib/zakuro/cycle/abstract_remainder.rb

@@ -35,15 +35,14 @@ module Zakuro
       #
       # 初期化
       #
+      # @param [Integer] base_day 1大余に必要な小余（暦によって基数が異なる）
+      # @param [Integer] base_mitune 1小余に必要な秒（暦によって基数が異なる）
       # @param [Integer] day 大余（"日"に相当）
       # @param [Integer] minute 小余（"分"に相当）
       # @param [Integer] second 秒
       # @param [Integer] total 繰り上げなしの小余
-      # @param [Integer] base_day 1大余に必要な小余（暦によって基数が異なる）
-      # @param [Integer] base_mitune 1小余に必要な秒（暦によって基数が異なる）
       #
-      def initialize(day: -1, minute: -1, second: -1, total: -1,
-                     base_day:, base_mitune:)
+      def initialize(base_day:, base_mitune:, day: -1, minute: -1, second: -1, total: -1)
         @base_limit = LIMIT
         @base_day = base_day
         @base_minute = base_mitune

data/lib/zakuro/era/gengou/set-003-modern.yaml

@@ -21,7 +21,7 @@ list:
     new_year_date: "1926-1-1"
     note: ""
   - name: "令和"
-    # -
+    # 1年5月1日
     start_year: 1
     start_date: "2019-5-1"
     new_year_date: "2019-1-1"

data/lib/zakuro/era/japan.rb

@@ -89,6 +89,8 @@ module Zakuro
       end
     end
 
+    # :reek:TooManyInstanceVariables { max_instance_variables: 5 }
+
     #
     # Gengou 元号情報
     #
@@ -269,6 +271,8 @@ module Zakuro
         SetParser.new(hash: yaml_hash).validate
       end
 
+      # :reek:TooManyInstanceVariables { max_instance_variables: 5 }
+
       #
       # GengouParser 元号情報の検証/展開を行う
       #
@@ -298,7 +302,7 @@ module Zakuro
           @start_year = hash['start_year']
         end
 
-        # :reek:TooManyStatements { max_statements: 6 }
+        # :reek:TooManyStatements { max_statements: 7 }
 
         #
         # 検証する
@@ -604,7 +608,7 @@ module Zakuro
         return lines unless lines[0].invalid?
 
         first = Japan::Gengou.new
-        lines[1..-1].each.with_index(1) do |item, index|
+        lines[1..].each.with_index(1) do |item, index|
           next if item.invalid?
 
           first = item

data/lib/zakuro/output/result.rb

@@ -161,6 +161,11 @@ module Zakuro
     # Core 共通処理
     #
     class Core
+      #
+      # 初期化
+      #
+      def initialize(*_args); end
+
       #
       # ハッシュ化する
       #
@@ -210,6 +215,7 @@ module Zakuro
       # @param [Day] day 日
       #
       def initialize(year:, month:, day:)
+        super
         @year = year
         @month = month
         @day = day

data/lib/zakuro/version.rb

@@ -3,5 +3,5 @@
 # :nodoc:
 module Zakuro
   # @return [String] library version
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/zakuro/version/senmyou/base/remainder.rb

@@ -29,8 +29,8 @@ module Zakuro
       # @param [Integer] total 繰り上げなしの小余
       #
       def initialize(day: -1, minute: -1, second: -1, total: -1)
-        super(day: day, minute: minute, second: second, total: total,
-              base_day: DAY, base_mitune: MINUTE)
+        super(base_day: DAY, base_mitune: MINUTE,
+              day: day, minute: minute, second: second, total: total)
       end
     end
 
@@ -52,8 +52,8 @@ module Zakuro
       # @param [Integer] total 繰り上げなしの小余
       #
       def initialize(day: -1, minute: -1, second: -1, total: -1)
-        super(day: day, minute: minute, second: second, total: total,
-              base_day: DAY, base_mitune: MINUTE)
+        super(base_day: DAY, base_mitune: MINUTE,
+              day: day, minute: minute, second: second, total: total)
       end
     end
   end

data/lib/zakuro/version/senmyou/monthly/lunar_phase.rb

@@ -145,7 +145,7 @@ module Zakuro
       # @return [Remainder] 定朔
       #
       def current_remainder
-        debug('@average_remainder.format:' + @average_remainder.format)
+        debug("@average_remainder.format: #{@average_remainder.format}")
 
         sum = correction_value
         adjusted = @average_remainder.add(

data/lib/zakuro/version/senmyou/stella/lunar_orbit.rb

@@ -193,7 +193,7 @@ module Zakuro
           { |key, _| key.match(/^#{prefix}_#{format('%<day>02d', day: day)}_.*/) }
 
         targets.each do |key, value|
-          # NOTE 境界値は上から順に引き当てた方を返す（7日の境界値7465は上のキーで返す）
+          # NOTE: 境界値は上から順に引き当てた方を返す（7日の境界値7465は上のキーで返す）
           matched, diff = \
             extract_data_from_moon_adjustment_key(key, minute)
           # 小余の下げ幅

data/lib/zakuro/version/senmyou/stella/solar_average.rb

@@ -72,39 +72,53 @@ module Zakuro
       # @param [Array<Month>] annual_range 1年データ
       # @param [Array<Remainder>] solar_terms 1年データ内の全二十四節気
       #
-      def self.apply_solar_terms_from_last_winter_solstice(annual_range:,
-                                                           solar_terms:)
-
-        c_idx = 0
-        st_idx = 0
+      def self.apply_solar_terms_from_last_winter_solstice(annual_range:, solar_terms:)
+        month_index = 0
+        solar_term_index = 0
         month_size = annual_range.size
 
-        while c_idx < month_size && st_idx < solar_terms.size
-          raise StandardError, "month is over. idx: #{c_idx}" if c_idx >= month_size
-
-          current_month = annual_range[c_idx]
-          next_month = annual_range[c_idx + 1]
-          solar_term = solar_terms[st_idx]
+        while month_index < month_size && solar_term_index < solar_terms.size
+          raise StandardError, "month is over. idx: #{month_index}" if month_index >= month_size
 
-          if in_range_solar_term?(target: solar_term, min: current_month.remainder,
-                                  max: next_month.remainder)
-            set_solar_term(month: current_month,
-                           solar_term: solar_term, solar_term_index: st_idx)
-            st_idx += 1
+          if set_solar_term_on_current_month(current_month: annual_range[month_index],
+                                             next_month: annual_range[month_index + 1],
+                                             solar_term: solar_terms[solar_term_index],
+                                             solar_term_index: solar_term_index)
+            solar_term_index += 1
             next
           end
 
-          # 一度も割り当てがない場合は二十四節気を進める
-          if current_month.empty_solar_term?
-            st_idx += 1
-            next
-          end
-
-          c_idx += 1
+          month_index += 1
         end
       end
       private_class_method :apply_solar_terms_from_last_winter_solstice
 
+      #
+      # 当月に二十四節気を設定する
+      #
+      # @param [Remainder] current_month 当月
+      # @param [Month] next_month 次月
+      # @param [Month] solar_term 二十四節気
+      # @param [Integer] solar_term_index 二十四節気位置
+      #
+      # @return [True] 設定済
+      # @return [False] 未設定
+      #
+      def self.set_solar_term_on_current_month(current_month:,
+                                               next_month:, solar_term:, solar_term_index:)
+        if in_range_solar_term?(target: solar_term, min: current_month.remainder,
+                                max: next_month.remainder)
+          set_solar_term(month: current_month,
+                         solar_term: solar_term, solar_term_index: solar_term_index)
+          return true
+        end
+
+        # 一度も割り当てがない場合は設定済みとして次の二十四節気を進める
+        return true if current_month.empty_solar_term?
+
+        false
+      end
+
       #
       # 1年データ内の二十四節気の前後を収集する
       #

data/lib/zakuro/version/senmyou/stella/solar_orbit.rb

@@ -302,10 +302,8 @@ module Zakuro
         per_day = adjustment.per_day
         sign, ratio = calc_ratio(day: remainder.day, per_term: per_term, per_day: per_day)
 
-        day_stack = calc_day_stack_from_ratio(sign: sign, ratio: ratio,
-                                              minute: remainder.minute)
-
-        day_stack
+        calc_day_stack_from_ratio(sign: sign, ratio: ratio,
+                                  minute: remainder.minute)
       end
       private_class_method :calc_day_stack
 
@@ -388,9 +386,7 @@ module Zakuro
         month_stack = stack + day * per_term + \
                       (1 / 2.0) * (day * (day - 1) * per_day)
         # 切り捨て（プラスマイナスに関わらず小数点以下切り捨て）
-        month_stack = month_stack.negative? ? month_stack.ceil : month_stack.floor
-
-        month_stack
+        month_stack.negative? ? month_stack.ceil : month_stack.floor
       end
       private_class_method :calc_month_stack
     end

data/lib/zakuro/version/senmyou/summary/annual_range.rb

@@ -164,10 +164,11 @@ module Zakuro
       def self.adjust_leap_month(annual_range:)
         # 閏による月の再調整を行う
         leaped = false
-        annual_range.each do |month|
+        annual_range.each_with_index do |month, index|
           if month.even_term.invalid?
             month.leaped = true
-            leaped = true
+            # NOTE: 初回閏月（閏11月）は前回月が存在しないため調整外
+            leaped = true unless index.zero?
           end
           next unless leaped
 

data/lib/zakuro/version/senmyou/summary/full_range.rb

@@ -20,9 +20,7 @@ module Zakuro
     #   * 引き当てたい日付が元旦ではない場合、その月日に従い元号を再度求める
     #   * この再計算が必要になるのは、元号が切り替わる年のみである
     class FullRange
-      attr_reader :multi_gengou_roller
-      attr_reader :new_year_date
-      attr_reader :western_year
+      attr_reader :multi_gengou_roller, :new_year_date, :western_year
 
       # @return [Logger] ロガー
       LOGGER = Logger.new(location: 'full_range')
@@ -40,8 +38,7 @@ module Zakuro
       #
       def get
         years = FullRange.rearranged_years(annual_ranges: annual_ranges)
-        years = update_gengou(years: years)
-        years
+        update_gengou(years: years)
       end
 
       # :reek:TooManyStatements { max_statements: 6 }
@@ -115,6 +112,11 @@ module Zakuro
       #
       # 当年データを生成する
       #
+      # @param [Array<Year>] annual_ranges 年データ（冬至基準）
+      # @param [Year] year 対象年
+      #
+      # @return [Year] 当年月ありの対象年
+      #
       def self.push_current_year(annual_range:, year: Year.new)
         annual_range.each do |month|
           next if month.is_last_year
@@ -126,7 +128,12 @@ module Zakuro
       end
 
       #
-      # 当年データを生成する
+      # 昨年データを生成する
+      #
+      # @param [Array<Year>] annual_ranges 年データ（冬至基準）
+      # @param [Year] year 対象年
+      #
+      # @return [Year] 昨年月ありの対象年
       #
       def self.push_last_year(annual_range:, year: Year.new)
         annual_range.each do |month|
@@ -142,6 +149,7 @@ module Zakuro
       # 年データの開始月を変更する
       #
       # @param [Array<Year>] annual_ranges 年データ（冬至基準）
+      # @param [Integer] index 対象年の要素番号
       #
       # @return [Year] 年データ（元旦基準）
       #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zakuro
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - pldb
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies: []
 description: mainly lunar solar calendar
 email:
@@ -87,7 +87,7 @@ metadata:
   homepage_uri: https://github.com/pldb/zakuro
   source_code_uri: https://github.com/pldb/zakuro
   changelog_uri: https://github.com/pldb/zakuro
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: japanese calendar library.
 test_files: []