toji 2.20.0 → 2.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a6e1a509c1fdf68216659098e2084cf5754844178417aa8ecb0fb803e2a1b19
-  data.tar.gz: d51550d76a45b2e21d9530608820d76a5805638445b7a07f9350055874a58df5
+  metadata.gz: b77f334631cb7f784010f180c140f1d62e602b2bd38f3df985f253b0882e3002
+  data.tar.gz: b60120e7f1dd12480b51900e1e737c83fac9d0d8fdc94f844b5e3a1b0a8d113f
 SHA512:
-  metadata.gz: 010b97ab4c669bbe741ae0c10248967fff8f5c7b484171397f491bf91d7e073e17e6e06e074d69ff188039dd41948daae0234f9592163f4bd06c35ccd0689538
-  data.tar.gz: 3f8d0b3306a50784df5c8eda013bcf8cd049cd5592f8c38285fa20a5e1662ee511defb82ca37befb127fdc41553483d9db653a6b256733e9cdb1acd18fc72177
+  metadata.gz: 2290fd226b0b15ba3dd1eb9559dcf0ece2b53098eda7ce7f7615d2b2d5d33cbeb4dc74197be54a4b08864ecb0ff8ffed0257626f327ce273c35e4a47d447afbf
+  data.tar.gz: d1b7a139f56511611b5936dea84d3a4a90965cb9c736947dfa74003c85f4e2bd663960320bded0e08c30d4b49d386bf54e53f4286b48fcd4e67bdac1c5ccd6e3

data/example/example_core.rb

@@ -24,25 +24,27 @@ module Example
       @color = color
     end
 
-    def create_koji_schedule(date:, step_weights:, kojis:)
+    def create_koji_schedule(date:, group_key:, step_weights:, kojis:)
       expect = kojis.first.dup
       expect.weight = kojis.map(&:weight).sum
 
       KojiSchedule.new(
         product: self,
         date: date,
+        group_key: group_key,
         step_weights: step_weights,
         expect: expect,
       )
     end
 
-    def create_kake_schedule(date:, step_weights:, kakes:)
+    def create_kake_schedule(date:, group_key:, step_weights:, kakes:)
       expect = kakes.first.dup
       expect.weight = kakes.map(&:weight).sum
 
       KakeSchedule.new(
         product: self,
         date: date,
+        group_key: group_key,
         step_weights: step_weights,
         expect: expect,
       )
@@ -941,13 +943,15 @@ module Example
 
     attr_reader :product
     attr_reader :date
+    attr_reader :group_key
 
     attr_reader :step_weights
     attr_reader :expect
 
-    def initialize(product:, date:, step_weights:, expect:)
+    def initialize(product:, date:, group_key:, step_weights:, expect:)
       @product = product
       @date = date
+      @group_key = group_key
       @step_weights = step_weights
       @expect = expect
     end
@@ -958,13 +962,15 @@ module Example
 
     attr_reader :product
     attr_reader :date
+    attr_reader :group_key
 
     attr_reader :step_weights
     attr_reader :expect
 
-    def initialize(product:, date:, step_weights:, expect:)
+    def initialize(product:, date:, group_key:, step_weights:, expect:)
       @product = product
       @date = date
+      @group_key = group_key
       @step_weights = step_weights
       @expect = expect
     end

data/lib/toji/ingredient/alcohol.rb

@@ -6,7 +6,7 @@ module Toji
       # 醸造用アルコール
       # @dynamic weight
 
-      def group_key
+      def ingredient_key
         [].join(":")
       end
     end

data/lib/toji/ingredient/base.rb

@@ -6,7 +6,7 @@ module Toji
       # @dynamic weight=
 
       # グループ識別子
-      # @dynamic group_key
+      # @dynamic ingredient_key
     end
   end
 end

data/lib/toji/ingredient/kake.rb

@@ -3,8 +3,12 @@ module Toji
     module Kake
       include Rice
 
-      def group_key
-        [brand, polishing_ratio, made_in, year, soaking_ratio, steaming_ratio, cooling_ratio, process_group].join(":")
+      def ingredient_key
+        [brand, polishing_ratio, made_in, year, soaking_ratio, steaming_ratio, cooling_ratio].join(":")
+      end
+
+      def default_process_group
+        self.hash
       end
     end
   end

data/lib/toji/ingredient/koji.rb

@@ -18,11 +18,15 @@ module Toji
       end
 
       # Scheduleへのグループ識別子
-      def group_key
-        keys1 = [brand, polishing_ratio, made_in, year, soaking_ratio, steaming_ratio, cooling_ratio, dekoji_ratio, process_group]
-        keys2 = tanekojis&.map(&:group_key)&.sort || []
+      def ingredient_key
+        keys1 = [brand, polishing_ratio, made_in, year, soaking_ratio, steaming_ratio, cooling_ratio, dekoji_ratio]
+        keys2 = tanekojis&.map(&:ingredient_key)&.sort || []
         (keys1 + keys2).join(":")
       end
+
+      def default_process_group
+        ""
+      end
     end
   end
 end

data/lib/toji/ingredient/lactic_acid.rb

@@ -6,7 +6,7 @@ module Toji
       # 乳酸
       # @dynamic weight
 
-      def group_key
+      def ingredient_key
         [].join(":")
       end
     end

data/lib/toji/ingredient/rice.rb

@@ -55,6 +55,14 @@ module Toji
 
       # グループ識別子
       # @dynamic process_group
+      # @dyanmic default_process_group
+
+      def group_key
+        [
+          ingredient_key,
+          process_group.presence || default_process_group,
+        ].join(":")
+      end
     end
   end
 end

data/lib/toji/ingredient/tanekoji.rb

@@ -21,7 +21,7 @@ module Toji
         koji.weight * ratio
       end
 
-      def group_key
+      def ingredient_key
         [brand, ratio].join(":")
       end
     end

data/lib/toji/ingredient/water.rb

@@ -10,7 +10,7 @@ module Toji
       # @dynamic calcium_hardness
       # @dynamic magnesium_hardness
 
-      def group_key
+      def ingredient_key
         [calcium_hardness, magnesium_hardness].join(":")
       end
     end

data/lib/toji/ingredient/yeast.rb

@@ -13,7 +13,7 @@ module Toji
       # 酵母名、協会酵母番号
       # @dynamic brand
 
-      def group_key
+      def ingredient_key
         [brand, unit].join(":")
       end
     end

data/lib/toji/product/schedule_factory.rb

@@ -2,11 +2,14 @@ module Toji
   module Product
     module ScheduleFactory
 
-      def create_koji_schedule(date:, step_weights:, kojis:)
+      # @dynamic recipe
+      # @dynamic base_date
+
+      def create_koji_schedule(date:, group_key:, step_weights:, kojis:)
         raise Error, "implement required: create_koji_schedule"
       end
 
-      def create_kake_schedule(date:, step_weights:, kakes:)
+      def create_kake_schedule(date:, group_key:, step_weights:, kakes:)
         raise Error, "implement required: create_kake_schedule"
       end
 
@@ -32,9 +35,10 @@ module Toji
           0<schedule[:koji]&.weight.to_f
         }.group_by {|schedule|
           [schedule[:date], schedule[:koji].group_key]
-        }.map {|(date, _group_key), schedules|
+        }.map {|(date, group_key), schedules|
           create_koji_schedule(
             date: date,
+            group_key: group_key,
             step_weights: schedules.map {|schedule| schedule[:step_weight]}.sort_by {|x| [x[:index], x[:subindex]]},
             kojis: schedules.map{|schedule| schedule[:koji]},
           )
@@ -58,10 +62,11 @@ module Toji
         }.select {|schedule|
           0<schedule[:kake]&.weight.to_f
         }.group_by {|schedule|
-          [schedule[:date], schedule[:kake].group_key, schedule[:step_weight]]
-        }.map {|(date, _group_key, _step_weight), schedules|
+          [schedule[:date], schedule[:kake].group_key]
+        }.map {|(date, group_key), schedules|
           create_kake_schedule(
             date: date,
+            group_key: group_key,
             step_weights: schedules.map {|schedule| schedule[:step_weight]}.sort_by {|x| [x[:index], x[:subindex]]},
             kakes: schedules.map{|schedule| schedule[:kake]},
           )

data/lib/toji/utils.rb

@@ -20,20 +20,20 @@ module Toji
       result = {}
 
       ingredients1&.each {|src|
-        dst = result[src.group_key]
+        dst = result[src.ingredient_key]
         if dst
           dst.weight = dst.weight.to_f + src.weight.to_f
         else
-          result[src.group_key] = src
+          result[src.ingredient_key] = src
         end
       }
 
       ingredients2&.each {|src|
-        dst = result[src.group_key]
+        dst = result[src.ingredient_key]
         if dst
           dst.weight = dst.weight.to_f + src.weight.to_f
         else
-          result[src.group_key] = src.dup
+          result[src.ingredient_key] = src.dup
         end
       }
 

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.20.0"
+  VERSION = "2.21.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.20.0
+  version: 2.21.0
 platform: ruby
 authors:
 - Yoshida Tetsuya