toji 2.13.1 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3518ae786928b8b08256616f1b86f9f00b51fe7a41150a628b195aa3b8e43e2f
-  data.tar.gz: b6c34cfccdfb72cad06e8206b29cbf7d451b62f060084aaeb92e4c4d6ea81792
+  metadata.gz: b23be7a53efdbae7c439914868bcb41c222c062019fecde2e5471cb0e9051e48
+  data.tar.gz: 8c9a20caf415f8c6a67d21cb9d52129352fcca1a0899e54e8070d1f8fe0ec54d
 SHA512:
-  metadata.gz: ae0f6e5cc017e3f60df94d680c6cea7f4b1a529ab7c99ebd731dc9de409406f5a9b5d7974525a110c67c447dcfccb474ca388849154825fd17c4b7d7cc03637b
-  data.tar.gz: ae9a15847daf96541a4c081c121befc603dd9df0e7b5ae268915ddeb52442370a99cc8208cf607d1e998cc4e9e93f78dc8a9d2b9351f601a03806fad4038672b
+  metadata.gz: d185b9e06e1f4498e21f57cb0e95f93a4be19b6f35230f1673a7c75ffa145948b405df1702f02b64cddff8c5a0a62d4488f536fd06413c9e3be75912d238d858
+  data.tar.gz: 67b56cda1946dd6619707f3c899fe20396b50394b5869c2110b282f2c0c61691d37e78b2d4d4b0e9f8b213317fccf29d82d4b234c9a45ca28025433ff16fdc7f

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]