toji 2.18.0 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b23be7a53efdbae7c439914868bcb41c222c062019fecde2e5471cb0e9051e48
-  data.tar.gz: 8c9a20caf415f8c6a67d21cb9d52129352fcca1a0899e54e8070d1f8fe0ec54d
+  metadata.gz: 88279093d88d3203f07d8279fe7efdafaa9d5e27842dafb1b9d5d49bf1e97256
+  data.tar.gz: 5c92d934a4ef3ab0f361307ae4453af27943cc19beb4ee4dde506cdce9c37d2e
 SHA512:
-  metadata.gz: d185b9e06e1f4498e21f57cb0e95f93a4be19b6f35230f1673a7c75ffa145948b405df1702f02b64cddff8c5a0a62d4488f536fd06413c9e3be75912d238d858
-  data.tar.gz: 67b56cda1946dd6619707f3c899fe20396b50394b5869c2110b282f2c0c61691d37e78b2d4d4b0e9f8b213317fccf29d82d4b234c9a45ca28025433ff16fdc7f
+  metadata.gz: 3ca63ae60e1627d2b7ac8a78adab6170eaa32cf328911c8cf97593ac62dd2cc9d90b098bf1514b755bdc8a4dffdab3c9e21e0c8a669de0d5a77656561a00c1bf
+  data.tar.gz: dc0a67b638aa444a65cc45a414653e7344cc3082a32f10bdaafaabe007161b15a3987634c2886ccd7cd0f99e7c71b7c55a86ae3423724f6a0aca2147a12e6228

data/example/example_core.rb

@@ -24,26 +24,26 @@ module Example
       @color = color
     end
 
-    def create_koji_schedule(date:, step_indexes:, kojis:)
+    def create_koji_schedule(date:, step_weights:, kojis:)
       expect = kojis.first.dup
       expect.weight = kojis.map(&:weight).sum
 
       KojiSchedule.new(
         product: self,
         date: date,
-        step_indexes: step_indexes,
+        step_weights: step_weights,
         expect: expect,
       )
     end
 
-    def create_kake_schedule(date:, step_indexes:, kakes:)
+    def create_kake_schedule(date:, step_weights:, kakes:)
       expect = kakes.first.dup
       expect.weight = kakes.map(&:weight).sum
 
       KakeSchedule.new(
         product: self,
         date: date,
-        step_indexes: step_indexes,
+        step_weights: step_weights,
         expect: expect,
       )
     end
@@ -940,13 +940,13 @@ module Example
     attr_reader :product
     attr_reader :date
 
-    attr_reader :step_indexes
+    attr_reader :step_weights
     attr_reader :expect
 
-    def initialize(product:, date:, step_indexes:, expect:)
+    def initialize(product:, date:, step_weights:, expect:)
       @product = product
       @date = date
-      @step_indexes = step_indexes
+      @step_weights = step_weights
       @expect = expect
     end
   end
@@ -957,13 +957,13 @@ module Example
     attr_reader :product
     attr_reader :date
 
-    attr_reader :step_indexes
+    attr_reader :step_weights
     attr_reader :expect
 
-    def initialize(product:, date:, step_indexes:, expect:)
+    def initialize(product:, date:, step_weights:, expect:)
       @product = product
       @date = date
-      @step_indexes = step_indexes
+      @step_weights = step_weights
       @expect = expect
     end
   end

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[:index]}.max + 1
-      kake_len = kake_schedules.map{|schedule| schedule.step_indexes.first[:index]}.max + 1
+      koji_len = koji_schedules.map{|schedule| schedule.step_weights.first[:index]}.max + 1
+      kake_len = kake_schedules.map{|schedule| schedule.step_weights.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]
+          index = schedule.step_weights.first[:index]
           @kojis[index] ||= DateColumn.new
           @kojis[index] << schedule
         when :kake
-          index = schedule.step_indexes.first[:index]
+          index = schedule.step_weights.first[:index]
           @kakes[index] ||= DateColumn.new
           @kakes[index] << schedule
         end

data/lib/toji/product/schedule_factory.rb

@@ -2,11 +2,11 @@ module Toji
   module Product
     module ScheduleFactory
 
-      def create_koji_schedule(date:, step_indexes:, kojis:)
+      def create_koji_schedule(date:, step_weights:, kojis:)
         raise Error, "implement required: create_koji_schedule"
       end
 
-      def create_kake_schedule(date:, step_indexes:, kakes:)
+      def create_kake_schedule(date:, step_weights:, kakes:)
         raise Error, "implement required: create_kake_schedule"
       end
 
@@ -18,9 +18,10 @@ module Toji
         recipe.steps.inject([]) {|result, step|
           step.kojis&.each {|koji|
             result << {
-              step_index: {
+              step_weight: {
                 index: step.index,
                 subindex: step.subindex,
+                weight: koji.weight,
               },
               date: base_date.next_day(koji.interval_days),
               koji: koji,
@@ -34,7 +35,7 @@ module Toji
         }.map {|(date, _group_key), schedules|
           create_koji_schedule(
             date: date,
-            step_indexes: schedules.map {|schedule| schedule[:step_index]}.sort_by {|x| [x[:index], x[:subindex]]},
+            step_weights: schedules.map {|schedule| schedule[:step_weight]}.sort_by {|x| [x[:index], x[:subindex]]},
             kojis: schedules.map{|schedule| schedule[:koji]},
           )
         }
@@ -44,9 +45,10 @@ module Toji
         recipe.steps.inject([]) {|result, step|
           step.kakes&.each {|kake|
             result << {
-              step_index: {
+              step_weight: {
                 index: step.index,
                 subindex: step.subindex,
+                weight: kake.weight,
               },
               date: base_date.next_day(kake.interval_days),
               kake: kake,
@@ -56,11 +58,11 @@ module Toji
         }.select {|schedule|
           0<schedule[:kake]&.weight.to_f
         }.group_by {|schedule|
-          [schedule[:date], schedule[:kake].group_key, schedule[:step_index]]
-        }.map {|(date, _group_key, _step_index), schedules|
+          [schedule[:date], schedule[:kake].group_key, schedule[:step_weight]]
+        }.map {|(date, _group_key, _step_weight), schedules|
           create_kake_schedule(
             date: date,
-            step_indexes: schedules.map {|schedule| schedule[:step_index]}.sort_by {|x| [x[:index], x[:subindex]]},
+            step_weights: schedules.map {|schedule| schedule[:step_weight]}.sort_by {|x| [x[:index], x[:subindex]]},
             kakes: schedules.map{|schedule| schedule[:kake]},
           )
         }

data/lib/toji/recipe.rb

@@ -54,7 +54,7 @@ module Toji
     # 酒母歩合の累計
     def cumulative_moto_ratios
       rice_total = steps.map(&:rice_total)
-      moto = rice_total.first
+      moto = steps.select(&:moto?).map(&:rice_total).sum.to_f
 
       rice_total.map.with_index {|x,i|
         moto / rice_total[0..i].inject(&:+)
@@ -80,8 +80,10 @@ module Toji
     #
     # 出典: 酒造教本 P95
     def rice_ratios
+      moto = steps.select(&:moto?).map(&:rice_total).sum.to_f
+
       steps.map {|step|
-        step.rice_total / steps.first.rice_total
+        step.rice_total / moto
       }
     end
 

data/lib/toji/recipe/step.rb

@@ -17,6 +17,10 @@ module Toji
       # @dynamic yeasts
       # @dynamic yeasts=
 
+      def moto?
+        index==0
+      end
+
       # 麹米
       def koji_total
         (kojis || []).map(&:weight).map(&:to_f).sum.to_f

data/lib/toji/schedule/rice_schedule.rb

@@ -4,7 +4,7 @@ module Toji
       include Base
 
       # @dynamic rice_type
-      # @dynamic step_indexes
+      # @dynamic step_weights
 
       # @dynamic expect
 

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.18.0"
+  VERSION = "2.19.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.19.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-27 00:00:00.000000000 Z
+date: 2021-01-02 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.2.0.rc.1
 signing_key:
 specification_version: 4
 summary: Management tools for brewing japanese sake.