toji 2.3.0 → 2.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/example/example_core.rb +0 -5
  3. data/lib/toji/recipe/step.rb +27 -27
  4. data/lib/toji/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ec68ce9ca3d8e0b3414b7e5bc2407acd0c921dded8e2c81d803d7113faf16377
4
- data.tar.gz: a87f5732226f22c2ffde9f1dd0390d33f4cbc82f6123a6dce317561e25933e18
3
+ metadata.gz: c2b379b857923729bb7cc1d3e9dc901537c7724876d13464da420fca8887ef41
4
+ data.tar.gz: 99a62648b6353e647d3d2813b18d12cc7f5feb8111465aa5e9176aff4678d9c3
5
5
  SHA512:
6
- metadata.gz: 47a3a740eed016bf412dec866c68a4b64ca6ad026373a37c504993ea79912739b399691d13148b372d290adb00664c4a3e546b2b52be05f6c6d39fa3399bfaa0
7
- data.tar.gz: 773cf147acf53eb4f3954d766c6d6f316a49b7614d58cb10d1214d5d6c20bd3d5f98418c46e5fdfa3666d0d3af43ea6e08a640a41d0937d19bf7cb888d87af87
6
+ metadata.gz: 49e142c89f5a43181cbe02a3c2f771d999302fa548b672fa000ac278daf6f09e5823d33a20611833d1b4f19a6c2a6dfade767df0cff766ca5248b47054ca10bc
7
+ data.tar.gz: 29d1955a3e00c7d78e3cda9f5072dbb7bc63b803cbc28ffb9dc0652eaf33750a63b4bb588e361781d922b912082c6b3438fc2ac3212b306d9fee0cedf83f8278
data/example/example_core.rb CHANGED
@@ -69,11 +69,6 @@ module Example
69
69
  class Step
70
70
  include Toji::Recipe::Step
71
71
 
72
- # 総重量
73
- def weight_total
74
- kake + koji + water + lactic_acid + alcohol + yeast
75
- end
76
-
77
72
  def to_h
78
73
  {
79
74
  name: name,
data/lib/toji/recipe/step.rb CHANGED
@@ -13,7 +13,7 @@ module Toji
13
13
 
14
14
  # 総米
15
15
  def rice_total
16
- [kake, koji].compact.map(&:to_f).sum
16
+ kake.to_f + koji.to_f
17
17
  end
18
18
 
19
19
  # 麹歩合
@@ -22,7 +22,7 @@ module Toji
22
22
  # なお、留め仕込みまでの麹歩合が20%を下回ると蒸米の溶解糖化に影響が出るので注意がいる
23
23
  # 出典: 酒造教本 P95
24
24
  def koji_rate
25
- (koji || 0.0) / rice_total
25
+ koji.to_f / rice_total
26
26
  end
27
27
 
28
28
  # 汲水歩合
@@ -35,7 +35,7 @@ module Toji
35
35
  #
36
36
  # 出典: 酒造教本 P96
37
37
  def water_rate
38
- (water || 0.0) / rice_total
38
+ water.to_f / rice_total
39
39
  end
40
40
 
41
41
  def round(ndigit=0, mini_ndigit=nil, half: :up)
@@ -45,14 +45,14 @@ module Toji
45
45
 
46
46
  self.class.new.tap {|o|
47
47
  o.name = name
48
- o.kake = kake.round(ndigit, half: half)
49
- o.koji = koji.round(ndigit, half: half)
50
- o.water = water.round(ndigit, half: half)
51
- o.lactic_acid = lactic_acid.round(mini_ndigit, half: half)
52
- o.alcohol = alcohol.round(ndigit, half: half)
53
- o.yeast = yeast.round(mini_ndigit, half: half)
54
- o.koji_interval_days = koji_interval_days
55
- o.kake_interval_days = kake_interval_days
48
+ o.kake = kake.to_f.round(ndigit, half: half)
49
+ o.koji = koji.to_f.round(ndigit, half: half)
50
+ o.water = water.to_f.round(ndigit, half: half)
51
+ o.lactic_acid = lactic_acid.to_f.round(mini_ndigit, half: half)
52
+ o.alcohol = alcohol.to_f.round(ndigit, half: half)
53
+ o.yeast = yeast.to_f.round(mini_ndigit, half: half)
54
+ o.koji_interval_days = koji_interval_days.to_i
55
+ o.kake_interval_days = kake_interval_days.to_i
56
56
  }
57
57
  end
58
58
 
@@ -60,14 +60,14 @@ module Toji
60
60
  if Step===other
61
61
  self.class.new.tap {|o|
62
62
  o.name = name
63
- o.kake = kake + other.kake
64
- o.koji = koji + other.koji
65
- o.water = water + other.water
66
- o.lactic_acid = lactic_acid + other.lactic_acid
67
- o.alcohol = alcohol + other.alcohol
68
- o.yeast = yeast + other.yeast
69
- o.koji_interval_days = koji_interval_days
70
- o.kake_interval_days = kake_interval_days
63
+ o.kake = kake.to_f + other.kake.to_f
64
+ o.koji = koji.to_f + other.koji.to_f
65
+ o.water = water.to_f + other.water.to_f
66
+ o.lactic_acid = lactic_acid.to_f + other.lactic_acid.to_f
67
+ o.alcohol = alcohol.to_f + other.alcohol.to_f
68
+ o.yeast = yeast.to_f + other.yeast.to_f
69
+ o.koji_interval_days = koji_interval_days.to_i
70
+ o.kake_interval_days = kake_interval_days.to_i
71
71
  }
72
72
  else
73
73
  x, y = other.coerce(self)
@@ -79,14 +79,14 @@ module Toji
79
79
  if Integer===other || Float===other
80
80
  self.class.new.tap {|o|
81
81
  o.name = name
82
- o.kake = kake * other
83
- o.koji = koji * other
84
- o.water = water * other
85
- o.lactic_acid = lactic_acid * other
86
- o.alcohol = alcohol * other
87
- o.yeast = yeast * other
88
- o.koji_interval_days = koji_interval_days
89
- o.kake_interval_days = kake_interval_days
82
+ o.kake = kake.to_f * other
83
+ o.koji = koji.to_f * other
84
+ o.water = water.to_f * other
85
+ o.lactic_acid = lactic_acid.to_f * other
86
+ o.alcohol = alcohol.to_f * other
87
+ o.yeast = yeast.to_f * other
88
+ o.koji_interval_days = koji_interval_days.to_i
89
+ o.kake_interval_days = kake_interval_days.to_i
90
90
  }
91
91
  else
92
92
  x, y = other.coerce(self)
data/lib/toji/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Toji
2
- VERSION = "2.3.0"
2
+ VERSION = "2.3.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: toji
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.0
4
+ version: 2.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yoshida Tetsuya
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-06-21 00:00:00.000000000 Z
11
+ date: 2020-06-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport