toji 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2b379b857923729bb7cc1d3e9dc901537c7724876d13464da420fca8887ef41
-  data.tar.gz: 99a62648b6353e647d3d2813b18d12cc7f5feb8111465aa5e9176aff4678d9c3
+  metadata.gz: fb5e686c2915d1ed44e16fbe3ce58eb232c7ae5d0710c7c8fbc5c924cc4524f7
+  data.tar.gz: ca2702441c730f3586be75b300aa1ec07720a88c02f8be76cf88680000ddc2c5
 SHA512:
-  metadata.gz: 49e142c89f5a43181cbe02a3c2f771d999302fa548b672fa000ac278daf6f09e5823d33a20611833d1b4f19a6c2a6dfade767df0cff766ca5248b47054ca10bc
-  data.tar.gz: 29d1955a3e00c7d78e3cda9f5072dbb7bc63b803cbc28ffb9dc0652eaf33750a63b4bb588e361781d922b912082c6b3438fc2ac3212b306d9fee0cedf83f8278
+  metadata.gz: e0b8df9e1c731727b2ef95aed906e04dbc90f584f57d640d1cf509e4ffd4688a73e94e11fd8b24b4b014dba47da6a8f717babe534d2bdb275e171326cb937e13
+  data.tar.gz: 2dc73ccb8bf508bcc7bf61e04fd750b001f58466d127c5ac828664bced4ceb009f2bbc85c777dbf7d78a4e34d20d8d4e8961358dc136e132bce6729cc8a3404e

data/example/example_core.rb

@@ -69,20 +69,6 @@ module Example
   class Step
     include Toji::Recipe::Step
 
-    def to_h
-      {
-        name: name,
-        kake: kake,
-        koji: koji,
-        water: water,
-        lactic_acid: lactic_acid,
-        alcohol: alcohol,
-        yeast: yeast,
-        koji_interval_days: koji_interval_days,
-        kake_interval_days: kake_interval_days,
-      }
-    end
-
     def self.create(name:, kake: 0, koji: 0, water: 0, lactic_acid: 0, alcohol: 0, yeast: 0, koji_interval_days: 0, kake_interval_days: 0)
       new.tap {|o|
         o.name = name
@@ -106,16 +92,6 @@ module Example
       @steps = []
     end
 
-    #def to_h
-    #  {
-    #    steps: steps.map(&:to_h),
-    #    cumulative_rice_totals: cumulative_rice_totals,
-    #    cumulative_shubo_rates: cumulative_shubo_rates,
-    #    shubo_rate: shubo_rate,
-    #    rice_rates: rice_rates,
-    #  }
-    #end
-
     def self.create(steps)
       new.tap {|o|
         o.steps = steps
@@ -282,21 +258,6 @@ module Example
       @color = color
     end
 
-    def to_h
-      {
-        id: id,
-        name: name,
-        description: @description,
-        recipe: @recipe.table_data,
-        start_date: @start_date,
-        koji_dates: koji_dates,
-        kake_dates: kake_dates,
-        events: events.map(&:to_h),
-        events_group: events_group,
-        color: @color,
-      }
-    end
-
     def self.create(args)
       if self===args
         args

data/example/moromi.rb

@@ -3,7 +3,7 @@ require_relative 'example_core'
 require 'terminal-table'
 
 
-moromi = Toji::Brew::Moromi.load_yaml_file(File.dirname(__FILE__)+"/moromi.yaml")
+moromi = Example::Brew::Moromi.load_yaml_file(File.dirname(__FILE__)+"/moromi.yaml")
 
 table = Terminal::Table.new do |t|
   t << ["作業", "日数", "品温(度)", "操作室温", "ボーメ及び日本酒度", "アルコール度数", "BMD", "アルコール期待値(16.5 +3)", "経過時間", "日時"]

data/example/recipe.rb

@@ -2,30 +2,37 @@ require 'toji'
 require_relative 'example_core'
 require 'terminal-table'
 
-recipe = Example::Recipe::TEMPLATES[:sokujo_nada].scale(900)
+recipe = Example::Recipe::TEMPLATES[:sokujo_nada].scale(900).round(2)
 step_names = recipe.steps.map(&:name)
 
 table = Terminal::Table.new do |t|
   t << [""] + step_names
   t << :separator
   t << ["[原料]"]
-  t << ["酵母(g or 本)"] + recipe.steps.map(&:yeast).map{|v| v&.round(2)}
-  t << ["乳酸(ml)"] + recipe.steps.map(&:lactic_acid).map{|v| v&.round(6)}
-  t << ["掛米(g)"] + recipe.steps.map(&:kake).map{|v| v&.round(2)}
-  t << ["麹米(g)"] + recipe.steps.map(&:koji).map{|v| v&.round(2)}
-  t << ["汲水(ml)"] + recipe.steps.map(&:water).map{|v| v&.round(2)}
-  t << ["醸造アルコール(ml)"] + recipe.steps.map(&:alcohol).map{|v| v&.round(2)}
+  t << ["酵母(g or 本)"] + recipe.steps.map(&:yeast)
+  t << ["乳酸(ml)"] + recipe.steps.map(&:lactic_acid)
+  t << ["掛米(g)"] + recipe.steps.map(&:kake)
+  t << ["麹米(g)"] + recipe.steps.map(&:koji)
+  t << ["汲水(ml)"] + recipe.steps.map(&:water)
+  t << ["醸造アルコール(ml)"] + recipe.steps.map(&:alcohol)
   t << :separator
   t << ["[合計]"]
-  t << ["総米(g)"] + recipe.steps.map(&:rice_total).map{|v| v&.round(2)}
+  t << ["総米(g)"] + recipe.steps.map(&:rice_total)
   t << ["麹歩合(%)"] + recipe.steps.map{|s| s.koji_rate * 100}.map{|v| v&.round(2)}
   t << ["汲水歩合(%)"] + recipe.steps.map{|s| s.water_rate * 100}.map{|v| v&.round(2)}
   t << :separator
   t << ["[累計]"]
-  t << ["総米(g)"] + recipe.cumulative_rice_totals.map{|v| v&.round(2)}
+  t << ["総米(g)"] + recipe.cumulative_rice_totals
   t << ["白米比率"] + recipe.rice_rates.map{|v| v&.round(2)}
   t << ["酒母歩合(%)"] + recipe.cumulative_shubo_rates.map{|s| s * 100}.map{|v| v&.round(2)}
-  t << ["タンク内容量(ml)"] + recipe.cumulative_weight_totals.map{|v| v&.round(2)}
+  t << ["タンク内容量(ml)"] + recipe.steps.map {|s|
+    kake = Toji::Ingredient::Kake::Expected.create(s.kake)
+    koji = Toji::Ingredient::Koji::Expected.create(s.koji)
+    s.yeast.to_f + s.lactic_acid.to_f + kake.steamed.to_f + koji.dekoji.to_f + s.water.to_f + s.alcohol.to_f
+  }.then {|a|
+    sum = 0.0
+    a.map {|x| sum += x}
+  }.map{|v| v&.round(2)}
 end
 puts table
 puts

data/lib/toji/brew/wrapped_state.rb

@@ -104,33 +104,6 @@ module Toji
           target_alc - (_baume - target_nihonshudo * -0.1) * coef
         end
       end
-
-      def to_h
-        {
-          elapsed_time: elapsed_time,
-          time: time,
-          mark: mark,
-          temps: temps,
-          preset_temp: preset_temp,
-          room_temp: room_temp,
-          room_psychrometry: room_psychrometry,
-          acid: acid,
-          amino_acid: amino_acid,
-          alcohol: alcohol,
-          warmings: warmings,
-          note: note,
-
-          day: day,
-          day_label: day_label,
-          elapsed_time_with_offset: elapsed_time_with_offset,
-          baume: baume,
-          nihonshudo: nihonshudo,
-          display_baume: display_baume,
-          display_time: display_time,
-          moromi_day: moromi_day,
-          bmd: bmd,
-        }
-      end
     end
   end
 end

data/lib/toji/calendar.rb

@@ -10,7 +10,7 @@ module Toji
     end
 
     def <<(product)
-      @products << product
+      @products += [product].flatten
       self
     end
     alias_method :add, :<<

data/lib/toji/product/event.rb

@@ -39,16 +39,6 @@ module Toji
       def weight
         @product.recipe.steps[@index].send(@type)
       end
-
-      def to_h
-        {
-          date: date,
-          type: type,
-          index: index,
-          group_index: group_index,
-          weight: weight,
-        }
-      end
     end
   end
 end

data/lib/toji/recipe/step.rb

@@ -22,7 +22,8 @@ module Toji
       # なお、留め仕込みまでの麹歩合が20%を下回ると蒸米の溶解糖化に影響が出るので注意がいる
       # 出典: 酒造教本 P95
       def koji_rate
-        koji.to_f / rice_total
+        val = koji.to_f / rice_total
+        val.nan? ? 0.0 : val
       end
 
       # 汲水歩合
@@ -35,7 +36,8 @@ module Toji
       #
       # 出典: 酒造教本 P96
       def water_rate
-        water.to_f / rice_total
+        val = water.to_f / rice_total
+        val.nan? ? 0.0 : val
       end
 
       def round(ndigit=0, mini_ndigit=nil, half: :up)

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.3.1"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport