toji 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec68ce9ca3d8e0b3414b7e5bc2407acd0c921dded8e2c81d803d7113faf16377
-  data.tar.gz: a87f5732226f22c2ffde9f1dd0390d33f4cbc82f6123a6dce317561e25933e18
+  metadata.gz: c2b379b857923729bb7cc1d3e9dc901537c7724876d13464da420fca8887ef41
+  data.tar.gz: 99a62648b6353e647d3d2813b18d12cc7f5feb8111465aa5e9176aff4678d9c3
 SHA512:
-  metadata.gz: 47a3a740eed016bf412dec866c68a4b64ca6ad026373a37c504993ea79912739b399691d13148b372d290adb00664c4a3e546b2b52be05f6c6d39fa3399bfaa0
-  data.tar.gz: 773cf147acf53eb4f3954d766c6d6f316a49b7614d58cb10d1214d5d6c20bd3d5f98418c46e5fdfa3666d0d3af43ea6e08a640a41d0937d19bf7cb888d87af87
+  metadata.gz: 49e142c89f5a43181cbe02a3c2f771d999302fa548b672fa000ac278daf6f09e5823d33a20611833d1b4f19a6c2a6dfade767df0cff766ca5248b47054ca10bc
+  data.tar.gz: 29d1955a3e00c7d78e3cda9f5072dbb7bc63b803cbc28ffb9dc0652eaf33750a63b4bb588e361781d922b912082c6b3438fc2ac3212b306d9fee0cedf83f8278

data/example/example_core.rb

@@ -69,11 +69,6 @@ module Example
   class Step
     include Toji::Recipe::Step
 
-    # 総重量
-    def weight_total
-      kake + koji + water + lactic_acid + alcohol + yeast
-    end
-
     def to_h
       {
         name: name,

data/lib/toji/recipe/step.rb

@@ -13,7 +13,7 @@ module Toji
 
       # 総米
       def rice_total
-        [kake, koji].compact.map(&:to_f).sum
+        kake.to_f + koji.to_f
       end
 
       # 麹歩合
@@ -22,7 +22,7 @@ module Toji
       # なお、留め仕込みまでの麹歩合が20%を下回ると蒸米の溶解糖化に影響が出るので注意がいる
       # 出典: 酒造教本 P95
       def koji_rate
-        (koji || 0.0) / rice_total
+        koji.to_f / rice_total
       end
 
       # 汲水歩合
@@ -35,7 +35,7 @@ module Toji
       #
       # 出典: 酒造教本 P96
       def water_rate
-        (water || 0.0) / rice_total
+        water.to_f / rice_total
       end
 
       def round(ndigit=0, mini_ndigit=nil, half: :up)
@@ -45,14 +45,14 @@ module Toji
 
         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(mini_ndigit, half: half)
-          o.alcohol = alcohol.round(ndigit, half: half)
-          o.yeast = yeast.round(mini_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
 
@@ -60,14 +60,14 @@ module Toji
         if Step===other
           self.class.new.tap {|o|
             o.name = name
-            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.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)
@@ -79,14 +79,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.3.0"
+  VERSION = "2.3.1"
 end

metadata

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