toji 2.14.0 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37499051191a04bbfe3557557db95602364782e93cabca5a8c66df22b0f23a2a
-  data.tar.gz: eb22b32536b32ed7d8441ad6586cc7b1d46fe617931272f88930d2b4df511728
+  metadata.gz: 992db213aef7df46ad7fb1daf6bdaacf6ef74aa753a5ca9bd3538d808ff55335
+  data.tar.gz: ea97a83429363cbe1437433a3abacb51132d2107100ff0e920c2f577970ad548
 SHA512:
-  metadata.gz: dd61d83746fa569a42d10cd46450ae7b9b30264f275c87d3795d8749f93814c18105d49e88d5683daa76bf627d89068645c89d7432e8a2dfb3bfe4af3cb7dc62
-  data.tar.gz: 6563f31a5eed5ec04150b75d5248e0c3b936b1cfdfb0b68f89732b032980f67a1518663c450a7bef3c44468ee5a6069cf4a4b0de8ca92633d5053fe28da690bc
+  metadata.gz: 659b02383e2cd9b5014447a5c05227179949b96cb8d899a9828bf486bb42a34658507e6ea12b0f6e1ae150b313837add6f6cf7e558847ddbcc8a1e077c082223
+  data.tar.gz: 7927be3a32db507af849963f3f78f90c6f924a1b72df3c9d9395a61285074f45cb50f5f182423068354c1758739b47594778ce71b59d05f92b7f56a74cd1309b

data/example/example_core.rb

@@ -86,8 +86,9 @@ module Example
   class Step
     include Toji::Recipe::Step
 
-    def initialize(index:, kojis: [], kakes: [], waters: [], lactic_acids: [], alcohols: [], yeasts: [])
+    def initialize(index:, subindex:, kojis: [], kakes: [], waters: [], lactic_acids: [], alcohols: [], yeasts: [])
       @index = index
+      @subindex = subindex
       @kojis = kojis
       @kakes = kakes
       @waters = waters
@@ -246,6 +247,7 @@ module Example
         [
           Step.new(
             index: 0,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 20,
@@ -297,6 +299,7 @@ module Example
           ),
           Step.new(
             index: 1,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 40,
@@ -338,6 +341,7 @@ module Example
           ),
           Step.new(
             index: 2,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 60,
@@ -379,6 +383,7 @@ module Example
           ),
           Step.new(
             index: 3,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 80,
@@ -420,6 +425,7 @@ module Example
           ),
           Step.new(
             index: 4,
+            subindex: 0,
             kakes: [
               Kake.new(
                 weight: 80,
@@ -447,6 +453,7 @@ module Example
         [
           Step.new(
             index: 0,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 47,
@@ -498,6 +505,7 @@ module Example
           ),
           Step.new(
             index: 1,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 99,
@@ -539,6 +547,7 @@ module Example
           ),
           Step.new(
             index: 2,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 143,
@@ -580,6 +589,7 @@ module Example
           ),
           Step.new(
             index: 3,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 165,
@@ -621,6 +631,7 @@ module Example
           ),
           Step.new(
             index: 4,
+            subindex: 0,
             alcohols: [
               Alcohol.new(
                 weight: 900,
@@ -635,6 +646,7 @@ module Example
         [
           Step.new(
             index: 0,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 70,
@@ -686,6 +698,7 @@ module Example
           ),
           Step.new(
             index: 1,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 0,
@@ -727,6 +740,7 @@ module Example
           ),
           Step.new(
             index: 1,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 100,
@@ -768,6 +782,7 @@ module Example
           ),
           Step.new(
             index: 2,
+            subindex: 0,
             kojis: [
               Koji.new(
                 weight: 110,
@@ -809,6 +824,7 @@ module Example
           ),
           Step.new(
             index: 3,
+            subindex: 0,
             waters: [
               Water.new(
                 weight: 255,

data/lib/toji/calendar.rb

@@ -32,8 +32,8 @@ module Toji
       kake_schedules = @products.map{|product| product.kake_schedules}.flatten
       schedules = koji_schedules + kake_schedules
 
-      koji_len = koji_schedules.map{|schedule| schedule.step_indexes.first}.max + 1
-      kake_len = kake_schedules.map{|schedule| schedule.step_indexes.first}.max + 1
+      koji_len = koji_schedules.map{|schedule| schedule.step_indexes.first[:index]}.max + 1
+      kake_len = kake_schedules.map{|schedule| schedule.step_indexes.first[:index]}.max + 1
       min_date = schedules.map(&:date).min
       max_date = schedules.map(&:date).max
 

data/lib/toji/calendar/date_row.rb

@@ -14,11 +14,11 @@ module Toji
       def <<(schedule)
         case schedule.rice_type
         when :koji
-          index = schedule.step_indexes.first
+          index = schedule.step_indexes.first[:index]
           @kojis[index] ||= DateColumn.new
           @kojis[index] << schedule
         when :kake
-          index = schedule.step_indexes.first
+          index = schedule.step_indexes.first[:index]
           @kakes[index] ||= DateColumn.new
           @kakes[index] << schedule
         end

data/lib/toji/product/schedule_factory.rb

@@ -18,7 +18,10 @@ module Toji
         recipe.steps.inject([]) {|result, step|
           step.kojis&.each {|koji|
             result << {
-              step_index: step.index,
+              step_index: {
+                index: step.index,
+                subindex: step.subindex,
+              },
               date: base_date.next_day(koji.interval_days),
               koji: koji,
             }
@@ -31,7 +34,7 @@ module Toji
         }.map {|(date, group_key), schedules|
           create_koji_schedule(
             date: date,
-            step_indexes: schedules.map {|schedule| schedule[:step_index]}.sort,
+            step_indexes: schedules.map {|schedule| schedule[:step_index]}.sort_by {|x| [x[:index], x[:subindex]]},
             kojis: schedules.map{|schedule| schedule[:koji]},
           )
         }
@@ -41,7 +44,10 @@ module Toji
         recipe.steps.inject([]) {|result, step|
           step.kakes&.each {|kake|
             result << {
-              step_index: step.index,
+              step_index: {
+                index: step.index,
+                subindex: step.subindex,
+              },
               date: base_date.next_day(kake.interval_days),
               kake: kake,
             }
@@ -50,11 +56,11 @@ module Toji
         }.select {|schedule|
           0<schedule[:kake]&.weight.to_f
         }.group_by {|schedule|
-          [schedule[:date], schedule[:kake].group_key]
-        }.map {|(date, group_key), schedules|
+          [schedule[:date], schedule[:kake].group_key, schedule[:step_index]]
+        }.map {|(date, group_key, step_index), schedules|
           create_kake_schedule(
             date: date,
-            step_indexes: schedules.map {|schedule| schedule[:step_index]}.sort,
+            step_indexes: schedules.map {|schedule| schedule[:step_index]}.sort_by {|x| [x[:index], x[:subindex]]},
             kakes: schedules.map{|schedule| schedule[:kake]},
           )
         }

data/lib/toji/recipe/step.rb

@@ -2,6 +2,7 @@ module Toji
   module Recipe
     module Step
       attr_reader :index
+      attr_reader :subindex
       attr_accessor :kojis
       attr_accessor :kakes
       attr_accessor :waters

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.14.0"
+  VERSION = "2.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Management tools for brewing japanese sake.