toji 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 786352136e52ef48ba44bb1253fb98ae7fe34e95e39dfd7985d99650f6709efc
-  data.tar.gz: f72942871941be4816c3f0b600d77fa27414e3a1b01b5322281690adf44760a8
+  metadata.gz: 706d23865cd25f83d8ef3fdaf68ee9caf3e3e4654073e008dd8042ac7788ad41
+  data.tar.gz: f8e7be6bea2d1b077ebabddd4ae759be33bd7dc70d18338054c20ab557f544aa
 SHA512:
-  metadata.gz: c4d8c7fa4e01ec62c93f790d1c46eb64013909940e22c7148f6019da6708481ec5565f0f5532da05e73fa5dcae7905e24eead3ef4c80d53ce55e58ef94882d2f
-  data.tar.gz: 5bba69d7f5948009a2ff06c739742766efac76e79c91f3e17946c5a22eca9005b1104752842ce47a16adc4275cf44b12c0a1734a410ce0c066a35d64ca758747
+  metadata.gz: 7b7ba7232869e9e9e570199976bfe6a30e38b1ee07a186f75535f3436272efbad584b82e6dee4e06a49d1b646e5059090d54322f92d3704a74de8c1e93eea40d
+  data.tar.gz: 1618a172204ce57437e1a9ccbe9a14dbc3fa0bd5617c8f7f7b6629fa1ee75cd5c544f2eef57bc5f9dbdd10896440ef6fb431af5834b12a84eb0f08454b4e7cb7

data/lib/toji/product.rb

@@ -1,6 +1,8 @@
 require 'toji/product/event'
 require 'toji/product/rice_event'
 require 'toji/product/rice_event_group'
+require 'toji/product/action_event'
+require 'toji/product/event_factory'
 
 module Toji
   module Product
@@ -9,6 +11,12 @@ module Toji
     attr_accessor :recipe
     attr_accessor :base_date
 
+    attr_accessor :koji_events
+    attr_accessor :kake_events
+    attr_accessor :koji_event_groups
+    attr_accessor :kake_event_groups
+    attr_accessor :action_events
+
     def koji_dates
       date = base_date
       recipe.steps.map {|step|
@@ -23,33 +31,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,
-          rice_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,
-          rice_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,37 +42,12 @@ module Toji
       koji_events + kake_events
     end
 
-    def koji_event_groups
-      koji_events.select{|event|
-        0<event.weight
-      }.group_by{|event|
-        event.group_key
-      }.map {|group_key,events|
-        RiceEventGroup.new(events)
-      }
-    end
-
-    def kake_event_groups
-      kake_events.select{|event|
-        0<event.weight
-      }.group_by{|event|
-        event.group_key
-      }.map {|group_key,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_event_groups + action_events
     end
   end
 end

data/lib/toji/product/action_event.rb

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

data/lib/toji/product/event.rb

@@ -1,13 +1,8 @@
 module Toji
   module Product
-    class Event
+    module Event
       attr_reader :date
       attr_reader :type
-
-      def initialize(date, type)
-        @date = date
-        @type = type
-      end
     end
   end
 end

data/lib/toji/product/event_factory.rb

@@ -0,0 +1,86 @@
+module Toji
+  module Product
+    module EventFactory
+
+      def create_rice_event(product:, date:, rice_type:, index:, group_index:, weight:)
+        raise Error, "implement required: create_rice_event"
+      end
+
+      def create_rice_event_group(date:, rice_type:, breakdown:)
+        raise Error, "implement required: create_rice_event_group"
+      end
+
+      def create_action_event(product:, date:, type:, index:)
+        raise Error, "implement required: create_action_event"
+      end
+
+      def koji_events
+        koji_dates.map.with_index {|date,i|
+          create_rice_event(
+            product: self,
+            rice_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|
+          create_rice_event(
+            product: self,
+            rice_type: :kake,
+            index: i,
+            group_index: kake_dates.find_index(date),
+            date: date,
+            weight: recipe.steps[i].kake,
+          )
+        }
+      end
+
+      def koji_event_groups
+        koji_events.select{|event|
+          0<event.weight
+        }.group_by{|event|
+          event.group_key
+        }.map {|group_key,events|
+          event = events.first
+          create_rice_event_group(
+            date: event.date,
+            rice_type: event.rice_type,
+            breakdown: events,
+          )
+        }
+      end
+
+      def kake_event_groups
+        kake_events.select{|event|
+          0<event.weight
+        }.group_by{|event|
+          event.group_key
+        }.map {|group_key,events|
+          event = events.first
+          create_rice_event_group(
+            date: event.date,
+            rice_type: event.rice_type,
+            breakdown: events,
+          )
+        }
+      end
+
+      def action_events
+        action_dates.map.with_index {|date,i|
+          action = recipe.actions[i]
+          create_action_event(
+            product: self,
+            date: date,
+            type: recipe.actions[i].type,
+            index: i,
+          )
+        }
+      end
+    end
+  end
+end

data/lib/toji/product/rice_event.rb

@@ -2,20 +2,17 @@ require 'toji/product/event'
 
 module Toji
   module Product
-    class RiceEvent < Event
+    module RiceEvent
+      include Event
+
       attr_reader :product
       attr_reader :rice_type
       attr_reader :index
       attr_reader :group_index
       attr_reader :weight
       
-      def initialize(product:, rice_type:, index:, group_index:, date:, weight:)
-        super(date, :rice)
-        @product = product
-        @rice_type = rice_type
-        @index = index
-        @group_index = group_index
-        @weight = weight
+      def type
+        :rice
       end
 
       def group_key

data/lib/toji/product/rice_event_group.rb

@@ -2,19 +2,18 @@ require 'toji/product/event'
 
 module Toji
   module Product
-    class RiceEventGroup < Event
+    module RiceEventGroup
+      include Event
+
       attr_reader :rice_type
       attr_reader :breakdown
 
-      def initialize(events)
-        o = events.first
-        super(o&.date, :rice)
-        @rice_type = o&.rice_type
-        @breakdown = events
+      def type
+        :rice
       end
 
       def weight
-        @breakdown.map(&:weight).sum
+        breakdown.map(&:weight).sum
       end
     end
   end

data/lib/toji/recipe.rb

@@ -1,14 +1,15 @@
 require 'toji/recipe/step'
+require 'toji/recipe/action'
 require 'toji/recipe/ab_expect'
 
 module Toji
   module Recipe
     attr_accessor :steps
+    attr_accessor :actions
     attr_accessor :has_moto
     attr_accessor :has_moromi
     attr_accessor :ab_coef
     attr_accessor :ab_expects
-    attr_accessor :squeeze_interval_days
 
     def scale(rice_total)
       rate = rice_total / steps.map(&:rice_total).sum
@@ -18,11 +19,11 @@ module Toji
 
       self.class.new.tap {|o|
         o.steps = new_steps
+        o.actions = actions.deep_dup
         o.has_moto = has_moto
         o.has_moromi = has_moromi
         o.ab_coef = ab_coef
         o.ab_expects = ab_expects.deep_dup
-        o.squeeze_interval_days = squeeze_interval_days
       }
     end
 
@@ -33,11 +34,11 @@ module Toji
 
       self.class.new.tap {|o|
         o.steps = new_steps
+        o.actions = actions.deep_dup
         o.has_moto = has_moto
         o.has_moromi = has_moromi
         o.ab_coef = ab_coef
         o.ab_expects = ab_expects.deep_dup
-        o.squeeze_interval_days = squeeze_interval_days
       }
     end
 

data/lib/toji/recipe/action.rb

@@ -0,0 +1,8 @@
+module Toji
+  module Recipe
+    module Action
+      attr_accessor :type
+      attr_accessor :interval_days
+    end
+  end
+end

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.9.0"
+  VERSION = "2.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-06 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -160,11 +160,14 @@ files:
 - lib/toji/ingredient/rice/expected_steamable.rb
 - lib/toji/ingredient/rice_rate.rb
 - lib/toji/product.rb
+- lib/toji/product/action_event.rb
 - lib/toji/product/event.rb
+- lib/toji/product/event_factory.rb
 - lib/toji/product/rice_event.rb
 - lib/toji/product/rice_event_group.rb
 - lib/toji/recipe.rb
 - lib/toji/recipe/ab_expect.rb
+- lib/toji/recipe/action.rb
 - lib/toji/recipe/step.rb
 - lib/toji/version.rb
 - toji.gemspec
@@ -190,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Management tools for brewing japanese sake.