toji 1.6.7 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e794a27e9bb5b5d342fe42b1e81c489417c8bcc4011fadaf541b7ed87634e2b0
-  data.tar.gz: 477371e1a2dc89d0d48416078a7b90da89010b7850bf544bc22c02d5d455aea6
+  metadata.gz: 8cb7b9d1041efe57106054ed9e49f2d521550ab9f81a3de9be8433ff7f672926
+  data.tar.gz: 77297b7cba2845e1e470e37ddbb70db62cd71c8fc0afd5505e152249fe98d029
 SHA512:
-  metadata.gz: 48cb8b530918ea6de1aa9ca32de2a47276390e7d69777f1eb68758df2ff15ea1a1ddde11d29c69b93a29bf4ce735c80bb59c70344c2ab8923e8266c5f287d38c
-  data.tar.gz: 1d04e4faef757aee2518981f5518062693ebe2c140b64f69577faf143dcfb12b2c113e1fc40e406af1d7b79bb588489c09ef1b0d9e17ce1310ac3ea0e0d1f577
+  metadata.gz: d5f87b0a0fb8d9ca5bc066c8790cee02d0f12bb12fd10b9ca2ca57f87b8749e2c4650a718ce244caccbd297b0f3ea4b81436db17ab83454032e6149afa7548f5
+  data.tar.gz: f877c7e824aa82285bcc93de1e7b9c88bef392c505fb6ab49ba4435b38329946298420ead7a207fdfb938fa4d7a9d438ec852d52f202895208997b039eed4520

data/lib/toji/schedule/product.rb

@@ -44,6 +44,26 @@ module Toji
         events
       end
 
+      def events_group
+        events.group_by{|event|
+          event.group_key
+        }.map {|group_key,events|
+          breakdown = events.map {|event|
+            {index: event.index, weight: event.weight}
+          }
+          if 1<breakdown.length
+            breakdown = breakdown.select{|event| 0<event[:weight]}
+          end
+
+          {
+            date: events.first.date,
+            type: events.first.type,
+            weight: events.map(&:weight).sum,
+            breakdown: breakdown,
+          }
+        }
+      end
+
       def to_h
         {
           id: @id,
@@ -53,6 +73,7 @@ module Toji
           koji_dates: @koji_dates,
           rice_dates: @rice_dates,
           events: events.map(&:to_h),
+          events_group: events_group,
           color: @color,
         }
       end

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "1.6.7"
+  VERSION = "1.6.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-09 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Management tools for brewing japanese sake.