toji 2.7.0 → 2.11.0

data/example/example_core.rb

@@ -1,3 +1,4 @@
+require 'toji'
 require 'securerandom'
 
 module Example
@@ -56,8 +57,8 @@ module Example
       include Toji::Brew::Koji
     end
 
-    class Shubo < Base
-      include Toji::Brew::Shubo
+    class Moto < Base
+      include Toji::Brew::Moto
     end
 
     class Moromi < Base
@@ -68,6 +69,7 @@ module Example
 
   class Step
     include Toji::Recipe::Step
+    attr_accessor :name
 
     def self.create(name:, kake: 0, koji: 0, water: 0, lactic_acid: 0, alcohol: 0, yeast: 0, koji_interval_days: 0, kake_interval_days: 0)
       new.tap {|o|
@@ -243,14 +245,53 @@ module Example
   end
 
 
+  class KojiEvent
+    include Toji::Event::KojiEvent
+
+    def initialize(product:, date:, group_index:, indexes:, raw:)
+      @product = product
+      @date = date
+      @group_index = group_index
+      @indexes = indexes
+      @raw = raw
+    end
+  end
+
+
+  class KakeEvent
+    include Toji::Event::KakeEvent
+
+    def initialize(product:, date:, group_index:, indexes:, raw:)
+      @product = product
+      @date = date
+      @group_index = group_index
+      @indexes = indexes
+      @raw = raw
+    end
+  end
+
+
+  class ActionEvent
+    include Toji::Event::ActionEvent
+
+    def initialize(product:, date:, type:, index:)
+      @product = product
+      @date = date
+      @type = type
+      @index = index
+    end
+  end
+
+
   class Product
     include Toji::Product
+    include Toji::Product::EventFactory
 
     attr_accessor :description
     attr_accessor :color
 
-    def initialize(reduce_key, name, description, recipe, base_date, color=nil)
-      @reduce_key = reduce_key || SecureRandom.uuid
+    def initialize(id, name, description, recipe, base_date, color=nil)
+      @id = id
       @name = name
       @description = description
       @recipe = recipe
@@ -258,6 +299,18 @@ module Example
       @color = color
     end
 
+    def create_koji_event(date:, group_index:, indexes:, raw:)
+      KojiEvent.new(product: self, date: date, group_index: group_index, indexes: indexes, raw: raw)
+    end
+
+    def create_kake_event(date:, group_index:, indexes:, raw:)
+      KakeEvent.new(product: self, date: date, group_index: group_index, indexes: indexes, raw: raw)
+    end
+
+    def create_action_event(date:, type:, index:)
+      ActionEvent.new(product: self, date: date, type: type, index: index)
+    end
+
     def self.create(args)
       if self===args
         args

data/example/{shubo.rb → moto.rb}

@@ -2,12 +2,12 @@ require 'toji'
 require_relative 'example_core'
 require 'terminal-table'
 
-shubo = Example::Brew::Shubo.load_yaml_file(File.dirname(__FILE__)+"/shubo.yaml")
+moto = Example::Brew::Moto.load_yaml_file(File.dirname(__FILE__)+"/moto.yaml")
 
 table = Terminal::Table.new do |t|
   t << ["作業", "日数", "品温(度)", "ボーメ", "酸度", "経過時間", "日時"]
   t << :separator
-  shubo.wrapped_states.each {|s|
+  moto.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/example/recipe.rb

@@ -24,7 +24,7 @@ table = Terminal::Table.new do |t|
   t << ["[累計]"]
   t << ["総米(g)"] + recipe.cumulative_rice_totals
   t << ["白米比率"] + recipe.rice_rates.map{|v| v&.round(2)}
-  t << ["酒母歩合(%)"] + recipe.cumulative_shubo_rates.map{|s| s * 100}.map{|v| v&.round(2)}
+  t << ["酒母歩合(%)"] + recipe.cumulative_moto_rates.map{|s| s * 100}.map{|v| v&.round(2)}
   t << ["タンク内容量(ml)"] + recipe.steps.map {|s|
     kake = Toji::Ingredient::Kake::Expected.create(s.kake)
     koji = Toji::Ingredient::Koji::Expected.create(s.koji)

data/lib/toji.rb

@@ -6,6 +6,7 @@ require 'toji/ingredient'
 require 'toji/recipe'
 require 'toji/brew'
 require 'toji/calendar'
+require 'toji/event'
 require 'toji/product'
 
 module Toji

data/lib/toji/brew.rb

@@ -14,5 +14,5 @@ require 'toji/brew/builder'
 require 'toji/brew/graph'
 
 require 'toji/brew/koji'
-require 'toji/brew/shubo'
+require 'toji/brew/moto'
 require 'toji/brew/moromi'

data/lib/toji/brew/{shubo.rb → moto.rb}

@@ -1,6 +1,6 @@
 module Toji
   module Brew
-    module Shubo
+    module Moto
       include Base
 
       def progress(name: nil, dash: :solid, enable_annotations: true)

data/lib/toji/calendar.rb

@@ -28,10 +28,12 @@ module Toji
     end
 
     def table_data
-      events = @products.map{|product| product.rice_events}.flatten
+      koji_events = @products.map{|product| product.koji_events}.flatten
+      kake_events = @products.map{|product| product.kake_events}.flatten
+      events = koji_events + kake_events
 
-      koji_len = events.select{|e| e.type==:koji}.map(&:group_index).max + 1
-      kake_len = events.select{|e| e.type==:kake}.map(&:group_index).max + 1
+      koji_len = koji_events.map(&:group_index).max + 1
+      kake_len = kake_events.map(&:group_index).max + 1
       min_date = events.map(&:date).min
       max_date = events.map(&:date).max
 
@@ -65,10 +67,10 @@ module Toji
         date_row = _date_rows[date]
         if date_row
           koji_len.times {|i|
-            columns << (date_row.kojis[i]&.column_events || [])
+            columns << date_row.kojis[i]
           }
           kake_len.times {|i|
-            columns << (date_row.kakes[i]&.column_events || [])
+            columns << date_row.kakes[i]
           }
         else
           (koji_len + kake_len).times {
@@ -88,14 +90,12 @@ module Toji
       data = table_data
       data[:rows] = data[:rows].map {|row|
         row.map {|column|
-          if Array===column
-            column.map{|c|
-              name = c[:product].name
-              weight = "%.17g" % c[:weight]
-              "#{name}: #{weight}"
-            }.join("<br>")
-          else
+          if DateColumn===column
+            column.text
+          elsif column
             column
+          else
+            ""
           end
         }
       }

data/lib/toji/calendar/date_column.rb

@@ -12,28 +12,13 @@ module Toji
       end
       alias_method :add, :<<
 
-      def event_groups
-        @rice_events.group_by {|e|
-          e.group_key
-        }.values
-      end
-
       def text
-        event_groups.map {|es|
-          name = es.first.product.name
-          weight = "%.17g" % es.map(&:weight).sum
-          "#{name}: #{weight}"
+        @rice_events.map {|ev|
+          name = ev.product.name
+          raw = "%.17g" % ev.raw
+          "#{name}: #{raw}"
         }.join("<br>")
       end
-
-      def column_events
-        event_groups.map {|es|
-          {
-            product: es.first.product,
-            weight: es.map(&:weight).sum,
-          }
-        }
-      end
     end
   end
 end

data/lib/toji/calendar/date_row.rb

@@ -12,7 +12,7 @@ module Toji
       end
 
       def <<(event)
-        case event.type
+        case event.rice_type
         when :koji
           index = event.group_index
           @kojis[index] ||= DateColumn.new

data/lib/toji/event.rb

@@ -0,0 +1,5 @@
+require 'toji/event/base'
+require 'toji/event/rice_event'
+require 'toji/event/koji_event'
+require 'toji/event/kake_event'
+require 'toji/event/action_event'

data/lib/toji/event/action_event.rb

@@ -0,0 +1,12 @@
+require 'toji/event/base'
+
+module Toji
+  module Event
+    module ActionEvent
+      include Event
+
+      attr_reader :index
+
+    end
+  end
+end

data/lib/toji/event/base.rb

@@ -0,0 +1,9 @@
+module Toji
+  module Event
+    module Base
+      attr_reader :product
+      attr_reader :date
+      attr_reader :type
+    end
+  end
+end

data/lib/toji/event/kake_event.rb

@@ -0,0 +1,13 @@
+require 'toji/event/rice_event'
+
+module Toji
+  module Event
+    module KakeEvent
+      include RiceEvent
+
+      def rice_type
+        :kake
+      end
+    end
+  end
+end

data/lib/toji/event/koji_event.rb

@@ -0,0 +1,19 @@
+require 'toji/event/rice_event'
+
+module Toji
+  module Event
+    module KojiEvent
+      include RiceEvent
+
+      attr_reader :dekoji
+
+      def rice_type
+        :koji
+      end
+
+      def dekoji_rate
+        (dekoji.to_f - raw.to_f) / raw.to_f
+      end
+    end
+  end
+end

data/lib/toji/event/rice_event.rb

@@ -0,0 +1,34 @@
+require 'toji/event/base'
+
+module Toji
+  module Event
+    module RiceEvent
+      include Base
+
+      attr_reader :rice_type
+      attr_reader :group_index
+      attr_reader :indexes
+
+      attr_reader :raw
+      attr_reader :soaked
+      attr_reader :steamed
+      attr_reader :cooled
+
+      def type
+        :rice
+      end
+
+      def soaked_rate
+        (soaked.to_f - raw.to_f) / raw.to_f
+      end
+
+      def steamed_rate
+        (steamed.to_f - raw.to_f) / raw.to_f
+      end
+
+      def cooled_rate
+        (cooled.to_f - raw.to_f) / raw.to_f
+      end
+    end
+  end
+end

data/lib/toji/product.rb

@@ -1,14 +1,15 @@
-require 'toji/product/event'
-require 'toji/product/rice_event'
-require 'toji/product/rice_event_group'
+require 'toji/product/event_factory'
 
 module Toji
   module Product
-    attr_reader :reduce_key
     attr_accessor :name
     attr_accessor :recipe
     attr_accessor :base_date
 
+    attr_accessor :koji_events
+    attr_accessor :kake_events
+    attr_accessor :action_events
+
     def koji_dates
       date = base_date
       recipe.steps.map {|step|
@@ -23,33 +24,10 @@ module Toji
       }
     end
 
-    def squeeze_date
-      base_date.next_day(recipe.squeeze_interval_days)
-    end
-
-    def koji_events
-      koji_dates.map.with_index {|date,i|
-        RiceEvent.new(
-          product: self,
-          type: :koji,
-          index: i,
-          group_index: koji_dates.find_index(date),
-          date: date,
-          weight: recipe.steps[i].koji,
-        )
-      }
-    end
-
-    def kake_events
-      kake_dates.map.with_index {|date,i|
-        RiceEvent.new(
-          product: self,
-          type: :kake,
-          index: i,
-          group_index: kake_dates.find_index(date),
-          date: date,
-          weight: recipe.steps[i].kake,
-        )
+    def action_dates
+      date = base_date
+      recipe.actions.map {|action|
+        date = date.next_day(action.interval_days)
       }
     end
 
@@ -57,41 +35,8 @@ module Toji
       koji_events + kake_events
     end
 
-    def koji_event_groups
-      koji_events.group_by{|event|
-        event.group_key
-      }.map {|group_key,events|
-        events.select{|event| 0<event.weight}
-      }.select {|events|
-        0<events.length
-      }.map {|events|
-        RiceEventGroup.new(events)
-      }
-    end
-
-    def kake_event_groups
-      kake_events.group_by{|event|
-        event.group_key
-      }.map {|group_key,events|
-        events.select{|event| 0<event.weight}
-      }.select {|events|
-        0<events.length
-      }.map {|events|
-        RiceEventGroup.new(events)
-      }
-    end
-
-    def rice_event_groups
-      koji_event_groups + kake_event_groups
-    end
-
     def events
-      events = []
-
-      events += rice_event_groups
-      events << Event.new(squeeze_date, :squeeze)
-
-      events
+      rice_events + action_events
     end
   end
 end

data/lib/toji/product/event_factory.rb

@@ -0,0 +1,70 @@
+module Toji
+  module Product
+    module EventFactory
+
+      def create_koji_event(date:, group_index:, indexes:, raw:)
+        raise Error, "implement required: create_koji_event"
+      end
+
+      def create_kake_event(date:, group_index:, indexes:, raw:)
+        raise Error, "implement required: create_kake_event"
+      end
+
+      def create_action_event(date:, type:, index:)
+        raise Error, "implement required: create_action_event"
+      end
+
+      def koji_events
+        koji_dates.map.with_index {|date,i|
+          {
+            index: i,
+            date: date,
+            weight: recipe.steps[i].koji,
+          }
+        }.select {|event|
+          0<event[:weight]
+        }.group_by{|event|
+          event[:date]
+        }.map {|date,events|
+          create_koji_event(
+            date: date,
+            group_index: koji_dates.find_index(date),
+            indexes: events.map{|ev| ev[:index]},
+            raw: events.map{|ev| ev[:weight]}.sum,
+          )
+        }
+      end
+
+      def kake_events
+        kake_dates.map.with_index {|date,i|
+          {
+            index: i,
+            date: date,
+            weight: recipe.steps[i].kake,
+          }
+        }.select {|event|
+          0<event[:weight]
+        }.group_by{|event|
+          event[:date]
+        }.map {|date,events|
+          create_kake_event(
+            date: date,
+            group_index: kake_dates.find_index(date),
+            indexes: events.map{|ev| ev[:index]},
+            raw: events.map{|ev| ev[:weight]}.sum,
+          )
+        }
+      end
+
+      def action_events
+        action_dates.map.with_index {|date,i|
+          create_action_event(
+            date: date,
+            type: recipe.actions[i].type,
+            index: i,
+          )
+        }
+      end
+    end
+  end
+end