toji 2.1.0 → 2.4.0

data/lib/toji/recipe/step.rb

@@ -13,7 +13,7 @@ module Toji
 
       # 総米
       def rice_total
-        kake + koji
+        kake.to_f + koji.to_f
       end
 
       # 麹歩合
@@ -22,8 +22,8 @@ module Toji
       # なお、留め仕込みまでの麹歩合が20%を下回ると蒸米の溶解糖化に影響が出るので注意がいる
       # 出典: 酒造教本 P95
       def koji_rate
-        ret = koji / rice_total
-        ret.nan? ? 0.0 : ret
+        val = koji.to_f / rice_total
+        val.nan? ? 0.0 : val
       end
 
       # 汲水歩合
@@ -36,40 +36,40 @@ module Toji
       #
       # 出典: 酒造教本 P96
       def water_rate
-        ret = water / rice_total
-        ret.nan? ? 0.0 : ret
+        val = water.to_f / rice_total
+        val.nan? ? 0.0 : val
       end
 
-      def round(ndigit=0, acid_ndigit=nil, half: :up)
-        if !acid_ndigit
-          acid_ndigit = ndigit + 3
+      def round(ndigit=0, mini_ndigit=nil, half: :up)
+        if !mini_ndigit
+          mini_ndigit = ndigit + 3
         end
 
         self.class.new.tap {|o|
           o.name = name
-          o.kake = kake.round(ndigit, half: half)
-          o.koji = koji.round(ndigit, half: half)
-          o.water = water.round(ndigit, half: half)
-          o.lactic_acid = lactic_acid.round(acid_ndigit, half: half)
-          o.alcohol = alcohol.round(ndigit, half: half)
-          o.yeast = yeast.round(ndigit, half: half)
-          o.koji_interval_days = koji_interval_days
-          o.kake_interval_days = kake_interval_days
+          o.kake = kake.to_f.round(ndigit, half: half)
+          o.koji = koji.to_f.round(ndigit, half: half)
+          o.water = water.to_f.round(ndigit, half: half)
+          o.lactic_acid = lactic_acid.to_f.round(mini_ndigit, half: half)
+          o.alcohol = alcohol.to_f.round(ndigit, half: half)
+          o.yeast = yeast.to_f.round(mini_ndigit, half: half)
+          o.koji_interval_days = koji_interval_days.to_i
+          o.kake_interval_days = kake_interval_days.to_i
         }
       end
 
       def +(other)
         if Step===other
           self.class.new.tap {|o|
-            o.name = nil
-            o.kake = kake + other.kake
-            o.koji = koji + other.koji
-            o.water = water + other.water
-            o.lactic_acid = lactic_acid + other.lactic_acid
-            o.alcohol = alcohol + other.alcohol
-            o.yeast = yeast + other.yeast
-            o.koji_interval_days = koji_interval_days
-            o.kake_interval_days = kake_interval_days
+            o.name = name
+            o.kake = kake.to_f + other.kake.to_f
+            o.koji = koji.to_f + other.koji.to_f
+            o.water = water.to_f + other.water.to_f
+            o.lactic_acid = lactic_acid.to_f + other.lactic_acid.to_f
+            o.alcohol = alcohol.to_f + other.alcohol.to_f
+            o.yeast = yeast.to_f + other.yeast.to_f
+            o.koji_interval_days = koji_interval_days.to_i
+            o.kake_interval_days = kake_interval_days.to_i
           }
         else
           x, y = other.coerce(self)
@@ -81,14 +81,14 @@ module Toji
         if Integer===other || Float===other
           self.class.new.tap {|o|
             o.name = name
-            o.kake = kake * other
-            o.koji = koji * other
-            o.water = water * other
-            o.lactic_acid = lactic_acid * other
-            o.alcohol = alcohol * other
-            o.yeast = yeast * other
-            o.koji_interval_days = koji_interval_days
-            o.kake_interval_days = kake_interval_days
+            o.kake = kake.to_f * other
+            o.koji = koji.to_f * other
+            o.water = water.to_f * other
+            o.lactic_acid = lactic_acid.to_f * other
+            o.alcohol = alcohol.to_f * other
+            o.yeast = yeast.to_f * other
+            o.koji_interval_days = koji_interval_days.to_i
+            o.kake_interval_days = kake_interval_days.to_i
           }
         else
           x, y = other.coerce(self)

data/lib/toji/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -113,12 +113,12 @@ files:
 - example/calendar.yaml
 - example/calendar_file.ipynb
 - example/example_core.rb
-- example/kake_recipe.rb
+- example/kake_ingredient.rb
+- example/koji_ingredient.rb
 - example/koji_making.ipynb
 - example/koji_making.rb
 - example/koji_making.yaml
 - example/koji_making_multi.ipynb
-- example/koji_recipe.rb
 - example/moromi.ipynb
 - example/moromi.rb
 - example/moromi.yaml
@@ -139,7 +139,7 @@ files:
 - lib/toji/brew/moromi.rb
 - lib/toji/brew/shubo.rb
 - lib/toji/brew/state.rb
-- lib/toji/brew/state_wrapper.rb
+- lib/toji/brew/wrapped_state.rb
 - lib/toji/calendar.rb
 - lib/toji/calendar/date_column.rb
 - lib/toji/calendar/date_row.rb