toji 1.6.8 → 2.0.0

data/lib/toji/{schedule → calendar}/date_column.rb

@@ -1,5 +1,5 @@
 module Toji
-  module Schedule
+  class Calendar
     class DateColumn
       attr_reader :events
 
@@ -26,13 +26,10 @@ module Toji
         }.join("<br>")
       end
 
-      def to_h_a
+      def column_events
         event_groups.map {|es|
-          product = es.first.product
           {
-            product_id: product.id,
-            product_name: product.name,
-            product_color: product.color,
+            product: es.first.product,
             weight: es.map(&:weight).sum,
           }
         }

data/lib/toji/{schedule → calendar}/date_row.rb

@@ -1,14 +1,14 @@
 module Toji
-  module Schedule
+  class Calendar
     class DateRow
       attr_reader :date
       attr_reader :kojis
-      attr_reader :rices
+      attr_reader :kakes
 
       def initialize(date)
         @date = date
         @kojis = []
-        @rices = []
+        @kakes = []
       end
 
       def <<(event)
@@ -17,10 +17,10 @@ module Toji
           index = event.group_index
           @kojis[index] ||= DateColumn.new
           @kojis[index] << event
-        when :rice
+        when :kake
           index = event.group_index
-          @rices[index] ||= DateColumn.new
-          @rices[index] << event
+          @kakes[index] ||= DateColumn.new
+          @kakes[index] << event
         end
       end
       alias_method :add, :<<

data/lib/toji/ingredient.rb

@@ -0,0 +1,10 @@
+require 'toji/ingredient/rice'
+require 'toji/ingredient/kake'
+require 'toji/ingredient/koji'
+require 'toji/ingredient/rice_rate'
+require 'toji/ingredient/koji_rate'
+
+module Toji
+  module Ingredient
+  end
+end

data/lib/toji/ingredient/kake.rb

@@ -0,0 +1,17 @@
+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
+
+      def self.actual(raw, soaked, steaming_water, steamed, cooled)
+        Actual.new(raw, soaked, steaming_water, steamed, cooled)
+      end
+    end
+  end
+end

data/lib/toji/ingredient/kake/actual.rb

@@ -0,0 +1,27 @@
+module Toji
+  module Ingredient
+    module Kake
+      class Actual
+        include Base
+        include Rice::ActualSteamable
+
+        def initialize(raw, soaked, steaming_water, steamed, cooled)
+          @raw = raw
+          @soaked = soaked
+          @steaming_water = steaming_water
+          @steamed = steamed
+          @cooled = cooled
+        end
+
+        def *(other)
+          if Integer===other || Float===other
+            Actual.new(raw * other, soaked * other, steaming_water * other, steamed * other, cooled * other)
+          else
+            x, y = other.coerce(self)
+            x * y
+          end
+        end
+      end
+    end
+  end
+end

data/lib/toji/ingredient/kake/base.rb

@@ -0,0 +1,18 @@
+module Toji
+  module Ingredient
+    module Kake
+      module Base
+        include Rice::Base
+
+        def +(other)
+          if Base===other
+            Actual.new(raw + other.raw, soaked + other.soaked, steaming_water + other.steaming_water, steamed + other.steamed, cooled + other.cooled)
+          else
+            x, y = other.coerce(self)
+            x + y
+          end
+        end
+      end
+    end
+  end
+end

data/lib/toji/ingredient/kake/expected.rb

@@ -0,0 +1,41 @@
+module Toji
+  module Ingredient
+    module Kake
+      class Expected
+        include Base
+        include Rice::ExpectedSteamable
+
+        def initialize(raw, rice_rate: RiceRate::DEFAULT)
+          @raw = raw.to_f
+
+          @rice_rate = rice_rate
+          @soaked_rate = rice_rate.soaked_rate
+          @before_steaming_rate = rice_rate.before_steaming_rate
+          @steamed_rate = rice_rate.steamed_rate
+          @cooled_rate = rice_rate.cooled_rate
+        end
+
+        def round(ndigit=0, half: :up)
+          self.class.new(@raw.round(ndigit, half: half), rice_rate: @rice_rate)
+        end
+
+        def *(other)
+          if Integer===other || Float===other
+            self.class.new(@raw * other, rice_rate: @rice_rate)
+          else
+            x, y = other.coerce(self)
+            x * y
+          end
+        end
+
+        def self.create(x)
+          if self===x
+            x
+          else
+            new(x)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/toji/ingredient/koji.rb

@@ -0,0 +1,19 @@
+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)
+      end
+
+      def self.actual(raw, soaked, steaming_water, steamed, cooled, tanekoji, dekoji)
+        Actual.new(raw, soaked, steaming_water, steamed, cooled, tanekoji, dekoji)
+      end
+    end
+  end
+end

data/lib/toji/ingredient/koji/actual.rb

@@ -0,0 +1,30 @@
+module Toji
+  module Ingredient
+    module Koji
+      class Actual
+        include Base
+        include Rice::ActualSteamable
+        include ActualFermentable
+
+        def initialize(raw, soaked, steaming_water, steamed, cooled, tanekoji, dekoji)
+          @raw = raw
+          @soaked = soaked
+          @steaming_water = steaming_water
+          @steamed = steamed
+          @cooled = cooled
+          @tanekoji = tanekoji
+          @dekoji = dekoji
+        end
+
+        def *(other)
+          if Integer===other || Float===other
+            Actual.new(raw * other, soaked * other, steaming_water * other, steamed * other, cooled * other, tanekoji * other, dekoji * other)
+          else
+            x, y = other.coerce(self)
+            x * y
+          end
+        end
+      end
+    end
+  end
+end

data/lib/toji/ingredient/koji/actual_fermentable.rb

@@ -0,0 +1,15 @@
+module Toji
+  module Ingredient
+    module Koji
+      module ActualFermentable
+        def tanekoji_rate
+          tanekoji / raw
+        end
+
+        def dekoji_rate
+          (dekoji - raw) / raw
+        end
+      end
+    end
+  end
+end

data/lib/toji/ingredient/koji/base.rb

@@ -0,0 +1,35 @@
+module Toji
+  module Ingredient
+    module Koji
+      module Base
+        include Rice::Base
+
+        # 種麹
+        #
+        # 総破精麹を造るには、種麹の量を麹米100kgあたり種麹100gとする
+        # 突き破精麹を造るには、種麹の量を麹米100kgあたり種麹80gとする
+        #
+        # 出典: 酒造教本 P66
+        attr_reader :tanekoji_rate
+        attr_reader :tanekoji
+
+        # 出麹歩合
+        #
+        # 出麹歩合17〜19%のものが麹菌の繁殖のほどよい麹である
+        #
+        # 出典: 酒造教本 P67
+        attr_reader :dekoji_rate
+        attr_reader :dekoji
+
+        def +(other)
+          if Base===other
+            Actual.new(raw + other.raw, soaked + other.soaked, steaming_water + other.steaming_water, steamed + other.steamed, cooled + other.cooled, tanekoji + other.tanekoji, dekoji + other.dekoji)
+          else
+            x, y = other.coerce(self)
+            x + y
+          end
+        end
+      end
+    end
+  end
+end

data/lib/toji/ingredient/koji/expected.rb

@@ -0,0 +1,46 @@
+module Toji
+  module Ingredient
+    module Koji
+      class Expected
+        include Base
+        include Rice::ExpectedSteamable
+        include ExpectedFermentable
+
+        def initialize(raw, rice_rate: RiceRate::DEFAULT, koji_rate: KojiRate::DEFAULT)
+          @raw = raw.to_f
+
+          @rice_rate = rice_rate
+          @soaked_rate = rice_rate.soaked_rate
+          @before_steaming_rate = rice_rate.before_steaming_rate
+          @steamed_rate = rice_rate.steamed_rate
+          @cooled_rate = rice_rate.cooled_rate
+
+          @koji_rate = koji_rate
+          @tanekoji_rate = koji_rate.tanekoji_rate
+          @dekoji_rate = koji_rate.dekoji_rate
+        end
+
+        def round(ndigit=0, half: :up)
+          self.class.new(@raw.round(ndigit, half: half), rice_rate: @rice_rate, koji_rate: @koji_rate)
+        end
+
+        def self.create(x)
+          if self===x
+            x
+          else
+            new(x)
+          end
+        end
+
+        def *(other)
+          if Integer===other || Float===other
+            Expected.new(@raw * other, rice_rate: @rice_rate, koji_rate: @koji_rate)
+          else
+            x, y = other.coerce(self)
+            x * y
+          end
+        end
+      end
+    end
+  end
+end

data/lib/toji/ingredient/koji/expected_fermentable.rb

@@ -0,0 +1,15 @@
+module Toji
+  module Ingredient
+    module Koji
+      module ExpectedFermentable
+        def tanekoji
+          raw * tanekoji_rate
+        end
+
+        def dekoji
+          raw + raw * dekoji_rate
+        end
+      end
+    end
+  end
+end

data/lib/toji/{recipe → ingredient}/koji_rate.rb

@@ -1,5 +1,5 @@
 module Toji
-  module Recipe
+  module Ingredient
     class KojiRate
       attr_reader :tanekoji_rate
       attr_reader :dekoji_rate

data/lib/toji/ingredient/rice.rb

@@ -0,0 +1,10 @@
+require 'toji/ingredient/rice/base'
+require 'toji/ingredient/rice/expected_steamable'
+require 'toji/ingredient/rice/actual_steamable'
+
+module Toji
+  module Ingredient
+    module Rice
+    end
+  end
+end

data/lib/toji/ingredient/rice/actual_steamable.rb

@@ -0,0 +1,27 @@
+module Toji
+  module Ingredient
+    module Rice
+      module ActualSteamable
+        def soaked_rate
+          soaking_water / raw
+        end
+
+        def soaking_water
+          soaked - raw
+        end
+
+        def before_steaming_rate
+          # TODO
+        end
+
+        def steamed_rate
+          (steamed - raw) / raw 
+        end
+
+        def cooled_rate
+          (cooled - raw) / raw
+        end
+      end
+    end
+  end
+end

data/lib/toji/ingredient/rice/base.rb

@@ -0,0 +1,41 @@
+module Toji
+  module Ingredient
+    module Rice
+      module Base
+        # 白米
+        attr_reader :raw
+
+        # 浸漬米吸水率
+        #
+        # 標準的な白米吸水率は掛米で30〜35%、麹米で33%前後で許容範囲はかなり狭い
+        #
+        # 出典: 酒造教本 P38
+        attr_reader :soaked_rate
+        attr_reader :soaking_water
+        attr_reader :soaked
+
+        # 蒸米吸水率
+        #
+        # 蒸しにより通常甑置き前の浸漬白米の重量よりさらに12〜13%吸水する
+        # 蒸しにより吸水の増加が13%を超える場合は、蒸米の表面が柔らかくべとつく蒸米になりやすい
+        # 蒸米吸水率は麹米及び酒母米で41〜43%、掛米は39〜40%で、吟醸造りの場合は数%低い
+        #
+        # 出典: 酒造教本 P48
+        attr_reader :before_steaming_rate
+        attr_reader :steamed_rate
+        attr_reader :steaming_water
+        attr_reader :steamed
+
+        # 放冷
+        #
+        # 冷却法で若干異なるが蒸米の冷却により掛米で白米重量の10%、麹米で8%程度の水が失われる
+        # 出典: 酒造教本 P49
+        #
+        # 麹を造るのに適した蒸米は、引込時の吸水率が33%を理想とし、許容幅はプラスマイナス1%である
+        # 出典: 酒造教本 P59
+        attr_reader :cooled_rate
+        attr_reader :cooled
+      end
+    end
+  end
+end

data/lib/toji/ingredient/rice/expected_steamable.rb

@@ -0,0 +1,29 @@
+module Toji
+  module Ingredient
+    module Rice
+      module ExpectedSteamable
+        def soaking_water
+          raw * soaked_rate
+        end
+
+        def soaked
+          raw + raw * soaked_rate
+        end
+
+        def steaming_water
+          if before_steaming_rate
+            raw * (before_steaming_rate - soaked_rate)
+          end
+        end
+
+        def steamed
+          raw + raw * steamed_rate
+        end
+
+        def cooled
+          raw + raw * cooled_rate
+        end
+      end
+    end
+  end
+end