toji 2.13.1 → 2.18.0
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.
- checksums.yaml +4 -4
- data/example/example_core.rb +224 -39
- data/lib/toji/calendar.rb +2 -2
- data/lib/toji/calendar/date_row.rb +2 -2
- data/lib/toji/ingredient/alcohol.rb +1 -1
- data/lib/toji/ingredient/base.rb +3 -2
- data/lib/toji/ingredient/koji.rb +2 -2
- data/lib/toji/ingredient/lactic_acid.rb +1 -1
- data/lib/toji/ingredient/rice.rb +10 -9
- data/lib/toji/ingredient/tanekoji.rb +3 -3
- data/lib/toji/ingredient/water.rb +3 -3
- data/lib/toji/ingredient/yeast.rb +4 -3
- data/lib/toji/processing/base.rb +1 -1
- data/lib/toji/processing/cooled_rice.rb +2 -2
- data/lib/toji/processing/cooled_rice_element.rb +1 -1
- data/lib/toji/processing/dekoji.rb +2 -2
- data/lib/toji/processing/dekoji_element.rb +1 -1
- data/lib/toji/processing/koji_processing.rb +1 -1
- data/lib/toji/processing/rice_processing.rb +4 -4
- data/lib/toji/processing/soaked_rice.rb +7 -7
- data/lib/toji/processing/soaked_rice_element.rb +3 -3
- data/lib/toji/processing/steamed_rice.rb +2 -2
- data/lib/toji/processing/steamed_rice_element.rb +1 -1
- data/lib/toji/product.rb +9 -15
- data/lib/toji/product/schedule_factory.rb +23 -9
- data/lib/toji/progress/base_state.rb +2 -5
- data/lib/toji/progress/graph/ab.rb +2 -2
- data/lib/toji/progress/koji_state.rb +5 -5
- data/lib/toji/progress/moromi_progress.rb +1 -1
- data/lib/toji/progress/moromi_state.rb +11 -11
- data/lib/toji/progress/moto_state.rb +8 -8
- data/lib/toji/progress/progress.rb +8 -7
- data/lib/toji/progress/state.rb +13 -0
- data/lib/toji/recipe.rb +5 -5
- data/lib/toji/recipe/ab_expect.rb +2 -2
- data/lib/toji/recipe/action.rb +2 -2
- data/lib/toji/recipe/step.rb +15 -6
- data/lib/toji/schedule/action_schedule.rb +1 -1
- data/lib/toji/schedule/base.rb +3 -3
- data/lib/toji/schedule/rice_schedule.rb +3 -3
- data/lib/toji/version.rb +1 -1
- metadata +5 -5
@@ -1,6 +1,8 @@
|
|
1
1
|
module Toji
|
2
2
|
module Progress
|
3
3
|
module BaseState
|
4
|
+
include State
|
5
|
+
|
4
6
|
REQUIRED_KEYS = [
|
5
7
|
:time,
|
6
8
|
:elapsed_time,
|
@@ -10,11 +12,6 @@ module Toji
|
|
10
12
|
:mark,
|
11
13
|
].freeze
|
12
14
|
|
13
|
-
attr_accessor :progress
|
14
|
-
|
15
|
-
attr_accessor :time
|
16
|
-
attr_accessor :mark
|
17
|
-
|
18
15
|
def elapsed_time
|
19
16
|
time - progress.base_time
|
20
17
|
end
|
@@ -58,13 +58,13 @@ module Toji
|
|
58
58
|
def min_baume
|
59
59
|
@actuals.map {|moromi, name|
|
60
60
|
moromi.states.map(&:baume).compact.min
|
61
|
-
}.compact.min || 0
|
61
|
+
}.compact.min || 0.0
|
62
62
|
end
|
63
63
|
|
64
64
|
def max_baume
|
65
65
|
@actuals.map {|moromi, name|
|
66
66
|
moromi.states.map(&:baume).compact.max
|
67
|
-
}.compact.max || 0
|
67
|
+
}.compact.max || 0.0
|
68
68
|
end
|
69
69
|
|
70
70
|
def plot
|
@@ -12,12 +12,12 @@ module Toji
|
|
12
12
|
:note,
|
13
13
|
].freeze
|
14
14
|
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
15
|
+
# @dynamic temps
|
16
|
+
# @dynamic preset_temp
|
17
|
+
# @dynamic room_temp
|
18
|
+
# @dynamic room_psychrometry
|
19
19
|
|
20
|
-
|
20
|
+
# @dynamic note
|
21
21
|
end
|
22
22
|
end
|
23
23
|
end
|
@@ -22,19 +22,19 @@ module Toji
|
|
22
22
|
:note,
|
23
23
|
].freeze
|
24
24
|
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
25
|
+
# @dynamic temps
|
26
|
+
# @dynamic preset_temp
|
27
|
+
# @dynamic room_temp
|
28
|
+
# @dynamic room_psychrometry
|
29
29
|
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
30
|
+
# @dynamic baume
|
31
|
+
# @dynamic nihonshudo
|
32
|
+
# @dynamic acid
|
33
|
+
# @dynamic amino_acid
|
34
|
+
# @dynamic alcohol
|
35
35
|
|
36
|
-
|
37
|
-
|
36
|
+
# @dynamic warmings
|
37
|
+
# @dynamic note
|
38
38
|
|
39
39
|
def moromi_day
|
40
40
|
_tome_day = progress.moromi_tome_day
|
@@ -16,16 +16,16 @@ module Toji
|
|
16
16
|
:note,
|
17
17
|
].freeze
|
18
18
|
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
19
|
+
# @dynamic temps
|
20
|
+
# @dynamic preset_temp
|
21
|
+
# @dynamic room_temp
|
22
|
+
# @dynamic room_psychrometry
|
23
23
|
|
24
|
-
|
25
|
-
|
24
|
+
# @dynamic baume
|
25
|
+
# @dynamic acid
|
26
26
|
|
27
|
-
|
28
|
-
|
27
|
+
# @dynamic warmings
|
28
|
+
# @dynamic note
|
29
29
|
end
|
30
30
|
end
|
31
31
|
end
|
@@ -1,15 +1,16 @@
|
|
1
1
|
module Toji
|
2
2
|
module Progress
|
3
3
|
module Progress
|
4
|
-
|
5
|
-
|
4
|
+
# @dynamic states
|
5
|
+
# @dynamic date_line
|
6
6
|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
7
|
+
# @dynamic base_time
|
8
|
+
# @dynamic day_offset
|
9
|
+
# @dynamic days
|
10
|
+
# @dynamic day_labels
|
11
11
|
|
12
|
-
|
12
|
+
# @dynamic all_keys
|
13
|
+
# @dynamic has_keys
|
13
14
|
end
|
14
15
|
end
|
15
16
|
end
|
data/lib/toji/progress/state.rb
CHANGED
@@ -4,6 +4,19 @@ require 'toji/progress/state/nihonshudo_to_baume'
|
|
4
4
|
module Toji
|
5
5
|
module Progress
|
6
6
|
module State
|
7
|
+
# @dynamic progress
|
8
|
+
# @dynamic progress=
|
9
|
+
|
10
|
+
# @dynamic time
|
11
|
+
# @dynamic time=
|
12
|
+
# @dynamic mark
|
13
|
+
# @dynamic mark=
|
14
|
+
|
15
|
+
# @dynamic elapsed_time
|
16
|
+
# @dynamic elapsed_time_with_offset
|
17
|
+
# @dynamic day
|
18
|
+
# @dynamic day_label
|
19
|
+
# @dynamic display_time
|
7
20
|
end
|
8
21
|
end
|
9
22
|
end
|
data/lib/toji/recipe.rb
CHANGED
@@ -4,13 +4,13 @@ require 'toji/recipe/ab_expect'
|
|
4
4
|
|
5
5
|
module Toji
|
6
6
|
module Recipe
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
7
|
+
# @dynamic steps
|
8
|
+
# @dynamic actions
|
9
|
+
# @dynamic ab_coef
|
10
|
+
# @dynamic ab_expects
|
11
11
|
|
12
12
|
def scale_rice_total(rice_total)
|
13
|
-
ratio = rice_total / steps.map(&:rice_total).sum
|
13
|
+
ratio = rice_total.to_f / steps.map(&:rice_total).sum
|
14
14
|
scale(ratio)
|
15
15
|
end
|
16
16
|
|
data/lib/toji/recipe/action.rb
CHANGED
data/lib/toji/recipe/step.rb
CHANGED
@@ -1,12 +1,21 @@
|
|
1
1
|
module Toji
|
2
2
|
module Recipe
|
3
3
|
module Step
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
4
|
+
# @dynamic index
|
5
|
+
# @dynamic subindex
|
6
|
+
|
7
|
+
# @dynamic kojis
|
8
|
+
# @dynamic kojis=
|
9
|
+
# @dynamic kakes
|
10
|
+
# @dynamic kakes=
|
11
|
+
# @dynamic waters
|
12
|
+
# @dynamic waters=
|
13
|
+
# @dynamic lactic_acids
|
14
|
+
# @dynamic lactic_acids=
|
15
|
+
# @dynamic alcohols
|
16
|
+
# @dynamic alcohols=
|
17
|
+
# @dynamic yeasts
|
18
|
+
# @dynamic yeasts=
|
10
19
|
|
11
20
|
# 麹米
|
12
21
|
def koji_total
|
data/lib/toji/schedule/base.rb
CHANGED
data/lib/toji/version.rb
CHANGED
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.
|
4
|
+
version: 2.18.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Yoshida Tetsuya
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-12-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -194,7 +194,7 @@ metadata:
|
|
194
194
|
homepage_uri: https://github.com/yoshida-eth0/ruby-toji
|
195
195
|
source_code_uri: https://github.com/yoshida-eth0/ruby-toji
|
196
196
|
changelog_uri: https://github.com/yoshida-eth0/ruby-toji
|
197
|
-
post_install_message:
|
197
|
+
post_install_message:
|
198
198
|
rdoc_options: []
|
199
199
|
require_paths:
|
200
200
|
- lib
|
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
210
210
|
version: '0'
|
211
211
|
requirements: []
|
212
212
|
rubygems_version: 3.1.2
|
213
|
-
signing_key:
|
213
|
+
signing_key:
|
214
214
|
specification_version: 4
|
215
215
|
summary: Management tools for brewing japanese sake.
|
216
216
|
test_files: []
|