zakuro 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd91623531440c342355fd005938af7cc10d07ae858dfb83d51704c6c1eab92c
-  data.tar.gz: 0a1bfca6ded7403960512c9854c5b22e95b761fb1c8d04fd530cb4806c2eaf66
+  metadata.gz: 4aab5a0f52f7180542260fa41204ea918b54601f525029e8e056efcd94cbf725
+  data.tar.gz: 6b72f7bbe79473ecbf0332c0f38aeea020d6cee6dfc42c667784c5ba6cb274d1
 SHA512:
-  metadata.gz: 76d1ad94413f1b0101964e6ac292e8e4074e2441418a1e31ad3f46d01397e5dba54afaf4799f1a45b310cb32bc17dc27bcf0d6a76348486dacb8a45ecf0df7e3
-  data.tar.gz: f97b9d72fde20c6bcf991f8136b8c9ee935516c27243f7a46ad60c1c38abe32cecb825a51083f01b605d9f4a00810df7c29be09a6564b2881000dd9ae6713786
+  metadata.gz: b990f830dd4bb46a340ae3fadfd2b303bd2a5e686351b2f4463dced260182114a5886ff35e10558d27c99752e9dae6a6bff9805e61ae635076e144341770b665
+  data.tar.gz: cc8546a484bba5a35049072b6a048751c9fa13a5609bd677345c9c1d69de2b41362de4695e19f3ec91b67da0de097058bcf16e618534502d1e23b4225763a05d

data/README.md

@@ -133,7 +133,7 @@ puts merchant.commit.to_json
 | 項目名   | キー名    | - | - | データ型                          | 参考値 | 備考                                　 |
 |----------|-----------|---|---|-----------------------------------|--------|---------------------------------------|
 | 日付情報 | data      |   |   | Zakuro::Result::Data::SingleDay   | -      | 運用値（計算値は運用情報内を参照のこと）|
-| 運用情報 | operation |   |   | Zakuro::Result::Operation::Bundle | -      | -                                     |
+| 運用情報 | operation |   |   | Zakuro::Result::Operation         | -      | -                                     |
 
 ### Zakuro::Result::Range
 
@@ -180,10 +180,10 @@ puts merchant.commit.to_json
 | 項目名       | キー名   | -          | -           | データ型                                   | 参考値   | 備考                 |
 |--------------|----------|------------|-------------|--------------------------------------------|---------|----------------------|
 | 運用有無     | operated | 　         | 　          | True/False                                 | true     | 　                   |
-| 月別履歴情報 | month    | 　         | 　          | Zakuro::Result::Operation::Month::Bundle   | 　       | 　                   |
+| 月別履歴情報  | month    | 　         | 　          | Zakuro::Result::Operation::Month            | 　       | 　                   |
 | 計算値       | original | 　         | 　          | Zakuro::Result::Data::SingleDay            | 　       | 運用値差替前の計算値 |
 
-### Zakuro::Result::Operation::Month::Bundle
+### Zakuro::Result::Operation::Month
 
 | 項目名                   | キー名   | -          | -        | データ型                                   | 参考値        | 備考                                         |
 |--------------------------|----------|------------|----------|--------------------------------------------|--------------|---------------------------------------------|

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.8.0

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

@@ -45,7 +45,7 @@ module Zakuro
         # @return [LinearGengou] 1行目元号
         #
         def match_first_line(date: Western::Calendar)
-          @first_line.each do |line|
+          first_line.each do |line|
             return line.clone if line.include?(date: date)
           end
 
@@ -60,7 +60,7 @@ module Zakuro
         # @return [LinearGengou] 2行目元号
         #
         def match_second_line(date: Western::Calendar)
-          @second_line.each do |line|
+          second_line.each do |line|
             return line.clone if line.include?(date: date)
           end
 
@@ -91,7 +91,7 @@ module Zakuro
         # @return [LinearGengou] 1行目元号
         #
         def match_first_line_by_name(name:)
-          @first_line.each do |line|
+          first_line.each do |line|
             return line.clone if line.name == name
           end
 
@@ -106,7 +106,7 @@ module Zakuro
         # @return [LinearGengou] 2行目元号
         #
         def match_second_line_by_name(name:)
-          @second_line.each do |line|
+          second_line.each do |line|
             return line.clone if line.name == name
           end
 
@@ -120,7 +120,7 @@ module Zakuro
         # @return [False] 不正なし
         #
         def invalid?
-          @first_line.size.zero? && @second_line.size.zero?
+          first_line.size.zero? && second_line.size.zero?
         end
       end
     end

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

@@ -46,7 +46,7 @@ module Zakuro
         # @return [False] 不正なし
         #
         def invalid?
-          @name == '' || @year == INVALID_YEAR
+          name == '' || year == INVALID_YEAR
         end
 
         #
@@ -60,13 +60,13 @@ module Zakuro
         def include?(date: Western::Calendar.new)
           return false if invalid?
 
-          return false if @start_date.invalid?
+          return false if start_date.invalid?
 
-          return false if @last_date.invalid?
+          return false if last_date.invalid?
 
-          return false if date < @start_date
+          return false if date < start_date
 
-          return false if date > @last_date
+          return false if date > last_date
 
           true
         end

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

@@ -56,7 +56,7 @@ module Zakuro
         # @return [Array<OperatedMonth>] 昨年に属する月
         #
         def shift_last_year_months
-          result, @months = OperatedYear.devide_with(method: :last_year?, arr: months)
+          result, @months = self.class.devide_with(method: :last_year?, arr: months)
 
           result
         end
@@ -67,36 +67,38 @@ module Zakuro
         # @return [Array<OperatedMonth>] 来年に属する月
         #
         def pop_next_year_months
-          result, @months = OperatedYear.devide_with(method: :next_year?, arr: months)
+          result, @months = self.class.devide_with(method: :next_year?, arr: months)
 
           result
         end
 
         # :reek:TooManyStatements { max_statements: 8 }
 
-        #
-        # メソッドで配列を分離する
-        #
-        # @param [Symbol] method 条件メソッド
-        # @param [Array<Object>] arr 配列
-        #
-        # @return [Array<Object>] 一致配列
-        # @return [Array<Object>] 不一致配列
-        #
-        def self.devide_with(method:, arr: [])
-          match = []
-          unmatch = []
+        class << self
+          #
+          # メソッドで配列を分離する
+          #
+          # @param [Symbol] method 条件メソッド
+          # @param [Array<Object>] arr 配列
+          #
+          # @return [Array<Object>] 一致配列
+          # @return [Array<Object>] 不一致配列
+          #
+          def devide_with(method:, arr: [])
+            match = []
+            unmatch = []
+
+            arr.each do |item|
+              if !item.moved? && item.send(method)
+                match.push(item)
+                next
+              end
 
-          arr.each do |item|
-            if !item.moved? && item.send(method)
-              match.push(item)
-              next
+              unmatch.push(item)
             end
 
-            unmatch.push(item)
+            [match, unmatch]
           end
-
-          [match, unmatch]
         end
       end
     end

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

@@ -72,7 +72,7 @@ module Zakuro
 
           return Western::Calendar.new if months.size.zero?
 
-          @months[0].western_date
+          months[0].western_date
         end
 
         #
@@ -95,7 +95,7 @@ module Zakuro
         def push(month:)
           return if duplicated?(month: month)
 
-          @months.push(month)
+          months.push(month)
 
           nil
         end
@@ -111,7 +111,7 @@ module Zakuro
         # @return [True] 重複していない
         #
         def duplicated?(month:)
-          @months.each do |existed|
+          months.each do |existed|
             return true if existed.same?(other: month)
           end
           false

data/lib/zakuro/calculation/cycle/abstract_remainder.rb

@@ -75,8 +75,8 @@ module Zakuro
           @second = second
 
           if total != -1
-            @day = (total.to_f / @base_day).floor
-            @minute = (total % @base_day)
+            @day = (total.to_f / base_day).floor
+            @minute = (total % base_day)
             @second = 0
           end
 
@@ -127,7 +127,7 @@ module Zakuro
         # @return [String] 十干十二支名
         #
         def zodiac_name
-          Cycle::Zodiac.day_name(day: @day)
+          Cycle::Zodiac.day_name(day: day)
         end
 
         #
@@ -139,9 +139,9 @@ module Zakuro
         # @return [False] 当月朔日と翌月朔日が異なる十干（「小」の月）
         #
         def same_remainder_divided_by_ten?(other:)
-          day = @day % LIMIT
+          remainder_day = day % LIMIT
 
-          (day % 10) == (other % 10)
+          (remainder_day % 10) == (other % 10)
         end
 
         #
@@ -153,12 +153,14 @@ module Zakuro
         #
         def add(other)
           invalid?(param: other)
-          day = @day + other.day
-          minute = @minute + other.minute
-          second = @second + other.second
-          day, minute, second = carry(day, minute, second)
+          sum_day = day + other.day
+          sum_minute = minute + other.minute
+          sum_second = second + other.second
+          sum_day, sum_minute, sum_second = carry(
+            sum_day, sum_minute, sum_second
+          )
 
-          clone.set(day: day, minute: minute, second: second)
+          clone.set(day: sum_day, minute: sum_minute, second: sum_second)
         end
 
         #
@@ -186,12 +188,14 @@ module Zakuro
         #
         def sub(other)
           invalid?(param: other)
-          day = @day - other.day
-          minute = @minute - other.minute
-          second = @second - other.second
-          day, minute, second = carry(day, minute, second)
+          sum_day = day - other.day
+          sum_minute = minute - other.minute
+          sum_second = second - other.second
+          sum_day, sum_minute, sum_second = carry(
+            sum_day, sum_minute, sum_second
+          )
 
-          clone.set(day: day, minute: minute, second: second)
+          clone.set(day: sum_day, minute: sum_minute, second: sum_second)
         end
 
         #
@@ -300,9 +304,9 @@ module Zakuro
         def up_on_new_moon
           cloned = clone
           limit = (base_day * 3) / 4
-          if @minute >= limit
-            day, minute, second = carry((@day + 1), @minute, @second)
-            return cloned.set(day: day, minute: minute, second: second)
+          if minute >= limit
+            sum_day, sum_minute, sum_second = carry((day + 1), minute, second)
+            return cloned.set(day: sum_day, minute: sum_minute, second: sum_second)
           end
 
           cloned
@@ -333,7 +337,7 @@ module Zakuro
         # @return [Integer] 小余
         #
         def to_minute
-          @day * @base_day + @minute
+          day * base_day + minute
         end
 
         #
@@ -354,7 +358,7 @@ module Zakuro
         # @return [Float] 小余
         #
         def float_minute
-          @minute + @second.to_f / @base_minute
+          minute + second.to_f / base_minute
         end
 
         #
@@ -363,10 +367,10 @@ module Zakuro
         # @return [AbstractRemainder] 大余
         #
         def round
-          day = @day
-          day += 1 if @minute >= (@base_day / 2)
+          sum_day = day
+          sum_day += 1 if minute >= (base_day / 2)
 
-          initialize(day, 0, 0)
+          initialize(sum_day, 0, 0)
         end
 
         #
@@ -375,7 +379,7 @@ module Zakuro
         # @return [String] 文字化
         #
         def to_s
-          "大余（日）: #{@day}, 小余（分）: #{@minute}, 小余（秒）: #{@second}"
+          "大余（日）: #{day}, 小余（分）: #{minute}, 小余（秒）: #{second}"
         end
 
         #
@@ -384,7 +388,7 @@ module Zakuro
         # @return [AbstractRemainder] 繰り上げ結果
         #
         def carry!
-          @day, @minute, @second = carry(@day, @minute, @second)
+          @day, @minute, @second = carry(day, minute, second)
 
           self
         end
@@ -406,11 +410,11 @@ module Zakuro
         def carry_second(param_minute, param_second)
           sign = param_second.negative? ? -1 : 1
           abs = sign * param_second
-          minute = param_minute + (sign * (abs / @base_minute).floor)
-          second = sign * (abs % @base_minute)
+          minute = param_minute + (sign * (abs / base_minute).floor)
+          second = sign * (abs % base_minute)
 
           if sign.negative?
-            second += @base_minute
+            second += base_minute
             minute -= 1
           end
 
@@ -421,11 +425,11 @@ module Zakuro
           sign = param_minute.negative? ? -1 : 1
           abs = sign * param_minute
 
-          day = param_day + (sign * (abs / @base_day).floor)
-          minute = sign * (abs % @base_day)
+          day = param_day + (sign * (abs / base_day).floor)
+          minute = sign * (abs % base_day)
 
           if sign.negative?
-            minute += @base_day
+            minute += base_day
             day -= 1
           end
 
@@ -435,37 +439,39 @@ module Zakuro
         def carry_day(day, limited)
           sign = day.negative? ? -1 : 1
           abs = sign * day
-          carried = sign * (abs % @base_limit) if limited
-          carried += @base_limit if sign.negative?
+          carried = sign * (abs % base_limit) if limited
+          carried += base_limit if sign.negative?
           carried
         end
 
         def up?(other)
           invalid?(param: other)
-          day = other.day
-          minute = other.float_minute
+          other_day = other.day
+          other_minute = other.float_minute
 
-          return true if @day > day
-          return false if @day < day
+          return true if day > other_day
 
-          float_minute > minute
+          return false if day < other_day
+
+          float_minute > other_minute
         end
 
         def eql?(other)
           invalid?(param: other)
 
-          (@day == other.day && float_minute == other.float_minute)
+          (day == other.day && float_minute == other.float_minute)
         end
 
         def down?(other)
           invalid?(param: other)
-          day = other.day
-          minute = other.float_minute
+          other_day = other.day
+          other_minute = other.float_minute
+
+          return true if day < other_day
 
-          return true if @day < day
-          return false if @day > day
+          return false if day > other_day
 
-          float_minute < minute
+          float_minute < other_minute
         end
       end
     end

data/lib/zakuro/calculation/cycle/abstract_solar_term.rb

@@ -67,7 +67,7 @@ module Zakuro
         # @return [False] 正しい
         #
         def invalid?
-          (@index == -1 || @remainder.invalid?)
+          (index == -1 || remainder.invalid?)
         end
 
         #
@@ -77,21 +77,7 @@ module Zakuro
         # @return [False] データあり
         #
         def empty?
-          (@index == -1 && @remainder.invalid?)
-        end
-
-        #
-        # 有効な二十四節気番号か
-        #
-        # @param [Integer] index 連番
-        #
-        # @return [True] 有効
-        # @return [False] 無効
-        #
-        def self.index?(index)
-          result = ORDER.fetch(index, -1)
-
-          result != -1
+          (index == -1 && remainder.invalid?)
         end
 
         #
@@ -106,9 +92,9 @@ module Zakuro
         #
         def next_term
           @index += 1
-          @index = 0 if @index >= ORDER.size
+          @index = 0 if index >= ORDER.size
 
-          @remainder.add(@average)
+          remainder.add(average)
         end
 
         #
@@ -119,8 +105,9 @@ module Zakuro
         def next_by_index(index)
           return ArgumentError.new, 'invalid index' unless AbstractSolarTerm.index?(index)
 
-          loop do
-            return if @index == index
+          (0..(ORDER.size - 1)).each do |_index|
+            inner_index = @index
+            break if inner_index == index
 
             next!
           end
@@ -134,8 +121,9 @@ module Zakuro
         def prev_by_index(index)
           return ArgumentError.new, 'invalid index' unless AbstractSolarTerm.index?(index)
 
-          loop do
-            return if @index == index
+          (0..(ORDER.size - 1)).each do |_index|
+            inner_index = @index
+            break if inner_index == index
 
             prev_term!
           end
@@ -153,9 +141,9 @@ module Zakuro
         #
         def prev_term
           @index -= 1
-          @index = 23 if @index.negative?
+          @index = 23 if index.negative?
 
-          @remainder.sub(@average)
+          remainder.sub(average)
         end
 
         #
@@ -167,6 +155,22 @@ module Zakuro
           @index = obj.index.clone
           @remainder = obj.remainder.clone
         end
+
+        class << self
+          #
+          # 有効な二十四節気番号か
+          #
+          # @param [Integer] index 連番
+          #
+          # @return [True] 有効
+          # @return [False] 無効
+          #
+          def index?(index)
+            result = ORDER.fetch(index, -1)
+
+            result != -1
+          end
+        end
       end
     end
   end

data/lib/zakuro/calculation/cycle/zodiac.rb

@@ -77,28 +77,30 @@ module Zakuro
         # @return [Integer] 組み合わせ数
         LENGTH = ZODIAC_NAME_PATTERNS.length
 
-        #
-        # 大余を十干十二支に変換する
-        #
-        # @param [Integer] day 大余
-        #
-        # @return [String] 十干十二支
-        #
-        def self.day_name(day:)
-          index = day % LENGTH
+        class << self
+          #
+          # 大余を十干十二支に変換する
+          #
+          # @param [Integer] day 大余
+          #
+          # @return [String] 十干十二支
+          #
+          def day_name(day:)
+            index = day % LENGTH
 
-          ZODIAC_NAME_PATTERNS[index]
-        end
+            ZODIAC_NAME_PATTERNS[index]
+          end
 
-        #
-        # 西暦年を十干十二支に変換する
-        #
-        # @param [Integer] western_year 西暦年
-        #
-        # @return [String] 十干十二支
-        #
-        def self.year_name(western_year: 0)
-          ZODIAC_NAME_PATTERNS[(western_year - 4) % LENGTH]
+          #
+          # 西暦年を十干十二支に変換する
+          #
+          # @param [Integer] western_year 西暦年
+          #
+          # @return [String] 十干十二支
+          #
+          def year_name(western_year: 0)
+            ZODIAC_NAME_PATTERNS[(western_year - 4) % LENGTH]
+          end
         end
       end
     end