toji 2.13.0 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 790b5fcd43ef2cfa6a3f0d16618651be488cdd42c6814c8e64d6f9565dc95a7f
-  data.tar.gz: 6783fd2dbf5a242ccc83e375a9e1c5896c906e25f49055392e64722b60ca67e5
+  metadata.gz: bfa76ef9b8f8a73ea20b84bf68c9480a1664888c08fb2d541cdfd6023b4f93a3
+  data.tar.gz: ce4f2d927d653d20a541d21a98954d27c70eba6e67022355e8cf9d887ca2842b
 SHA512:
-  metadata.gz: e3073e4fae01131c7cbad525a28700d9996e83c9cb999969b61a24ba62bffed95aa72d9999ba3b4f36327678b678f6f04bac38281cd8804aeb73aedfc50b7bbe
-  data.tar.gz: 2aa7c01abc363d154e809abc3673b0d2a20e4d62342d5ecdb74f1ccb241349ad7d7702be3f9b68b3f7ad2da3506b97aa40c015e4c8fbe82556ed6dad0b6443d1
+  metadata.gz: 134dfc5763d67f9dda33917ad51dfb923631e503e296ab97eea6733fb809b656d73d702263a6a3b565b27a9ac3594d1fd1b3f7599259947098b0a36a7ce86f33
+  data.tar.gz: bd02c83d17c87aabfb3f24cc6386d48f7cc562dd61f5d66a75615dae70b93c100779e55772f7a821eae6ad6abc15c6c1e6dfc1ea51ab242ad84efd1459e13096

data/example/example_core.rb

@@ -8,8 +8,12 @@ module Example
     include Toji::Product
     include Toji::Product::ScheduleFactory
 
-    attr_accessor :description
-    attr_accessor :color
+    attr_reader :name
+    attr_reader :recipe
+    attr_reader :base_date
+
+    attr_reader :description
+    attr_reader :color
 
     def initialize(id, name, description, recipe, base_date, color=nil)
       @id = id
@@ -86,7 +90,18 @@ module Example
   class Step
     include Toji::Recipe::Step
 
-    def initialize(kojis: [], kakes: [], waters: [], lactic_acids: [], alcohols: [], yeasts: [])
+    attr_reader :index
+    attr_reader :subindex
+    attr_accessor :kojis
+    attr_accessor :kakes
+    attr_accessor :waters
+    attr_accessor :lactic_acids
+    attr_accessor :alcohols
+    attr_accessor :yeasts
+
+    def initialize(index:, subindex:, kojis: [], kakes: [], waters: [], lactic_acids: [], alcohols: [], yeasts: [])
+      @index = index
+      @subindex = subindex
       @kojis = kojis
       @kakes = kakes
       @waters = waters
@@ -108,6 +123,18 @@ module Example
   class Koji
     include Toji::Ingredient::Koji
 
+    attr_accessor :weight
+    attr_reader :brand
+    attr_reader :polishing_ratio
+    attr_reader :made_in
+    attr_reader :year
+    attr_reader :soaking_ratio
+    attr_reader :steaming_ratio
+    attr_reader :cooling_ratio
+    attr_reader :tanekojis
+    attr_reader :dekoji_ratio
+    attr_reader :interval_days
+
     def initialize(weight:, brand:, polishing_ratio:, made_in:, year:, soaking_ratio:, steaming_ratio:, cooling_ratio:, tanekojis:, dekoji_ratio:, interval_days:)
       @weight = weight
       @brand = brand
@@ -150,6 +177,8 @@ module Example
     include Toji::Ingredient::Tanekoji
 
     attr_accessor :koji
+    attr_reader :brand
+    attr_reader :ratio
 
     def initialize(koji: nil, brand:, ratio:)
       @brand = brand
@@ -165,6 +194,16 @@ module Example
   class Kake
     include Toji::Ingredient::Kake
 
+    attr_accessor :weight
+    attr_reader :brand
+    attr_reader :polishing_ratio
+    attr_reader :made_in
+    attr_reader :year
+    attr_reader :soaking_ratio
+    attr_reader :steaming_ratio
+    attr_reader :cooling_ratio
+    attr_reader :interval_days
+
     def initialize(weight:, brand:, polishing_ratio:, made_in:, year:, soaking_ratio:, steaming_ratio:, cooling_ratio:, interval_days:)
       @weight = weight
       @brand = brand
@@ -181,6 +220,10 @@ module Example
   class Water
     include Toji::Ingredient::Water
 
+    attr_accessor :weight
+    attr_reader :calcium_hardness
+    attr_reader :magnesium_hardness
+
     def initialize(weight:)
       @weight = weight
     end
@@ -189,6 +232,8 @@ module Example
   class LacticAcid
     include Toji::Ingredient::LacticAcid
 
+    attr_accessor :weight
+
     def initialize(weight:)
       @weight = weight
     end
@@ -197,6 +242,8 @@ module Example
   class Alcohol
     include Toji::Ingredient::Alcohol
 
+    attr_accessor :weight
+
     def initialize(weight:)
       @weight = weight
     end
@@ -205,6 +252,10 @@ module Example
   class Yeast
     include Toji::Ingredient::Yeast
 
+    attr_accessor :weight
+    attr_reader :unit
+    attr_reader :brand
+
     def initialize(weight:)
       @weight = weight
     end
@@ -214,22 +265,48 @@ module Example
   class Action
     include Toji::Recipe::Action
 
+    attr_reader :type
+    attr_reader :interval_days
+
     def initialize(type:, interval_days:)
       @type = type
       @interval_days = interval_days
     end
   end
 
+  class AbExpect
+    include Toji::Recipe::AbExpect
+
+    attr_reader :alcohol
+    attr_reader :nihonshudo
+
+    def initialize(alcohol:, nihonshudo:)
+      @alcohol = alcohol
+      @nihonshudo = nihonshudo
+    end
+  end
+
 
   class Recipe
     include Toji::Recipe
 
-    def initialize(steps)
+    attr_reader :steps
+    attr_reader :actions
+    attr_reader :ab_coef
+    attr_reader :ab_expects
+
+    def initialize(steps:, actions:, ab_coef:, ab_expects:)
       @steps = steps
+      @actions = actions
+      @ab_coef = ab_coef
+      @ab_expects = ab_expects
     end
 
     def initialize_copy(obj)
       @steps = obj.steps.deep_dup
+      @actions = obj.actions.deep_dup
+      @ab_coef = obj.ab_coef.dup
+      @ab_expects = obj.ab_expects.deep_dup
     end
 
     # 乳酸は汲水100L当たり比重1.21の乳酸(90%乳酸と称される)を650〜720ml添加する。
@@ -242,8 +319,10 @@ module Example
       # 酒造教本による標準型仕込配合
       # 出典: 酒造教本 P97
       sokujo_textbook: new(
-        [
+        steps: [
           Step.new(
+            index: 0,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 20,
@@ -294,6 +373,8 @@ module Example
             ]
           ),
           Step.new(
+            index: 1,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 40,
@@ -334,6 +415,8 @@ module Example
             ],
           ),
           Step.new(
+            index: 2,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 60,
@@ -374,6 +457,8 @@ module Example
             ],
           ),
           Step.new(
+            index: 3,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 80,
@@ -414,6 +499,8 @@ module Example
             ],
           ),
           Step.new(
+            index: 4,
+            subindex: 0,
             kakes: [
               Kake.new(
                 weight: 80,
@@ -433,13 +520,32 @@ module Example
               ),
             ],
           ),
-        ].map(&:freeze).freeze
+        ].map(&:freeze).freeze,
+        actions: [
+          Action.new(
+            type: :squeeze,
+            interval_days: 50,
+          ),
+        ].map(&:freeze).freeze,
+        ab_coef: 1.4,
+        ab_expects: [
+          AbExpect.new(
+            alcohol: 15.0,
+            nihonshudo: 0.0,
+          ),
+          AbExpect.new(
+            alcohol: 16.0,
+            nihonshudo: 3.0,
+          ),
+        ].map(&:freeze).freeze,
       ).freeze,
       # 灘における仕込配合の平均値
       # 出典: http://www.nada-ken.com/main/jp/index_shi/234.html
       sokujo_nada: new(
-        [
+        steps: [
           Step.new(
+            index: 0,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 47,
@@ -490,6 +596,8 @@ module Example
             ],
           ),
           Step.new(
+            index: 1,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 99,
@@ -530,6 +638,8 @@ module Example
             ],
           ),
           Step.new(
+            index: 2,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 143,
@@ -570,6 +680,8 @@ module Example
             ],
           ),
           Step.new(
+            index: 3,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 165,
@@ -610,19 +722,40 @@ module Example
             ],
           ),
           Step.new(
+            index: 4,
+            subindex: 0,
             alcohols: [
               Alcohol.new(
                 weight: 900,
               ),
             ],
           ),
-        ].map(&:freeze).freeze
+        ].map(&:freeze).freeze,
+        actions: [
+          Action.new(
+            type: :squeeze,
+            interval_days: 50,
+          ),
+        ].map(&:freeze).freeze,
+        ab_coef: 1.4,
+        ab_expects: [
+          AbExpect.new(
+            alcohol: 15.0,
+            nihonshudo: 0.0,
+          ),
+          AbExpect.new(
+            alcohol: 16.0,
+            nihonshudo: 3.0,
+          ),
+        ].map(&:freeze).freeze,
       ).freeze,
       # 簡易酒母省略仕込
       # 出典: https://www.jstage.jst.go.jp/article/jbrewsocjapan1915/60/11/60_11_999/_article/-char/ja/
       simple_sokujo_himeno: new(
-        [
+        steps: [
           Step.new(
+            index: 0,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 70,
@@ -644,17 +777,6 @@ module Example
               ),
             ],
             kakes: [
-              Kake.new(
-                weight: 0,
-                brand: :yamadanishiki,
-                polishing_ratio: 0.55,
-                made_in: :hyogo,
-                year: 2020,
-                soaking_ratio: 0.33,
-                steaming_ratio: 0.41,
-                cooling_ratio: 0.33,
-                interval_days: 6,
-              ),
             ],
             waters: [
               Water.new(
@@ -673,25 +795,9 @@ module Example
             ],
           ),
           Step.new(
+            index: 1,
+            subindex: 0,
             kojis: [
-              Koji.new(
-                weight: 0,
-                brand: :yamadanishiki,
-                polishing_ratio: 0.55,
-                made_in: :hyogo,
-                year: 2020,
-                soaking_ratio: 0.33,
-                steaming_ratio: 0.41,
-                cooling_ratio: 0.33,
-                tanekojis: [
-                  Tanekoji.new(
-                    brand: :byakuya,
-                    ratio: 0.001,
-                  ),
-                ],
-                dekoji_ratio: 0.18,
-                interval_days: 0,
-              ),
             ],
             kakes: [
               Kake.new(
@@ -713,6 +819,8 @@ module Example
             ],
           ),
           Step.new(
+            index: 2,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 100,
@@ -753,6 +861,8 @@ module Example
             ],
           ),
           Step.new(
+            index: 3,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 110,
@@ -793,13 +903,32 @@ module Example
             ],
           ),
           Step.new(
+            index: 4,
+            subindex: 0,
             waters: [
               Water.new(
                 weight: 255,
               ),
             ],
           ),
-        ].map(&:freeze).freeze
+        ].map(&:freeze).freeze,
+        actions: [
+          Action.new(
+            type: :squeeze,
+            interval_days: 50,
+          ),
+        ].map(&:freeze).freeze,
+        ab_coef: 1.4,
+        ab_expects: [
+          AbExpect.new(
+            alcohol: 15.0,
+            nihonshudo: 0.0,
+          ),
+          AbExpect.new(
+            alcohol: 16.0,
+            nihonshudo: 3.0,
+          ),
+        ].map(&:freeze).freeze,
       ).freeze,
     }.freeze
   end
@@ -808,6 +937,12 @@ module Example
   class KojiSchedule
     include Toji::Schedule::KojiSchedule
 
+    attr_reader :product
+    attr_reader :date
+
+    attr_reader :step_indexes
+    attr_reader :expect
+
     def initialize(product:, date:, step_indexes:, expect:)
       @product = product
       @date = date
@@ -819,6 +954,12 @@ module Example
   class KakeSchedule
     include Toji::Schedule::KakeSchedule
 
+    attr_reader :product
+    attr_reader :date
+
+    attr_reader :step_indexes
+    attr_reader :expect
+
     def initialize(product:, date:, step_indexes:, expect:)
       @product = product
       @date = date
@@ -830,6 +971,12 @@ module Example
   class ActionSchedule
     include Toji::Schedule::ActionSchedule
 
+    attr_reader :product
+    attr_reader :date
+    attr_reader :type
+
+    attr_reader :index_index
+
     def initialize(product:, date:, type:, action_index:)
       @product = product
       @date = date
@@ -872,6 +1019,16 @@ module Example
     class KojiState
       include Toji::Progress::KojiState
 
+      attr_accessor :progress
+      attr_accessor :time
+      attr_accessor :mark
+
+      attr_accessor :temps
+      attr_accessor :preset_temp
+      attr_accessor :room_temp
+      attr_accessor :room_psychrometry
+      attr_accessor :note
+
       def self.create(args)
         new.tap {|s|
           s.progress = args[:progress]
@@ -901,6 +1058,19 @@ module Example
     class MotoState
       include Toji::Progress::MotoState
 
+      attr_accessor :progress
+      attr_accessor :time
+      attr_accessor :mark
+
+      attr_accessor :temps
+      attr_accessor :preset_temp
+      attr_accessor :room_temp
+      attr_accessor :room_psychrometry
+      attr_accessor :baume
+      attr_accessor :acid
+      attr_accessor :warmings
+      attr_accessor :note
+
       def self.create(args)
         new.tap {|s|
           s.progress = args[:progress]
@@ -936,6 +1106,21 @@ module Example
       include Toji::Progress::MoromiState
       include Toji::Progress::State::BaumeToNihonshudo
 
+      attr_accessor :progress
+      attr_accessor :time
+      attr_accessor :mark
+
+      attr_accessor :temps
+      attr_accessor :preset_temp
+      attr_accessor :room_temp
+      attr_accessor :room_psychrometry
+      attr_accessor :baume
+      attr_accessor :acid
+      attr_accessor :amino_acid
+      attr_accessor :alcohol
+      attr_accessor :warmings
+      attr_accessor :note
+
       def self.create(args)
         new.tap {|s|
           s.progress = args[:progress]

data/lib/toji/calendar.rb

@@ -32,8 +32,8 @@ module Toji
       kake_schedules = @products.map{|product| product.kake_schedules}.flatten
       schedules = koji_schedules + kake_schedules
 
-      koji_len = koji_schedules.map{|schedule| schedule.step_indexes.first}.max + 1
-      kake_len = kake_schedules.map{|schedule| schedule.step_indexes.first}.max + 1
+      koji_len = koji_schedules.map{|schedule| schedule.step_indexes.first[:index]}.max + 1
+      kake_len = kake_schedules.map{|schedule| schedule.step_indexes.first[:index]}.max + 1
       min_date = schedules.map(&:date).min
       max_date = schedules.map(&:date).max
 

data/lib/toji/calendar/date_row.rb

@@ -14,11 +14,11 @@ module Toji
       def <<(schedule)
         case schedule.rice_type
         when :koji
-          index = schedule.step_indexes.first
+          index = schedule.step_indexes.first[:index]
           @kojis[index] ||= DateColumn.new
           @kojis[index] << schedule
         when :kake
-          index = schedule.step_indexes.first
+          index = schedule.step_indexes.first[:index]
           @kakes[index] ||= DateColumn.new
           @kakes[index] << schedule
         end

data/lib/toji/ingredient/alcohol.rb

@@ -4,7 +4,7 @@ module Toji
       include Base
 
       # 醸造用アルコール
-      attr_accessor :weight
+      # @dynamic weight
 
       def group_key
         ""

data/lib/toji/ingredient/base.rb

@@ -2,10 +2,11 @@ module Toji
   module Ingredient
     module Base
       # 重量
-      attr_accessor :weight
+      # @dynamic weight
+      # @dynamic weight=
 
       # グループ識別子
-      attr_reader :group_key
+      # @dynamic group_key
     end
   end
 end

data/lib/toji/ingredient/koji.rb

@@ -4,14 +4,14 @@ module Toji
       include Rice
 
       # 種麹 (has_many: Toji::Ingredient::Tanekoji)
-      attr_reader :tanekojis
+      # @dynamic tanekojis
 
       # 出麹歩合
       #
       # 出麹歩合17〜19%のものが麹菌の繁殖のほどよい麹である
       #
       # 出典: 酒造教本 P67
-      attr_reader :dekoji_ratio
+      # @dynamic dekoji_ratio
 
       def dekoji
         weight + weight * dekoji_ratio

data/lib/toji/ingredient/lactic_acid.rb

@@ -4,7 +4,7 @@ module Toji
       include Base
 
       # 乳酸
-      attr_accessor :weight
+      # @dynamic weight
 
       def group_key
         ""

data/lib/toji/ingredient/rice.rb

@@ -4,20 +4,21 @@ module Toji
       include Base
 
       # 白米
-      attr_accessor :weight
+      # @dynamic weight
+      # @dynamic weight=
 
       # 品種、精米歩合、産地、年度
-      attr_reader :brand
-      attr_reader :polishing_ratio
-      attr_reader :made_in
-      attr_reader :year
+      # @dynamic brand
+      # @dynamic polishing_ratio
+      # @dynamic made_in
+      # @dynamic year
 
       # 浸漬米吸水率
       #
       # 標準的な白米吸水率は掛米で30〜35%、麹米で33%前後で許容範囲はかなり狭い
       #
       # 出典: 酒造教本 P38
-      attr_reader :soaking_ratio
+      # @dynamic soaking_ratio
 
       def soaked
         weight + weight * soaking_ratio
@@ -30,7 +31,7 @@ module Toji
       # 蒸米吸水率は麹米及び酒母米で41〜43%、掛米は39〜40%で、吟醸造りの場合は数%低い
       #
       # 出典: 酒造教本 P48
-      attr_reader :steaming_ratio
+      # @dynamic steaming_ratio
 
       def steamed
         weight + weight * steaming_ratio
@@ -43,14 +44,14 @@ module Toji
       #
       # 麹を造るのに適した蒸米は、引込時の吸水率が33%を理想とし、許容幅はプラスマイナス1%である
       # 出典: 酒造教本 P59
-      attr_reader :cooling_ratio
+      # @dynamic cooling_ratio
 
       def cooled
         weight + weight * cooling_ratio
       end
 
       # Product.base_dateからの日数差
-      attr_reader :interval_days
+      # @dynamic interval_days
     end
   end
 end

data/lib/toji/ingredient/tanekoji.rb

@@ -4,10 +4,10 @@ module Toji
       include Base
 
       # 麹 (belongs_to: Toji::Ingredient::Koji)
-      attr_reader :koji
+      # @dynamic koji
 
       # 種麹の種類
-      attr_reader :brand
+      # @dynamic brand
 
       # 種麹
       #
@@ -15,7 +15,7 @@ module Toji
       # 突き破精麹を造るには、種麹の量を麹米100kgあたり種麹80gとする
       #
       # 出典: 酒造教本 P66
-      attr_reader :ratio
+      # @dynamic ratio
 
       def weight
         koji.weight * ratio

data/lib/toji/ingredient/water.rb

@@ -4,11 +4,11 @@ module Toji
       include Base
 
       # 汲水
-      attr_accessor :weight
+      # @dynamic weight
 
       # 硬度
-      attr_reader :calcium_hardness
-      attr_reader :magnesium_hardness
+      # @dynamic calcium_hardness
+      # @dynamic magnesium_hardness
 
       def group_key
         [calcium_hardness, magnesium_hardness].join(":")

data/lib/toji/ingredient/yeast.rb

@@ -4,13 +4,14 @@ module Toji
       include Base
 
       # 酵母
-      attr_accessor :weight
+      # @dynamic weight
+      # @dynamic weight=
 
       # 単位 (ex: ampoule, gram, ml)
-      attr_reader :unit
+      # @dynamic unit
 
       # 酵母名、協会酵母番号
-      attr_reader :brand
+      # @dynamic brand
 
       def group_key
         [brand, unit].join(":")

data/lib/toji/product.rb

@@ -2,20 +2,14 @@ require 'toji/product/schedule_factory'
 
 module Toji
   module Product
-    attr_reader :name
-    attr_reader :recipe
-    attr_reader :base_date
-
-    attr_reader :koji_schedules
-    attr_reader :kake_schedules
-    attr_reader :action_schedules
-
-    def rice_schedules
-      koji_schedules + kake_schedules
-    end
-
-    def schedules
-      rice_schedules + action_schedules
-    end
+    # @dynamic name
+    # @dynamic recipe
+    # @dynamic base_date
+
+    # @dynamic koji_schedules
+    # @dynamic kake_schedules
+    # @dynamic action_schedules
+    # @dynamic rice_schedules
+    # @dynamic schedules
   end
 end

data/lib/toji/product/schedule_factory.rb

@@ -15,10 +15,13 @@ module Toji
       end
 
       def koji_schedules
-        recipe.steps.each.with_index.inject([]) {|result, (step, i)|
+        recipe.steps.inject([]) {|result, step|
           step.kojis&.each {|koji|
             result << {
-              step_index: i,
+              step_index: {
+                index: step.index,
+                subindex: step.subindex,
+              },
               date: base_date.next_day(koji.interval_days),
               koji: koji,
             }
@@ -28,20 +31,23 @@ module Toji
           0<schedule[:koji]&.weight.to_f
         }.group_by {|schedule|
           [schedule[:date], schedule[:koji].group_key]
-        }.map {|(date, group_key), schedules|
+        }.map {|(date, _group_key), schedules|
           create_koji_schedule(
             date: date,
-            step_indexes: schedules.map {|schedule| schedule[:step_index]}.sort,
+            step_indexes: schedules.map {|schedule| schedule[:step_index]}.sort_by {|x| [x[:index], x[:subindex]]},
             kojis: schedules.map{|schedule| schedule[:koji]},
           )
         }
       end
 
       def kake_schedules
-        recipe.steps.each.with_index.inject([]) {|result, (step, i)|
+        recipe.steps.inject([]) {|result, step|
           step.kakes&.each {|kake|
             result << {
-              step_index: i,
+              step_index: {
+                index: step.index,
+                subindex: step.subindex,
+              },
               date: base_date.next_day(kake.interval_days),
               kake: kake,
             }
@@ -50,11 +56,11 @@ module Toji
         }.select {|schedule|
           0<schedule[:kake]&.weight.to_f
         }.group_by {|schedule|
-          [schedule[:date], schedule[:kake].group_key]
-        }.map {|(date, group_key), schedules|
+          [schedule[:date], schedule[:kake].group_key, schedule[:step_index]]
+        }.map {|(date, _group_key, _step_index), schedules|
           create_kake_schedule(
             date: date,
-            step_indexes: schedules.map {|schedule| schedule[:step_index]}.sort,
+            step_indexes: schedules.map {|schedule| schedule[:step_index]}.sort_by {|x| [x[:index], x[:subindex]]},
             kakes: schedules.map{|schedule| schedule[:kake]},
           )
         }
@@ -69,6 +75,14 @@ module Toji
           )
         }
       end
+
+      def rice_schedules
+        koji_schedules + kake_schedules
+      end
+
+      def schedules
+        rice_schedules + action_schedules
+      end
     end
   end
 end

data/lib/toji/progress/base_state.rb

@@ -1,6 +1,8 @@
 module Toji
   module Progress
     module BaseState
+      include State
+
       REQUIRED_KEYS = [
         :time,
         :elapsed_time,
@@ -10,11 +12,6 @@ module Toji
         :mark,
       ].freeze
 
-      attr_accessor :progress
-
-      attr_accessor :time
-      attr_accessor :mark
-
       def elapsed_time
         time - progress.base_time
       end

data/lib/toji/progress/graph/ab.rb

@@ -58,13 +58,13 @@ module Toji
         def min_baume
           @actuals.map {|moromi, name|
             moromi.states.map(&:baume).compact.min
-          }.compact.min || 0
+          }.compact.min || 0.0
         end
 
         def max_baume
           @actuals.map {|moromi, name|
             moromi.states.map(&:baume).compact.max
-          }.compact.max || 0
+          }.compact.max || 0.0
         end
 
         def plot

data/lib/toji/progress/koji_state.rb

@@ -12,12 +12,12 @@ module Toji
         :note,
       ].freeze
 
-      attr_accessor :temps
-      attr_accessor :preset_temp
-      attr_accessor :room_temp
-      attr_accessor :room_psychrometry
+      # @dynamic temps
+      # @dynamic preset_temp
+      # @dynamic room_temp
+      # @dynamic room_psychrometry
 
-      attr_accessor :note
+      # @dynamic note
     end
   end
 end

data/lib/toji/progress/moromi_progress.rb

@@ -3,7 +3,7 @@ module Toji
     module MoromiProgress
       include BaseProgress
 
-      attr_accessor :prefix_day_labels
+      # @dynamic prefix_day_labels
 
       def moromi_tome_day
         prefix_day_labels&.length

data/lib/toji/progress/moromi_state.rb

@@ -22,19 +22,19 @@ module Toji
         :note,
       ].freeze
 
-      attr_accessor :temps
-      attr_accessor :preset_temp
-      attr_accessor :room_temp
-      attr_accessor :room_psychrometry
+      # @dynamic temps
+      # @dynamic preset_temp
+      # @dynamic room_temp
+      # @dynamic room_psychrometry
 
-      attr_accessor :baume
-      attr_accessor :nihonshudo
-      attr_accessor :acid
-      attr_accessor :amino_acid
-      attr_accessor :alcohol
+      # @dynamic baume
+      # @dynamic nihonshudo
+      # @dynamic acid
+      # @dynamic amino_acid
+      # @dynamic alcohol
 
-      attr_accessor :warmings
-      attr_accessor :note
+      # @dynamic warmings
+      # @dynamic note
 
       def moromi_day
         _tome_day = progress.moromi_tome_day

data/lib/toji/progress/moto_state.rb

@@ -16,16 +16,16 @@ module Toji
         :note,
       ].freeze
 
-      attr_accessor :temps
-      attr_accessor :preset_temp
-      attr_accessor :room_temp
-      attr_accessor :room_psychrometry
+      # @dynamic temps
+      # @dynamic preset_temp
+      # @dynamic room_temp
+      # @dynamic room_psychrometry
 
-      attr_accessor :baume
-      attr_accessor :acid
+      # @dynamic baume
+      # @dynamic acid
 
-      attr_accessor :warmings
-      attr_accessor :note
+      # @dynamic warmings
+      # @dynamic note
     end
   end
 end

data/lib/toji/progress/progress.rb

@@ -1,15 +1,16 @@
 module Toji
   module Progress
     module Progress
-      attr_reader :states
-      attr_reader :date_line
+      # @dynamic states
+      # @dynamic date_line
 
-      attr_reader :base_time
-      attr_reader :day_offset
-      attr_reader :days
-      attr_reader :day_labels
+      # @dynamic base_time
+      # @dynamic day_offset
+      # @dynamic days
+      # @dynamic day_labels
 
-      attr_reader :all_keys
+      # @dynamic all_keys
+      # @dynamic has_keys
     end
   end
 end

data/lib/toji/progress/state.rb

@@ -3,7 +3,20 @@ require 'toji/progress/state/nihonshudo_to_baume'
 
 module Toji
   module Progress
-    module BaseState
+    module State
+      # @dynamic progress
+      # @dynamic progress=
+
+      # @dynamic time
+      # @dynamic time=
+      # @dynamic mark
+      # @dynamic mark=
+
+      # @dynamic elapsed_time
+      # @dynamic elapsed_time_with_offset
+      # @dynamic day
+      # @dynamic day_label
+      # @dynamic display_time
     end
   end
 end

data/lib/toji/recipe.rb

@@ -4,15 +4,13 @@ require 'toji/recipe/ab_expect'
 
 module Toji
   module Recipe
-    attr_reader :steps
-    attr_reader :actions
-    attr_reader :has_moto
-    attr_reader :has_moromi
-    attr_reader :ab_coef
-    attr_reader :ab_expects
+    # @dynamic steps
+    # @dynamic actions
+    # @dynamic ab_coef
+    # @dynamic ab_expects
 
     def scale_rice_total(rice_total)
-      ratio = rice_total / steps.map(&:rice_total).sum
+      ratio = rice_total.to_f / steps.map(&:rice_total).sum
       scale(ratio)
     end
 

data/lib/toji/recipe/ab_expect.rb

@@ -1,8 +1,8 @@
 module Toji
   module Recipe
     module AbExpect
-      attr_reader :alcohol
-      attr_reader :nihonshudo
+      # @dynamic alcohol
+      # @dynamic nihonshudo
     end
   end
 end

data/lib/toji/recipe/action.rb

@@ -1,8 +1,8 @@
 module Toji
   module Recipe
     module Action
-      attr_reader :type
-      attr_reader :interval_days
+      # @dynamic type
+      # @dynamic interval_days
     end
   end
 end

data/lib/toji/recipe/step.rb

@@ -1,12 +1,21 @@
 module Toji
   module Recipe
     module Step
-      attr_accessor :kojis
-      attr_accessor :kakes
-      attr_accessor :waters
-      attr_accessor :lactic_acids
-      attr_accessor :alcohols
-      attr_accessor :yeasts
+      # @dynamic index
+      # @dynamic subindex
+
+      # @dynamic kojis
+      # @dynamic kojis=
+      # @dynamic kakes
+      # @dynamic kakes=
+      # @dynamic waters
+      # @dynamic waters=
+      # @dynamic lactic_acids
+      # @dynamic lactic_acids=
+      # @dynamic alcohols
+      # @dynamic alcohols=
+      # @dynamic yeasts
+      # @dynamic yeasts=
 
       # 麹米
       def koji_total

data/lib/toji/schedule/action_schedule.rb

@@ -3,7 +3,7 @@ module Toji
     module ActionSchedule
       include Base
 
-      attr_reader :index
+      # @dynamic action_index
     end
   end
 end

data/lib/toji/schedule/base.rb

@@ -1,9 +1,9 @@
 module Toji
   module Schedule
     module Base
-      attr_reader :product
-      attr_reader :date
-      attr_reader :type
+      # @dynamic product
+      # @dynamic date
+      # @dynamic type
     end
   end
 end

data/lib/toji/schedule/rice_schedule.rb

@@ -3,10 +3,10 @@ module Toji
     module RiceSchedule
       include Base
 
-      attr_reader :rice_type
-      attr_reader :step_indexes
+      # @dynamic rice_type
+      # @dynamic step_indexes
 
-      attr_reader :expect
+      # @dynamic expect
 
       def type
         :rice

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.13.0"
+  VERSION = "2.17.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.17.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-01 00:00:00.000000000 Z
+date: 2020-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -194,7 +194,7 @@ metadata:
   homepage_uri: https://github.com/yoshida-eth0/ruby-toji
   source_code_uri: https://github.com/yoshida-eth0/ruby-toji
   changelog_uri: https://github.com/yoshida-eth0/ruby-toji
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -209,8 +209,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.2.0.rc.1
+signing_key:
 specification_version: 4
 summary: Management tools for brewing japanese sake.
 test_files: []