toji 2.27.0 → 2.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 453b31c828544fff48101dfcce3af029716f60942dd65ace4479986b9eba3e1e
-  data.tar.gz: f4bc7eb3e5d629af1eaa108cd5b265141c35706438bc70d696d6589c7101b37d
+  metadata.gz: 6cda96af7ffc4f7a23008d79c90d52884c71e67d8a3d3683269b1874ded680f7
+  data.tar.gz: 9eb861ccf09457e313671029474dffb284f5495373fe747f1a414805fce9b3bf
 SHA512:
-  metadata.gz: 06f8999490f170a9d473a960a6c488a91c4ad96444ee2af8ee522f533b1eff3b497c3ef05e168b6d1cbd90e2750cdc539e04b72142c002cecddffcda70aaf6fa
-  data.tar.gz: fe4df8232b25e245e488b3d39608b40559703ad2028cdf4dd13bdf838cc3bb423f86842a1b9c6664bf1ecd23c5ff508a2e08390003265f805a732259abb2200c
+  metadata.gz: aaf3b8f3a3300f8b12027f8e34168fa25d5ad3e7ae3a3ac5ad8563be7a8eba2040b627e7ff6790213ecb61fe45a3a4aca48c0503246327d9b6458135c62b679e
+  data.tar.gz: 3396b4ead3b1532cdabbc7654bd1493b42d674444ff5094e0bf652e0f632070d56cd6100c3acd888eb063831ab33da72b8b0ab7988fb4f71a8c7a59ae14e8bd6

data/example/example_core.rb

@@ -1064,6 +1064,7 @@ module Example
       attr_accessor :room_dry_temp
       attr_accessor :room_wet_temp
       attr_accessor :room_relative_humidity
+      attr_accessor :room_preset_temp
       attr_accessor :note
 
       def self.create(args)
@@ -1076,6 +1077,7 @@ module Example
           s.room_dry_temp = args[:room_dry_temp]
           s.room_wet_temp = args[:room_wet_temp]
           s.room_relative_humidity = args[:room_relative_humidity]
+          s.room_preset_temp = args[:room_preset_temp]
           s.note = args[:note]
         }
       end
@@ -1105,6 +1107,7 @@ module Example
       attr_accessor :room_dry_temp
       attr_accessor :room_wet_temp
       attr_accessor :room_relative_humidity
+      attr_accessor :room_preset_temp
       attr_accessor :baume
       attr_accessor :acid
       attr_accessor :warmings
@@ -1120,6 +1123,7 @@ module Example
           s.room_dry_temp = args[:room_dry_temp]
           s.room_wet_temp = args[:room_wet_temp]
           s.room_relative_humidity = args[:room_relative_humidity]
+          s.room_preset_temp = args[:room_preset_temp]
           s.baume = args[:baume]
           s.acid = args[:acid]
           s.warmings = [args[:warmings]].flatten.compact
@@ -1155,9 +1159,11 @@ module Example
       attr_accessor :room_dry_temp
       attr_accessor :room_wet_temp
       attr_accessor :room_relative_humidity
+      attr_accessor :room_preset_temp
       attr_accessor :baume
       attr_accessor :acid
       attr_accessor :amino_acid
+      attr_accessor :glucose
       attr_accessor :alcohol
       attr_accessor :warmings
       attr_accessor :note
@@ -1172,6 +1178,7 @@ module Example
           s.room_dry_temp = args[:room_dry_temp]
           s.room_wet_temp = args[:room_wet_temp]
           s.room_relative_humidity = args[:room_relative_humidity]
+          s.room_preset_temp = args[:room_preset_temp]
           if args[:baume]
             s.baume = args[:baume]
           else
@@ -1179,6 +1186,7 @@ module Example
           end
           s.acid = args[:acid]
           s.amino_acid = args[:amino_acid]
+          s.glucose = args[:glucose]
           s.alcohol = args[:alcohol]
           s.warmings = [args[:warmings]].flatten.compact
           s.note = args[:note]

data/lib/toji/progress/base_state.rb

@@ -18,6 +18,7 @@ module Toji
         :room_psychrometry,
         :room_relative_humidity_from_dry_and_wet,
         :room_relative_humidity,
+        :room_preset_temp,
 
         :note,
       ].freeze
@@ -47,6 +48,7 @@ module Toji
       # @dynamic room_dry_temp
       # @dynamic room_wet_temp
       # @dynamic room_relative_humidity
+      # @dynamic room_preset_temp
       # @dynamic note
 
       # 乾湿差

data/lib/toji/progress/moromi_state.rb

@@ -8,18 +8,20 @@ module Toji
         :baume,
         :nihonshudo,
         :display_baume,
-        :acid,
-        :amino_acid,
         :alcohol,
         :bmd,
+        :acid,
+        :amino_acid,
+        :glucose,
         :warmings,
       ]).freeze
 
       # @dynamic baume
       # @dynamic nihonshudo
+      # @dynamic alcohol
       # @dynamic acid
       # @dynamic amino_acid
-      # @dynamic alcohol
+      # @dynamic glucose
       # @dynamic warmings
 
       def moromi_day

data/lib/toji/recipe/step.rb

@@ -63,6 +63,17 @@ module Toji
         val.nan? ? 0.0 : val
       end
 
+      def rices(&block)
+        Enumerator.new do|y|
+          kojis&.each {|koji|
+            y << koji
+          }
+          kakes&.each {|kake|
+            y << kake
+          }
+        end.each(&block)
+      end
+
       def ingredients(&block)
         Enumerator.new do|y|
           kojis&.each {|koji|

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.27.0"
+  VERSION = "2.28.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.27.0
+  version: 2.28.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport