toji 2.13.1 → 2.18.0

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/processing/base.rb

@@ -1,7 +1,7 @@
 module Toji
   module Processing
     module Base
-      attr_reader :date
+      # @dynamic date
     end
   end
 end

data/lib/toji/processing/cooled_rice.rb

@@ -2,10 +2,10 @@ module Toji
   module Processing
     module CooledRice
       # 親 (belongs_to: Toji::Processing::RiceProcessing)
-      attr_reader :processing
+      # @dynamic processing
 
       # 要素 (has_many: Toji::Processing::CooledRiceElement)
-      attr_reader :elements
+      # @dynamic elements
 
       # 放冷後蒸米総重量
       def weight

data/lib/toji/processing/cooled_rice_element.rb

@@ -2,7 +2,7 @@ module Toji
   module Processing
     module CooledRiceElement
       # 放冷後蒸米重量
-      attr_reader :weight
+      # @dynamic weight
     end
   end
 end

data/lib/toji/processing/dekoji.rb

@@ -2,10 +2,10 @@ module Toji
   module Processing
     module Dekoji
       # 親 (belongs_to: Toji::Processing::RiceProcessing)
-      attr_reader :processing
+      # @dynamic processing
 
       # 要素 (has_many: Toji::Processing::DekojiElement)
-      attr_reader :elements
+      # @dynamic elements
 
       # 出麹総重量
       def weight

data/lib/toji/processing/dekoji_element.rb

@@ -2,7 +2,7 @@ module Toji
   module Processing
     module DekojiElement
       # 出麹重量
-      attr_reader :weight
+      # @dynamic weight
     end
   end
 end

data/lib/toji/processing/koji_processing.rb

@@ -4,7 +4,7 @@ module Toji
       include RiceProcessing
 
       # 出麹実績値 (Toji::Processing::Dekoji)
-      attr_reader :dekoji
+      # @dynamic dekoji
     end
   end
 end

data/lib/toji/processing/rice_processing.rb

@@ -4,16 +4,16 @@ module Toji
       include Base
 
       # 目標値 (Toji::Ingredient::Rice)
-      attr_reader :expect
+      # @dynamic expect
 
       # 浸漬実績値 (Toji::Processing::SoakedRice)
-      attr_reader :soaked_rice
+      # @dynamic soaked_rice
 
       # 蒸米実績値 (Toji::Processing::SteamedRice)
-      attr_reader :steamed_rice
+      # @dynamic steamed_rice
 
       # 放冷実績値 (Toji::Processing::CooledRice)
-      attr_reader :cooled_rice
+      # @dynamic cooled_rice
     end
   end
 end

data/lib/toji/processing/soaked_rice.rb

@@ -2,25 +2,25 @@ module Toji
   module Processing
     module SoakedRice
       # 室内温度
-      attr_reader :room_temp
+      # @dynamic room_temp
 
       # 外気温
-      attr_reader :outside_temp
+      # @dynamic outside_temp
 
       # 白米の含水率
-      attr_reader :rice_water_content
+      # @dynamic rice_water_content
 
       # 洗米に用いる水の温度
-      attr_reader :washing_water_temp
+      # @dynamic washing_water_temp
 
       # 浸漬に用いる水の温度
-      attr_reader :soaking_water_temp
+      # @dynamic soaking_water_temp
 
       # 親 (belongs_to: Toji::Processing::RiceProcessing)
-      attr_reader :processing
+      # @dynamic processing
 
       # 要素 (has_many: Toji::Processing::SoakedRiceElement)
-      attr_reader :elements
+      # @dynamic elements
 
       # 白米総重量
       def weight

data/lib/toji/processing/soaked_rice_element.rb

@@ -2,13 +2,13 @@ module Toji
   module Processing
     module SoakedRiceElement
       # 白米重量
-      attr_reader :weight
+      # @dynamic weight
 
       # 浸漬時間
-      attr_reader :soaking_time
+      # @dynamic soaking_time
 
       # 浸漬米重量
-      attr_reader :soaked
+      # @dynamic soaked
 
       def soaking_ratio
         (soaked.to_f - weight.to_f) / weight.to_f

data/lib/toji/processing/steamed_rice.rb

@@ -2,10 +2,10 @@ module Toji
   module Processing
     module SteamedRice
       # 親 (belongs_to: Toji::Processing::RiceProcessing)
-      attr_reader :processing
+      # @dynamic processing
 
       # 要素 (has_many: Toji::Processing::SteamedRiceElement)
-      attr_reader :elements
+      # @dynamic elements
 
       # 蒸米総重量
       def weight

data/lib/toji/processing/steamed_rice_element.rb

@@ -2,7 +2,7 @@ module Toji
   module Processing
     module SteamedRiceElement
       # 蒸米重量
-      attr_reader :weight
+      # @dynamic weight
     end
   end
 end

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