toji 2.8.0 → 2.13.0

data/lib/toji/calendar/date_column.rb

@@ -1,39 +1,24 @@
 module Toji
   class Calendar
     class DateColumn
-      attr_reader :rice_events
+      attr_reader :rice_schedules
 
       def initialize
-        @rice_events = []
+        @rice_schedules = []
       end
 
-      def <<(event)
-        @rice_events << event
+      def <<(schedule)
+        @rice_schedules << schedule
       end
       alias_method :add, :<<
 
-      def event_groups
-        @rice_events.group_by {|e|
-          e.group_key
-        }.values
-      end
-
       def text
-        event_groups.map {|es|
-          name = es.first.product.name
-          weight = "%.17g" % es.map(&:weight).sum
+        @rice_schedules.map {|schedule|
+          name = schedule.product.name
+          weight = "%.17g" % schedule.expect.weight
           "#{name}: #{weight}"
         }.join("<br>")
       end
-
-      def column_events
-        event_groups.map {|es|
-          {
-            product: es.first.product,
-            weight: es.map(&:weight).sum,
-          }
-        }
-      end
     end
   end
 end

data/lib/toji/calendar/date_row.rb

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

data/lib/toji/ingredient.rb

@@ -1,8 +1,12 @@
+require 'toji/ingredient/base'
 require 'toji/ingredient/rice'
 require 'toji/ingredient/kake'
 require 'toji/ingredient/koji'
-require 'toji/ingredient/rice_rate'
-require 'toji/ingredient/koji_rate'
+require 'toji/ingredient/tanekoji'
+require 'toji/ingredient/water'
+require 'toji/ingredient/lactic_acid'
+require 'toji/ingredient/alcohol'
+require 'toji/ingredient/yeast'
 
 module Toji
   module Ingredient

data/lib/toji/ingredient/alcohol.rb

@@ -0,0 +1,14 @@
+module Toji
+  module Ingredient
+    module Alcohol
+      include Base
+
+      # 醸造用アルコール
+      attr_accessor :weight
+
+      def group_key
+        ""
+      end
+    end
+  end
+end

data/lib/toji/ingredient/base.rb

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

data/lib/toji/ingredient/kake.rb

@@ -1,16 +1,10 @@
-require 'toji/ingredient/kake/base'
-require 'toji/ingredient/kake/expected'
-require 'toji/ingredient/kake/actual'
-
 module Toji
   module Ingredient
     module Kake
-      def self.expected(raw, rice_rate: Recipe::RiceRate::DEFAULT)
-        Expected.new(raw, rice_rate: rice_rate)
-      end
+      include Rice
 
-      def self.actual(raw, soaked, steamed, cooled)
-        Actual.new(raw, soaked, steamed, cooled)
+      def group_key
+        [brand, polishing_ratio, made_in, year, soaking_ratio, steaming_ratio, cooling_ratio].join(":")
       end
     end
   end

data/lib/toji/ingredient/koji.rb

@@ -1,18 +1,27 @@
-require 'toji/ingredient/koji/base'
-require 'toji/ingredient/koji/expected_fermentable'
-require 'toji/ingredient/koji/expected'
-require 'toji/ingredient/koji/actual_fermentable'
-require 'toji/ingredient/koji/actual'
-
 module Toji
   module Ingredient
     module Koji
-      def self.expected(raw, rice_rate: Recipe::RiceRate::DEFAULT, koji_rate: Recipe::KojiRate::DEFAULT)
-        Expected.new(raw, rice_rate: rice_rate, koji_rate: koji_rate)
+      include Rice
+
+      # 種麹 (has_many: Toji::Ingredient::Tanekoji)
+      attr_reader :tanekojis
+
+      # 出麹歩合
+      #
+      # 出麹歩合17〜19%のものが麹菌の繁殖のほどよい麹である
+      #
+      # 出典: 酒造教本 P67
+      attr_reader :dekoji_ratio
+
+      def dekoji
+        weight + weight * dekoji_ratio
       end
 
-      def self.actual(raw, soaked, steamed, cooled, tanekoji, dekoji)
-        Actual.new(raw, soaked, steamed, cooled, tanekoji, dekoji)
+      # Scheduleへのグループ識別子
+      def group_key
+        keys1 = [brand, polishing_ratio, made_in, year, soaking_ratio, steaming_ratio, cooling_ratio, dekoji_ratio]
+        keys2 = tanekojis&.map(&:group_key)&.sort || []
+        (keys1 + keys2).join(":")
       end
     end
   end

data/lib/toji/ingredient/lactic_acid.rb

@@ -0,0 +1,14 @@
+module Toji
+  module Ingredient
+    module LacticAcid
+      include Base
+
+      # 乳酸
+      attr_accessor :weight
+
+      def group_key
+        ""
+      end
+    end
+  end
+end

data/lib/toji/ingredient/rice.rb

@@ -1,10 +1,56 @@
-require 'toji/ingredient/rice/base'
-require 'toji/ingredient/rice/expected_steamable'
-require 'toji/ingredient/rice/actual_steamable'
-
 module Toji
   module Ingredient
     module Rice
+      include Base
+
+      # 白米
+      attr_accessor :weight
+
+      # 品種、精米歩合、産地、年度
+      attr_reader :brand
+      attr_reader :polishing_ratio
+      attr_reader :made_in
+      attr_reader :year
+
+      # 浸漬米吸水率
+      #
+      # 標準的な白米吸水率は掛米で30〜35%、麹米で33%前後で許容範囲はかなり狭い
+      #
+      # 出典: 酒造教本 P38
+      attr_reader :soaking_ratio
+
+      def soaked
+        weight + weight * soaking_ratio
+      end
+
+      # 蒸米吸水率
+      #
+      # 蒸しにより通常甑置き前の浸漬白米の重量よりさらに12〜13%吸水する
+      # 蒸しにより吸水の増加が13%を超える場合は、蒸米の表面が柔らかくべとつく蒸米になりやすい
+      # 蒸米吸水率は麹米及び酒母米で41〜43%、掛米は39〜40%で、吟醸造りの場合は数%低い
+      #
+      # 出典: 酒造教本 P48
+      attr_reader :steaming_ratio
+
+      def steamed
+        weight + weight * steaming_ratio
+      end
+
+      # 放冷
+      #
+      # 冷却法で若干異なるが蒸米の冷却により掛米で白米重量の10%、麹米で8%程度の水が失われる
+      # 出典: 酒造教本 P49
+      #
+      # 麹を造るのに適した蒸米は、引込時の吸水率が33%を理想とし、許容幅はプラスマイナス1%である
+      # 出典: 酒造教本 P59
+      attr_reader :cooling_ratio
+
+      def cooled
+        weight + weight * cooling_ratio
+      end
+
+      # Product.base_dateからの日数差
+      attr_reader :interval_days
     end
   end
 end

data/lib/toji/ingredient/tanekoji.rb

@@ -0,0 +1,29 @@
+module Toji
+  module Ingredient
+    module Tanekoji
+      include Base
+
+      # 麹 (belongs_to: Toji::Ingredient::Koji)
+      attr_reader :koji
+
+      # 種麹の種類
+      attr_reader :brand
+
+      # 種麹
+      #
+      # 総破精麹を造るには、種麹の量を麹米100kgあたり種麹100gとする
+      # 突き破精麹を造るには、種麹の量を麹米100kgあたり種麹80gとする
+      #
+      # 出典: 酒造教本 P66
+      attr_reader :ratio
+
+      def weight
+        koji.weight * ratio
+      end
+
+      def group_key
+        [brand, ratio].join(":")
+      end
+    end
+  end
+end

data/lib/toji/ingredient/water.rb

@@ -0,0 +1,18 @@
+module Toji
+  module Ingredient
+    module Water
+      include Base
+
+      # 汲水
+      attr_accessor :weight
+
+      # 硬度
+      attr_reader :calcium_hardness
+      attr_reader :magnesium_hardness
+
+      def group_key
+        [calcium_hardness, magnesium_hardness].join(":")
+      end
+    end
+  end
+end

data/lib/toji/ingredient/yeast.rb

@@ -0,0 +1,20 @@
+module Toji
+  module Ingredient
+    module Yeast
+      include Base
+
+      # 酵母
+      attr_accessor :weight
+
+      # 単位 (ex: ampoule, gram, ml)
+      attr_reader :unit
+
+      # 酵母名、協会酵母番号
+      attr_reader :brand
+
+      def group_key
+        [brand, unit].join(":")
+      end
+    end
+  end
+end

data/lib/toji/processing.rb

@@ -0,0 +1,18 @@
+require 'toji/processing/base'
+require 'toji/processing/rice_processing'
+require 'toji/processing/koji_processing'
+require 'toji/processing/kake_processing'
+
+require 'toji/processing/soaked_rice'
+require 'toji/processing/soaked_rice_element'
+require 'toji/processing/steamed_rice'
+require 'toji/processing/steamed_rice_element'
+require 'toji/processing/cooled_rice'
+require 'toji/processing/cooled_rice_element'
+require 'toji/processing/dekoji'
+require 'toji/processing/dekoji_element'
+
+module Toji
+  module Processing
+  end
+end

data/lib/toji/processing/base.rb

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

data/lib/toji/processing/cooled_rice.rb

@@ -0,0 +1,22 @@
+module Toji
+  module Processing
+    module CooledRice
+      # 親 (belongs_to: Toji::Processing::RiceProcessing)
+      attr_reader :processing
+
+      # 要素 (has_many: Toji::Processing::CooledRiceElement)
+      attr_reader :elements
+
+      # 放冷後蒸米総重量
+      def weight
+        (elements || []).map(&:weight).sum
+      end
+
+      # 放冷後蒸米歩合
+      def cooling_ratio
+        raw_weight = processing.soaked_rice.weight.to_f
+        (weight.to_f - raw_weight) / raw_weight
+      end
+    end
+  end
+end

data/lib/toji/processing/cooled_rice_element.rb

@@ -0,0 +1,8 @@
+module Toji
+  module Processing
+    module CooledRiceElement
+      # 放冷後蒸米重量
+      attr_reader :weight
+    end
+  end
+end

data/lib/toji/processing/dekoji.rb

@@ -0,0 +1,22 @@
+module Toji
+  module Processing
+    module Dekoji
+      # 親 (belongs_to: Toji::Processing::RiceProcessing)
+      attr_reader :processing
+
+      # 要素 (has_many: Toji::Processing::DekojiElement)
+      attr_reader :elements
+
+      # 出麹総重量
+      def weight
+        (elements || []).map(&:weight).sum
+      end
+
+      # 出麹歩合
+      def dekoji_ratio
+        raw_weight = processing.soaked_rice.weight.to_f
+        (weight.to_f - raw_weight) / raw_weight
+      end
+    end
+  end
+end

data/lib/toji/processing/dekoji_element.rb

@@ -0,0 +1,8 @@
+module Toji
+  module Processing
+    module DekojiElement
+      # 出麹重量
+      attr_reader :weight
+    end
+  end
+end

data/lib/toji/processing/kake_processing.rb

@@ -0,0 +1,7 @@
+module Toji
+  module Processing
+    module KakeProcessing
+      include RiceProcessing
+    end
+  end
+end

data/lib/toji/processing/koji_processing.rb

@@ -0,0 +1,10 @@
+module Toji
+  module Processing
+    module KojiProcessing
+      include RiceProcessing
+
+      # 出麹実績値 (Toji::Processing::Dekoji)
+      attr_reader :dekoji
+    end
+  end
+end

data/lib/toji/processing/rice_processing.rb

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