toji 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 913d49d53fa4cd879ce28a4fe4961edccdc8217c1357712666d1a803c16e89a6
-  data.tar.gz: 51eb32477e501ed38527a8cb55ac752d037cb31a10f2eddc706b4dafe8c26d3a
+  metadata.gz: 3b3aca220f9d2ddc9b8278354a088af1c73609c3912388124db4d965db1b3e82
+  data.tar.gz: 91c7e9e3f6705f45bc7206bbbb0b98ad077a1ccc9ce41736a245eeccfdcd15da
 SHA512:
-  metadata.gz: 7332c31932db265a7d38e21336c2ad0b7993752de274661874485db5da66c4c03a32cd6b26001b6c33e91c574a5c85f685f97cfbf552f7f59f8d8b40d2fa5bd8
-  data.tar.gz: bbaae3eb542de0b7458562126ef9b27ccc8805a588327ddbee1150ab572797945b109bc5ed0d4b39ac5384f5f275c4820d9dd5d00b93354f5038f87fcb9607b4
+  metadata.gz: f5004d92b8c087d31d613e6705246c251160f6580f717c526b85a02d6cfdc0569c92d282f31b0fc0d9ba19a4fab963374cc0de876bbdf9ba9c6004add6009aec
+  data.tar.gz: 246c143b4ba5c2e9c1b6e2b4f310ba42064ce0faf307b1f451aac60f7b554d1d4da9a9bd866164008b7188deb5d089d92f684978c3e92b8c7a4f819cee0c9d47

data/example/koji_making.rb

@@ -7,7 +7,7 @@ koji = Example::Brew::Koji.load_yaml_file(File.dirname(__FILE__)+"/koji_making.y
 table = Terminal::Table.new do |t|
   t << ["作業", "日数", "品温(度)", "操作室温", "乾湿差(度)", "経過時間", "日時"]
   t << :separator
-  koji.each {|s|
+  koji.wrapped_states.each {|s|
     temp = s.temps.map(&:to_s).join(" / ")
     t << [s.mark, s.day_label, temp, s.room_temp, s.room_psychrometry, s.elapsed_time, s.display_time]
   }

data/example/moromi.rb

@@ -8,7 +8,7 @@ moromi = Example::Brew::Moromi.load_yaml_file(File.dirname(__FILE__)+"/moromi.ya
 table = Terminal::Table.new do |t|
   t << ["作業", "日数", "品温(度)", "操作室温", "ボーメ及び日本酒度", "アルコール度数", "BMD", "アルコール期待値(16.5 +3)", "経過時間", "日時"]
   t << :separator
-  moromi.each {|s|
+  moromi.wrapped_states.each {|s|
     temp = s.temps.map(&:to_s).join(" / ")
     t << [s.mark, s.day_label, temp, s.room_temp, s.display_baume, s.alcohol, s.bmd&.round(2), s.expected_alcohol(16.5, +3, 1.5)&.round(2), s.elapsed_time, s.display_time]
   }

data/example/shubo.rb

@@ -7,7 +7,7 @@ shubo = Example::Brew::Shubo.load_yaml_file(File.dirname(__FILE__)+"/shubo.yaml"
 table = Terminal::Table.new do |t|
   t << ["作業", "日数", "品温(度)", "ボーメ", "酸度", "経過時間", "日時"]
   t << :separator
-  shubo.each {|s|
+  shubo.wrapped_states.each {|s|
     temp = s.temps.map(&:to_s).join(" / ")
     t << [s.mark, s.day_label, temp, s.baume, s.acid, s.elapsed_time, s.display_time]
   }

data/lib/toji/brew/base.rb

@@ -1,8 +1,6 @@
 module Toji
   module Brew
     module Base
-      include Enumerable
-
       REQUIRED_KEYS = [
         :time,
         :elapsed_time,
@@ -45,10 +43,6 @@ module Toji
         nil
       end
 
-      def each(&block)
-        wrapped_states.each(&block)
-      end
-
       def has_keys
         result = REQUIRED_KEYS.dup
 

data/lib/toji/brew/graph/ab.rb

@@ -24,7 +24,7 @@ module Toji
           result = []
 
           @actuals.each {|moromi, name|
-            states = moromi.select{|s| s.alcohol && s.baume}
+            states = moromi.wrapped_states.select{|s| s.alcohol && s.baume}
 
             xs = states.map(&:alcohol)
             ys = states.map(&:baume)
@@ -47,13 +47,13 @@ module Toji
 
         def min_baume
           @actuals.map {|moromi, name|
-            moromi.map(&:baume).compact.min
+            moromi.wrapped_states.map(&:baume).compact.min
           }.compact.min || 0
         end
 
         def max_baume
           @actuals.map {|moromi, name|
-            moromi.map(&:baume).compact.max
+            moromi.wrapped_states.map(&:baume).compact.max
           }.compact.max || 0
         end
 

data/lib/toji/brew/graph/progress.rb

@@ -56,13 +56,13 @@ module Toji
             xs = []
             ys = []
             text = []
-            @brew.each {|r|
-              val = r.send(key)
+            @brew.wrapped_states.each {|s|
+              val = s.send(key)
               if val
                 [val].flatten.each_with_index {|v,i|
-                  xs << r.elapsed_time_with_offset + i
+                  xs << s.elapsed_time_with_offset + i
                   ys << v
-                  text << r.display_time
+                  text << s.display_time
                 }
               end
             }
@@ -102,7 +102,7 @@ module Toji
         def annotations
           return [] if !@enable_annotations
 
-          @brew.select{|s| s.mark}.map {|s|
+          @brew.wrapped_states.select{|s| s.mark}.map {|s|
             {
               x: s.elapsed_time_with_offset,
               y: s.temps.first || 0,
@@ -131,7 +131,7 @@ module Toji
           end
 
           rows = []
-          @brew.each {|state|
+          @brew.wrapped_states.each {|state|
             rows << keys.map {|k|
               v = state&.send(k)
               if Array===v

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.4.1"
+  VERSION = "2.5.0"
 end

metadata

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