toji 2.12.0 → 2.13.0

data/lib/toji/processing/soaked_rice_element.rb

@@ -0,0 +1,18 @@
+module Toji
+  module Processing
+    module SoakedRiceElement
+      # 白米重量
+      attr_reader :weight
+
+      # 浸漬時間
+      attr_reader :soaking_time
+
+      # 浸漬米重量
+      attr_reader :soaked
+
+      def soaking_ratio
+        (soaked.to_f - weight.to_f) / weight.to_f
+      end
+    end
+  end
+end

data/lib/toji/processing/steamed_rice.rb

@@ -0,0 +1,22 @@
+module Toji
+  module Processing
+    module SteamedRice
+      # 親 (belongs_to: Toji::Processing::RiceProcessing)
+      attr_reader :processing
+
+      # 要素 (has_many: Toji::Processing::SteamedRiceElement)
+      attr_reader :elements
+
+      # 蒸米総重量
+      def weight
+        (elements || []).map(&:weight).sum
+      end
+
+      # 蒸米歩合
+      def steaming_ratio
+        raw_weight = processing.soaked_rice.weight.to_f
+        (weight.to_f - raw_weight) / raw_weight
+      end
+    end
+  end
+end

data/lib/toji/processing/steamed_rice_element.rb

@@ -0,0 +1,8 @@
+module Toji
+  module Processing
+    module SteamedRiceElement
+      # 蒸米重量
+      attr_reader :weight
+    end
+  end
+end

data/lib/toji/product.rb

@@ -1,42 +1,21 @@
-require 'toji/product/event_factory'
+require 'toji/product/schedule_factory'
 
 module Toji
   module Product
-    attr_accessor :name
-    attr_accessor :recipe
-    attr_accessor :base_date
+    attr_reader :name
+    attr_reader :recipe
+    attr_reader :base_date
 
-    attr_accessor :koji_events
-    attr_accessor :kake_events
-    attr_accessor :action_events
+    attr_reader :koji_schedules
+    attr_reader :kake_schedules
+    attr_reader :action_schedules
 
-    def koji_dates
-      date = base_date
-      recipe.steps.map {|step|
-        date = date.next_day(step.koji_interval_days)
-      }
+    def rice_schedules
+      koji_schedules + kake_schedules
     end
 
-    def kake_dates
-      date = base_date
-      recipe.steps.map {|step|
-        date = date.next_day(step.kake_interval_days)
-      }
-    end
-
-    def action_dates
-      date = base_date
-      recipe.actions.map {|action|
-        date = date.next_day(action.interval_days)
-      }
-    end
-
-    def rice_events
-      koji_events + kake_events
-    end
-
-    def events
-      rice_events + action_events
+    def schedules
+      rice_schedules + action_schedules
     end
   end
 end

data/lib/toji/product/schedule_factory.rb

@@ -0,0 +1,74 @@
+module Toji
+  module Product
+    module ScheduleFactory
+
+      def create_koji_schedule(date:, step_indexes:, kojis:)
+        raise Error, "implement required: create_koji_schedule"
+      end
+
+      def create_kake_schedule(date:, step_indexes:, kakes:)
+        raise Error, "implement required: create_kake_schedule"
+      end
+
+      def create_action_schedule(date:, action_index:, action:)
+        raise Error, "implement required: create_action_schedule"
+      end
+
+      def koji_schedules
+        recipe.steps.each.with_index.inject([]) {|result, (step, i)|
+          step.kojis&.each {|koji|
+            result << {
+              step_index: i,
+              date: base_date.next_day(koji.interval_days),
+              koji: koji,
+            }
+          }
+          result
+        }.select {|schedule|
+          0<schedule[:koji]&.weight.to_f
+        }.group_by {|schedule|
+          [schedule[:date], schedule[:koji].group_key]
+        }.map {|(date, group_key), schedules|
+          create_koji_schedule(
+            date: date,
+            step_indexes: schedules.map {|schedule| schedule[:step_index]}.sort,
+            kojis: schedules.map{|schedule| schedule[:koji]},
+          )
+        }
+      end
+
+      def kake_schedules
+        recipe.steps.each.with_index.inject([]) {|result, (step, i)|
+          step.kakes&.each {|kake|
+            result << {
+              step_index: i,
+              date: base_date.next_day(kake.interval_days),
+              kake: kake,
+            }
+          }
+          result
+        }.select {|schedule|
+          0<schedule[:kake]&.weight.to_f
+        }.group_by {|schedule|
+          [schedule[:date], schedule[:kake].group_key]
+        }.map {|(date, group_key), schedules|
+          create_kake_schedule(
+            date: date,
+            step_indexes: schedules.map {|schedule| schedule[:step_index]}.sort,
+            kakes: schedules.map{|schedule| schedule[:kake]},
+          )
+        }
+      end
+
+      def action_schedules
+        recipe.actions.map.with_index {|action, i|
+          create_action_schedule(
+            date: base_date.next_day(action.interval_days),
+            action_index: i,
+            action: action,
+          )
+        }
+      end
+    end
+  end
+end

data/lib/toji/progress.rb

@@ -0,0 +1,23 @@
+module Toji
+  module Progress
+    SECOND = 1
+    MINUTE = 60 * SECOND
+    HOUR = 60 * MINUTE
+    DAY = 24 * HOUR
+  end
+end
+
+require 'toji/progress/state'
+require 'toji/progress/base_state'
+require 'toji/progress/koji_state'
+require 'toji/progress/moto_state'
+require 'toji/progress/moromi_state'
+
+require 'toji/progress/progress'
+require 'toji/progress/base_progress'
+require 'toji/progress/koji_progress'
+require 'toji/progress/moto_progress'
+require 'toji/progress/moromi_progress'
+
+require 'toji/progress/builder'
+require 'toji/progress/graph'

data/lib/toji/progress/base_progress.rb

@@ -0,0 +1,37 @@
+module Toji
+  module Progress
+    module BaseProgress
+      include Progress
+
+      def base_time
+        states&.first&.time&.to_time
+      end
+    
+      def day_offset
+        t = base_time
+        if t
+          offset = (t - Time.mktime(t.year, t.month, t.day)).to_i
+          (DAY - date_line + offset) % DAY
+        end
+      end
+
+      def days
+        ((states&.last&.elapsed_time_with_offset&.to_f + 1) / DAY).ceil
+      end
+
+      def day_labels
+        days.times.map(&:succ).map(&:to_s)
+      end
+
+      def all_keys
+        BaseState::REQUIRED_KEYS
+      end
+
+      def has_keys
+        all_keys.select {|k|
+          states.find {|s| s.send(k).present?}
+        }
+      end
+    end
+  end
+end

data/lib/toji/progress/base_state.rb

@@ -0,0 +1,39 @@
+module Toji
+  module Progress
+    module BaseState
+      REQUIRED_KEYS = [
+        :time,
+        :elapsed_time,
+        :day,
+        :day_label,
+        :display_time,
+        :mark,
+      ].freeze
+
+      attr_accessor :progress
+
+      attr_accessor :time
+      attr_accessor :mark
+
+      def elapsed_time
+        time - progress.base_time
+      end
+
+      def elapsed_time_with_offset
+        elapsed_time + progress.day_offset
+      end
+
+      def day
+        ((elapsed_time_with_offset.to_f + 1) / DAY).ceil
+      end
+
+      def day_label
+        progress.day_labels[day - 1]
+      end
+
+      def display_time(format="%m/%d %H:%M")
+        time.strftime(format)
+      end
+    end
+  end
+end

data/lib/toji/progress/builder.rb

@@ -0,0 +1,53 @@
+module Toji
+  module Progress
+    class Builder
+
+      def initialize(progress_cls, state_cls)
+        @progress_cls = progress_cls
+        @state_cls = state_cls
+        @states = []
+        @date_line = 0
+        @prefix_day_labels = nil
+      end
+
+      def <<(state)
+        @states += [state].flatten.map {|state|
+          if State===state
+            state
+          else
+            @state_cls.create(state)
+          end
+        }
+        self
+      end
+      alias_method :add, :<<
+
+      def date_line(val, unit=SECOND)
+        @date_line = (val * unit).to_i
+        self
+      end
+
+      def prefix_day_labels(val)
+        @prefix_day_labels = val
+        self
+      end
+
+      def build
+        progress = @progress_cls.new
+
+        states = @states.map{|s|
+          s.progress = progress
+          s
+        }.sort_by(&:time)
+
+        progress.states = states
+        progress.date_line = @date_line
+        if progress.respond_to?(:prefix_day_labels=)
+          progress.prefix_day_labels = @prefix_day_labels
+        end
+
+        progress
+      end
+    end
+  end
+end

data/lib/toji/progress/graph.rb

@@ -0,0 +1,11 @@
+require 'toji/progress/graph/progress_note'
+require 'toji/progress/graph/multi_progress_note'
+require 'toji/progress/graph/bmd'
+require 'toji/progress/graph/ab'
+
+module Toji
+  module Progress
+    module Graph
+    end
+  end
+end

data/lib/toji/{brew → progress}/graph/ab.rb

@@ -1,5 +1,5 @@
 module Toji
-  module Brew
+  module Progress
     module Graph
       class Ab
         def initialize
@@ -34,7 +34,7 @@ module Toji
           result = []
 
           @actuals.each {|moromi, name|
-            states = moromi.wrapped_states.select{|s| s.alcohol && s.baume}
+            states = moromi.states.select{|s| s.alcohol && s.baume}
 
             xs = states.map(&:alcohol)
             ys = states.map(&:baume)
@@ -57,13 +57,13 @@ module Toji
 
         def min_baume
           @actuals.map {|moromi, name|
-            moromi.wrapped_states.map(&:baume).compact.min
+            moromi.states.map(&:baume).compact.min
           }.compact.min || 0
         end
 
         def max_baume
           @actuals.map {|moromi, name|
-            moromi.wrapped_states.map(&:baume).compact.max
+            moromi.states.map(&:baume).compact.max
           }.compact.max || 0
         end
 

data/lib/toji/{brew → progress}/graph/bmd.rb

@@ -1,5 +1,5 @@
 module Toji
-  module Brew
+  module Progress
     module Graph
       class Bmd
 
@@ -16,7 +16,7 @@ module Toji
           result = []
 
           @actuals.each {|moromi, name|
-            states = moromi.wrapped_states.select{|s| s.moromi_day && s.bmd}
+            states = moromi.states.select{|s| s.moromi_day && s.bmd}
 
             xs = states.map(&:moromi_day).map{|d| d*DAY}
             ys = states.map(&:bmd)

data/lib/toji/{brew/graph/multi_progress.rb → progress/graph/multi_progress_note.rb}

@@ -1,7 +1,7 @@
 module Toji
-  module Brew
+  module Progress
     module Graph
-      class MultiProgress
+      class MultiProgressNote
 
         LINE_DASHES = [
           :solid,
@@ -23,15 +23,15 @@ module Toji
           end
 
           case source
-          when Progress
+          when ProgressNote
             progress = source.dup
             progress.name = name
             progress.dash = dash
             progress.enable_annotations = enable_annotations
-          when Base
-            progress = source.progress(name: name, dash: dash, enable_annotations: enable_annotations)
+          when Progress
+            progress = source.progress_note(name: name, dash: dash, enable_annotations: enable_annotations)
           else
-            raise Error, "ArgumentError: Progress or Base required"
+            raise Error, "ArgumentError: Toji::Progress::Graph::ProgressNote or Toji::Progress::Progress required"
           end
 
           @progresses << progress
@@ -52,17 +52,17 @@ module Toji
         end
 
         def plot(keys=nil)
-          brews = @progresses.map(&:brew)
-          max_brew_days = brews.map(&:days).max
-          index = brews.index{|brew| brew.days==max_brew_days}
-          day_labels = brews[index].day_labels
+          progresses = @progresses.map(&:progress)
+          max_days = progresses.map(&:days).max
+          index = progresses.index{|progress| progress.days==max_days}
+          day_labels = progresses[index].day_labels
 
           Plotly::Plot.new(
             data: plot_data(keys),
             layout: {
               xaxis: {
                 dtick: DAY,
-                tickvals: max_brew_days.times.map{|d| d*DAY},
+                tickvals: max_days.times.map{|d| d*DAY},
                 ticktext: day_labels
               },
               annotations: annotations,