toji 2.28.0 → 2.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cda96af7ffc4f7a23008d79c90d52884c71e67d8a3d3683269b1874ded680f7
-  data.tar.gz: 9eb861ccf09457e313671029474dffb284f5495373fe747f1a414805fce9b3bf
+  metadata.gz: a87950a671a099c992cc3b8a8c94038f49c9f533a78cabe066562b1f15a69ff2
+  data.tar.gz: e3ff465a5367b75e13110a09953232249380df0c378b4ca08b5bce0e587ab028
 SHA512:
-  metadata.gz: aaf3b8f3a3300f8b12027f8e34168fa25d5ad3e7ae3a3ac5ad8563be7a8eba2040b627e7ff6790213ecb61fe45a3a4aca48c0503246327d9b6458135c62b679e
-  data.tar.gz: 3396b4ead3b1532cdabbc7654bd1493b42d674444ff5094e0bf652e0f632070d56cd6100c3acd888eb063831ab33da72b8b0ab7988fb4f71a8c7a59ae14e8bd6
+  metadata.gz: 5cd4227adc3c79f4d6d8e85305a84a5bd5220fb92edabb154b6f5294102e307d32088ab7034fcfc688e21af23804706d36be86e8dc2cf5abdde870e96f132a6b
+  data.tar.gz: 1450e1cf798268cc889e15d3fc4a81b6bbe79ff263c7cb6f6e30569e03ce2618686bff5ed47722291b98b6712d200e5366bd0d40e2c17fbfc63e9339d42358bb

data/example/example_core.rb

@@ -10,7 +10,7 @@ module Example
 
     attr_reader :serial_num
     attr_reader :recipe
-    attr_reader :base_date
+    attr_accessor :base_date
 
     attr_reader :description
     attr_reader :color
@@ -94,6 +94,7 @@ module Example
 
     attr_reader :index
     attr_reader :subindex
+    attr_accessor :interval_days
     attr_accessor :kojis
     attr_accessor :kakes
     attr_accessor :waters
@@ -101,9 +102,10 @@ module Example
     attr_accessor :alcohols
     attr_accessor :yeasts
 
-    def initialize(index:, subindex:, kojis: [], kakes: [], waters: [], lactic_acids: [], alcohols: [], yeasts: [])
+    def initialize(index:, subindex:, interval_days:, kojis: [], kakes: [], waters: [], lactic_acids: [], alcohols: [], yeasts: [])
       @index = index
       @subindex = subindex
+      @interval_days = interval_days
       @kojis = kojis
       @kakes = kakes
       @waters = waters
@@ -113,6 +115,9 @@ module Example
     end
 
     def initialize_copy(obj)
+      @index = obj.index
+      @subindex = obj.subindex
+      @interval_days = obj.interval_days
       @kojis = obj.kojis.deep_dup
       @kakes = obj.kakes.deep_dup
       @waters = obj.waters.deep_dup
@@ -136,7 +141,7 @@ module Example
     attr_reader :cooling_ratio
     attr_reader :tanekojis
     attr_reader :dekoji_ratio
-    attr_reader :interval_days
+    attr_accessor :interval_days
     attr_reader :process_group
 
     def initialize(weight:, brand:, polishing_ratio:, made_in:, farmer:, rice_year:, soaking_ratio:, steaming_ratio:, cooling_ratio:, tanekojis:, dekoji_ratio:, interval_days:)
@@ -209,7 +214,7 @@ module Example
     attr_reader :soaking_ratio
     attr_reader :steaming_ratio
     attr_reader :cooling_ratio
-    attr_reader :interval_days
+    attr_accessor :interval_days
     attr_reader :process_group
 
     def initialize(weight:, brand:, polishing_ratio:, made_in:, farmer:, rice_year:, soaking_ratio:, steaming_ratio:, cooling_ratio:, interval_days:)
@@ -275,7 +280,7 @@ module Example
     include Toji::Recipe::Action
 
     attr_reader :type
-    attr_reader :interval_days
+    attr_accessor :interval_days
 
     def initialize(type:, interval_days:)
       @type = type
@@ -332,6 +337,7 @@ module Example
           Step.new(
             index: 0,
             subindex: 0,
+            interval_days: 0,
             kojis: [
               Koji.new(
                 weight: 20,
@@ -386,6 +392,7 @@ module Example
           Step.new(
             index: 1,
             subindex: 0,
+            interval_days: 20,
             kojis: [
               Koji.new(
                 weight: 40,
@@ -430,6 +437,7 @@ module Example
           Step.new(
             index: 2,
             subindex: 0,
+            interval_days: 22,
             kojis: [
               Koji.new(
                 weight: 60,
@@ -474,6 +482,7 @@ module Example
           Step.new(
             index: 3,
             subindex: 0,
+            interval_days: 23,
             kojis: [
               Koji.new(
                 weight: 80,
@@ -518,6 +527,7 @@ module Example
           Step.new(
             index: 4,
             subindex: 0,
+            interval_days: 48,
             kakes: [
               Kake.new(
                 weight: 80,

data/lib/toji/ingredient/rice.rb

@@ -53,6 +53,7 @@ module Toji
 
       # Product.base_dateからの日数差
       # @dynamic interval_days
+      # @dynamic interval_days=
 
       # グループ識別子
       # @dynamic process_group

data/lib/toji/product.rb

@@ -5,11 +5,44 @@ module Toji
     # @dynamic serial_num
     # @dynamic recipe
     # @dynamic base_date
+    # @dynamic base_date=
 
     # @dynamic koji_schedules
     # @dynamic kake_schedules
     # @dynamic action_schedules
     # @dynamic rice_schedules
     # @dynamic schedules
+
+    def compact!
+      recipe&.compact!
+
+      min_interval_days = [
+        recipe&.steps&.map(&:interval_days)&.min,
+        recipe&.steps&.flat_map{|step| step.rices.to_a}&.map(&:interval_days)&.min,
+        recipe&.actions&.map(&:interval_days)&.min,
+      ].compact.min
+
+      if min_interval_days && min_interval_days!=0
+        recipe&.steps&.each {|step|
+          step.interval_days -= min_interval_days
+          step.rices {|rice|
+            rice.interval_days -= min_interval_days
+          }
+        }
+        recipe&.actions&.each {|action|
+          action.interval_days -= min_interval_days
+        }
+        self.base_date = base_date.since(min_interval_days.days)
+      end
+
+      self
+    end
+
+    def compact
+      Utils.check_dup(self)
+
+      dst = self.dup
+      dst.compact!
+    end
   end
 end

data/lib/toji/recipe/action.rb

@@ -3,6 +3,7 @@ module Toji
     module Action
       # @dynamic type
       # @dynamic interval_days
+      # @dynamic interval_days=
     end
   end
 end

data/lib/toji/recipe/step.rb

@@ -3,6 +3,8 @@ module Toji
     module Step
       # @dynamic index
       # @dynamic subindex
+      # @dynamic interval_days
+      # @dynamic interval_days=
 
       # @dynamic kojis
       # @dynamic kojis=

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.28.0"
+  VERSION = "2.29.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.28.0
+  version: 2.29.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport