toji 2.8.0 → 2.13.0

data/lib/toji/utils.rb

@@ -0,0 +1,43 @@
+module Toji
+  module Utils
+    def self.activerecord_defined?
+      Object.const_defined?(:ActiveRecord) && ActiveRecord.const_defined?(:Base)
+    end
+
+    def self.check_dup(obj)
+      if activerecord_defined? && ActiveRecord::Base===obj
+        if !obj.class.method_defined?(:initialize_dup, false)
+          raise Error, "implementation required: #{obj.class}.initialize_dup"
+        end
+      else
+        if !obj.class.private_method_defined?(:initialize_copy, false)
+          raise Error, "implementation required: #{obj.class}.initialize_copy"
+        end
+      end
+    end
+
+    def self.merge_ingredients(ingredients1, ingredients2)
+      result = {}
+
+      ingredients1&.each {|src|
+        dst = result[src.group_key]
+        if dst
+          dst.weight = dst.weight.to_f + src.weight.to_f
+        else
+          result[src.group_key] = src
+        end
+      }
+
+      ingredients2&.each {|src|
+        dst = result[src.group_key]
+        if dst
+          dst.weight = dst.weight.to_f + src.weight.to_f
+        else
+          result[src.group_key] = src.dup
+        end
+      }
+
+      result.values
+    end
+  end
+end

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.8.0"
+  VERSION = "2.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-06 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -115,57 +115,76 @@ files:
 - example/example_core.rb
 - example/kake_ingredient.rb
 - example/koji_ingredient.rb
-- example/koji_making.ipynb
-- example/koji_making.rb
-- example/koji_making.yaml
-- example/koji_making_multi.ipynb
-- example/moromi.ipynb
-- example/moromi.rb
-- example/moromi.yaml
-- example/moto.rb
-- example/moto.yaml
+- example/koji_progress.ipynb
+- example/koji_progress.rb
+- example/koji_progress.yaml
+- example/koji_progress_multi.ipynb
+- example/moromi_progress.ipynb
+- example/moromi_progress.rb
+- example/moromi_progress.yaml
+- example/moto_progress.ipynb
+- example/moto_progress.rb
+- example/moto_progress.yaml
 - example/recipe.rb
 - lib/toji.rb
-- lib/toji/brew.rb
-- lib/toji/brew/base.rb
-- lib/toji/brew/builder.rb
-- lib/toji/brew/graph.rb
-- lib/toji/brew/graph/ab.rb
-- lib/toji/brew/graph/bmd.rb
-- lib/toji/brew/graph/multi_progress.rb
-- lib/toji/brew/graph/progress.rb
-- lib/toji/brew/koji.rb
-- lib/toji/brew/moromi.rb
-- lib/toji/brew/moto.rb
-- lib/toji/brew/state.rb
-- lib/toji/brew/wrapped_state.rb
 - lib/toji/calendar.rb
 - lib/toji/calendar/date_column.rb
 - lib/toji/calendar/date_row.rb
 - lib/toji/ingredient.rb
+- lib/toji/ingredient/alcohol.rb
+- lib/toji/ingredient/base.rb
 - lib/toji/ingredient/kake.rb
-- lib/toji/ingredient/kake/actual.rb
-- lib/toji/ingredient/kake/base.rb
-- lib/toji/ingredient/kake/expected.rb
 - lib/toji/ingredient/koji.rb
-- lib/toji/ingredient/koji/actual.rb
-- lib/toji/ingredient/koji/actual_fermentable.rb
-- lib/toji/ingredient/koji/base.rb
-- lib/toji/ingredient/koji/expected.rb
-- lib/toji/ingredient/koji/expected_fermentable.rb
-- lib/toji/ingredient/koji_rate.rb
+- lib/toji/ingredient/lactic_acid.rb
 - lib/toji/ingredient/rice.rb
-- lib/toji/ingredient/rice/actual_steamable.rb
-- lib/toji/ingredient/rice/base.rb
-- lib/toji/ingredient/rice/expected_steamable.rb
-- lib/toji/ingredient/rice_rate.rb
+- lib/toji/ingredient/tanekoji.rb
+- lib/toji/ingredient/water.rb
+- lib/toji/ingredient/yeast.rb
+- lib/toji/processing.rb
+- lib/toji/processing/base.rb
+- lib/toji/processing/cooled_rice.rb
+- lib/toji/processing/cooled_rice_element.rb
+- lib/toji/processing/dekoji.rb
+- lib/toji/processing/dekoji_element.rb
+- lib/toji/processing/kake_processing.rb
+- lib/toji/processing/koji_processing.rb
+- lib/toji/processing/rice_processing.rb
+- lib/toji/processing/soaked_rice.rb
+- lib/toji/processing/soaked_rice_element.rb
+- lib/toji/processing/steamed_rice.rb
+- lib/toji/processing/steamed_rice_element.rb
 - lib/toji/product.rb
-- lib/toji/product/event.rb
-- lib/toji/product/rice_event.rb
-- lib/toji/product/rice_event_group.rb
+- lib/toji/product/schedule_factory.rb
+- lib/toji/progress.rb
+- lib/toji/progress/base_progress.rb
+- lib/toji/progress/base_state.rb
+- lib/toji/progress/builder.rb
+- lib/toji/progress/graph.rb
+- lib/toji/progress/graph/ab.rb
+- lib/toji/progress/graph/bmd.rb
+- lib/toji/progress/graph/multi_progress_note.rb
+- lib/toji/progress/graph/progress_note.rb
+- lib/toji/progress/koji_progress.rb
+- lib/toji/progress/koji_state.rb
+- lib/toji/progress/moromi_progress.rb
+- lib/toji/progress/moromi_state.rb
+- lib/toji/progress/moto_progress.rb
+- lib/toji/progress/moto_state.rb
+- lib/toji/progress/progress.rb
+- lib/toji/progress/state.rb
+- lib/toji/progress/state/baume_to_nihonshudo.rb
+- lib/toji/progress/state/nihonshudo_to_baume.rb
 - lib/toji/recipe.rb
 - lib/toji/recipe/ab_expect.rb
+- lib/toji/recipe/action.rb
 - lib/toji/recipe/step.rb
+- lib/toji/schedule.rb
+- lib/toji/schedule/action_schedule.rb
+- lib/toji/schedule/base.rb
+- lib/toji/schedule/kake_schedule.rb
+- lib/toji/schedule/koji_schedule.rb
+- lib/toji/schedule/rice_schedule.rb
+- lib/toji/utils.rb
 - lib/toji/version.rb
 - toji.gemspec
 homepage: https://github.com/yoshida-eth0/ruby-toji

data/lib/toji/brew.rb

@@ -1,18 +0,0 @@
-module Toji
-  module Brew
-    SECOND = 1
-    MINUTE = 60 * SECOND
-    HOUR = 60 * MINUTE
-    DAY = 24 * HOUR
-  end
-end
-
-require 'toji/brew/base'
-require 'toji/brew/wrapped_state'
-require 'toji/brew/state'
-require 'toji/brew/builder'
-require 'toji/brew/graph'
-
-require 'toji/brew/koji'
-require 'toji/brew/moto'
-require 'toji/brew/moromi'

data/lib/toji/brew/base.rb

@@ -1,55 +0,0 @@
-module Toji
-  module Brew
-    module Base
-      REQUIRED_KEYS = [
-        :time,
-        :elapsed_time,
-        :day,
-        :day_label,
-        :display_time,
-      ].freeze
-
-      OPTIONAL_KEYS = [
-        :moromi_day,
-        :mark,
-        :temps,
-        :preset_temp,
-        :room_temp,
-        :room_psychrometry,
-        :baume,
-        :nihonshudo,
-        :display_baume,
-        :acid,
-        :amino_acid,
-        :alcohol,
-        :bmd,
-        :warmings,
-        :note,
-      ].freeze
-
-      attr_accessor :wrapped_states
-      attr_accessor :day_offset
-      attr_accessor :base_time
-
-      def days
-        ((wrapped_states.last.elapsed_time_with_offset.to_f + 1) / DAY).ceil
-      end
-
-      def day_labels
-        days.times.map(&:succ).map(&:to_s)
-      end
-
-      def moromi_tome_day
-        nil
-      end
-
-      def has_keys
-        result = REQUIRED_KEYS.dup
-
-        result += OPTIONAL_KEYS.select {|k|
-          wrapped_states.find {|s| s.send(k).present?}
-        }
-      end
-    end
-  end
-end

data/lib/toji/brew/builder.rb

@@ -1,98 +0,0 @@
-module Toji
-  module Brew
-    class Builder
-
-      def initialize(cls)
-        @cls = cls
-        @states = []
-        @date_line = 0
-        @prefix_day_labels = nil
-        @base_time = nil
-        @time_interpolation = false
-        @elapsed_time_interpolation = false
-      end
-
-      def <<(state)
-        @states += [state].flatten.map {|state|
-          State.create(state)
-        }
-        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 time_interpolation(base_time)
-        @base_time = base_time&.to_time
-        @time_interpolation = true
-        #@elapsed_time_interpolation = false
-        self
-      end
-
-      def elapsed_time_interpolation
-        #@base_time = nil
-        #@time_interpolation = false
-        @elapsed_time_interpolation = true
-        self
-      end
-
-      def build
-        brew = @cls.new
-
-        wrapped_states = @states.map{|s| WrappedState.new(s, brew)}
-
-        # time interpolation
-        if @time_interpolation
-          base_time = @base_time
-
-          base_state = wrapped_states.select{|w| w.time && w.elapsed_time}.first
-          if base_state
-            base_time = base_state.time - base_state.elapsed_time
-          end
-
-          wrapped_states.each {|w|
-            if w.elapsed_time
-              w.time = base_time + w.elapsed_time
-            end
-          }
-        end
-
-        # elapsed_time interpolation
-        if @elapsed_time_interpolation
-          base_time = wrapped_states.map(&:time).sort.first
-          wrapped_states.each {|w|
-            if w.time
-              w.elapsed_time = (w.time - base_time).to_i
-            end
-          }
-        end
-
-        wrapped_states = wrapped_states.sort_by(&:elapsed_time)
-        base_time = wrapped_states.first&.time
-
-        # day_offset
-        day_offset = 0
-        if base_time
-          day_offset = base_time - Time.mktime(base_time.year, base_time.month, base_time.day)
-        end
-        day_offset = (DAY - @date_line + day_offset) % DAY
-
-        brew.wrapped_states = wrapped_states
-        brew.day_offset = day_offset
-        brew.base_time = base_time
-        if Moromi===brew
-          brew.prefix_day_labels = @prefix_day_labels
-        end
-        brew
-      end
-    end
-  end
-end

data/lib/toji/brew/graph.rb

@@ -1,11 +0,0 @@
-require 'toji/brew/graph/progress'
-require 'toji/brew/graph/multi_progress'
-require 'toji/brew/graph/bmd'
-require 'toji/brew/graph/ab'
-
-module Toji
-  module Brew
-    module Graph
-    end
-  end
-end

data/lib/toji/brew/koji.rb

@@ -1,11 +0,0 @@
-module Toji
-  module Brew
-    module Koji
-      include Base
-
-      def progress(name: nil, dash: :solid, enable_annotations: true)
-        Graph::Progress.new(self, name: name, dash: dash, enable_annotations: enable_annotations)
-      end
-    end
-  end
-end

data/lib/toji/brew/moto.rb

@@ -1,11 +0,0 @@
-module Toji
-  module Brew
-    module Moto
-      include Base
-
-      def progress(name: nil, dash: :solid, enable_annotations: true)
-        Graph::Progress.new(self, name: name, dash: dash, enable_annotations: enable_annotations)
-      end
-    end
-  end
-end

data/lib/toji/brew/state.rb

@@ -1,122 +0,0 @@
-module Toji
-  module Brew
-    module State
-      KEYS = [
-        :time,
-        :elapsed_time,
-        :mark,
-        :temps,
-        :preset_temp,
-        :room_temp,
-        :room_psychrometry,
-        :baume,
-        :nihonshudo,
-        :acid,
-        :amino_acid,
-        :alcohol,
-        :warmings,
-        :note,
-      ].freeze
-
-      attr_accessor :time
-      attr_accessor :elapsed_time
-      attr_accessor :mark
-      attr_accessor :temps
-
-      attr_accessor :preset_temp
-      attr_accessor :room_temp
-      attr_accessor :room_psychrometry
-
-      attr_accessor :baume
-      attr_accessor :nihonshudo
-      attr_accessor :acid
-      attr_accessor :amino_acid
-      attr_accessor :alcohol
-
-      attr_accessor :warmings
-      attr_accessor :note
-
-
-      def self.included(cls)
-        cls.prepend PrependMethods
-      end
-
-      module PrependMethods
-        def temps
-          (super || []).map(&:to_f)
-        end
-
-        def temps=(val)
-          super([val].flatten.compact.map(&:to_f))
-        end
-
-        def time=(val)
-          super(val&.to_time)
-        end
-
-        def warmings
-          super || []
-        end
-
-        def warmings=(val)
-          super([val].flatten.compact)
-        end
-      end
-
-      module BaumeToNihonshudo
-        def nihonshudo
-          if self.baume
-            self.baume * -10
-          end
-        end
-
-        def nihonshudo=(val)
-          if val
-            self.baume = val.to_f / -10.0
-          else
-            self.baume = nil
-          end
-        end
-      end
-
-      module NihonshudoToBaume
-        def baume
-          if self.nihonshudo
-            self.nihonshudo / -10.0
-          end
-        end
-
-        def baume=(val)
-          if val
-            self.nihonshudo = val.to_f * -10
-          else
-            self.nihonshudo = nil
-          end
-        end
-      end
-
-      def self.create(val)
-        if State===val
-          val
-        elsif WrappedState==val
-          val.state
-        #elsif Hash===val
-        #  #s = Class.new {
-        #  #  include State
-        #  #}.new
-        #  s = Object.new.tap {|o|
-        #    o.extend State
-        #    o.extend State::PrependMethods
-        #  }
-
-        #  KEYS.each {|k|
-        #    s.send("#{k}=", val[k])
-        #  }
-        #  s
-        else
-          raise Error, "ArgumentError: cant cast to Toji::Brew::State"
-        end
-      end
-    end
-  end
-end