toji 2.21.0 → 2.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b77f334631cb7f784010f180c140f1d62e602b2bd38f3df985f253b0882e3002
-  data.tar.gz: b60120e7f1dd12480b51900e1e737c83fac9d0d8fdc94f844b5e3a1b0a8d113f
+  metadata.gz: 494121b64259737e8f8e942f688db54c630a5ae468d9a5530ad5e98b91d99ddb
+  data.tar.gz: 10585215b677950ecaebb9e4eccb7fa19fa0803e6e915c6d5d2dd2e1f0d1191d
 SHA512:
-  metadata.gz: 2290fd226b0b15ba3dd1eb9559dcf0ece2b53098eda7ce7f7615d2b2d5d33cbeb4dc74197be54a4b08864ecb0ff8ffed0257626f327ce273c35e4a47d447afbf
-  data.tar.gz: d1b7a139f56511611b5936dea84d3a4a90965cb9c736947dfa74003c85f4e2bd663960320bded0e08c30d4b49d386bf54e53f4286b48fcd4e67bdac1c5ccd6e3
+  metadata.gz: 3b6b8d00a2f0b5f4494c07ab5c9eefb496db64eb1096e323c7d2f232ad32279a74da24c646b48ea0057ab3ac3a9bb3ec9548b9b66a1b995b2f4317d8471e9a23
+  data.tar.gz: 5dc4965df7dd65c8f3dafc41af8a884c557cb029875aa3694e9ff011402ac7614368c96aa9d55e592ae7fc0f52ba8a591152f414ad60dbd14d0d48de775868e8

data/lib/toji/recipe.rb

@@ -9,6 +9,16 @@ module Toji
     # @dynamic ab_coef
     # @dynamic ab_expects
 
+    def ingredients(&block)
+      Enumerator.new do|y|
+        steps&.each {|step|
+          step.ingredients.each {|ingredient|
+            y << [step, ingredient]
+          }
+        }
+      end.each(&block)
+    end
+
     def scale_rice_total(rice_total)
       ratio = rice_total.to_f / steps.map(&:rice_total).sum
       scale(ratio)

data/lib/toji/recipe/step.rb

@@ -65,24 +65,32 @@ module Toji
         val.nan? ? 0.0 : val
       end
 
+      def ingredients(&block)
+        Enumerator.new do|y|
+          kojis&.each {|koji|
+            y << koji
+          }
+          kakes&.each {|kake|
+            y << kake
+          }
+          waters&.each {|water|
+            y << water
+          }
+          lactic_acids&.each {|lactic_acid|
+            y << lactic_acid
+          }
+          alcohols&.each {|alcohol|
+            y << alcohol
+          }
+          yeasts&.each {|yeast|
+            y << yeast
+          }
+        end.each(&block)
+      end
+
       def scale!(ratio)
-        kojis&.each {|koji|
-          koji.weight *= ratio
-        }
-        kakes&.each {|kake|
-          kake.weight *= ratio
-        }
-        waters&.each {|water|
-          water.weight *= ratio
-        }
-        lactic_acids&.each {|lactic_acid|
-          lactic_acid.weight *= ratio
-        }
-        alcohols&.each {|alcohol|
-          alcohol.weight *= ratio
-        }
-        yeasts&.each {|yeast|
-          yeast.weight *= ratio
+        ingredients.each {|ingredient|
+          ingredient.weight *= ratio
         }
         self
       end

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.21.0"
+  VERSION = "2.22.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.21.0
+  version: 2.22.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport