toji 1.6.6 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a988802371162370669a50350ab7878a88e76366f2d9f32401dcb3a06fadf4e
-  data.tar.gz: b8300b0795e0eee8055765301a165a191fd334736ec0d19f76278dc4cb1262b4
+  metadata.gz: e794a27e9bb5b5d342fe42b1e81c489417c8bcc4011fadaf541b7ed87634e2b0
+  data.tar.gz: 477371e1a2dc89d0d48416078a7b90da89010b7850bf544bc22c02d5d455aea6
 SHA512:
-  metadata.gz: 312348c96281f8576e078446c76044855d45c02ad7165691d817c0958f83539e9c8d03f0bf2d1a7eb882e890e0e575ae041370e0c8ce594546bc308016b18640
-  data.tar.gz: 85a29ffef5ef2055102890a74509e38ffd090a5ea5336adeb3710c74f69ad4ffaeaa8271f7c88b194239d279087d72ad52b321bccbeac9ca6366ddf71bee4004
+  metadata.gz: 48cb8b530918ea6de1aa9ca32de2a47276390e7d69777f1eb68758df2ff15ea1a1ddde11d29c69b93a29bf4ce735c80bb59c70344c2ab8923e8266c5f287d38c
+  data.tar.gz: 1d04e4faef757aee2518981f5518062693ebe2c140b64f69577faf143dcfb12b2c113e1fc40e406af1d7b79bb588489c09ef1b0d9e17ce1310ac3ea0e0d1f577

data/lib/toji/schedule/product.rb

@@ -50,6 +50,9 @@ module Toji
           name: @name,
           description: @description,
           recipe: @recipe.table_data,
+          koji_dates: @koji_dates,
+          rice_dates: @rice_dates,
+          events: events.map(&:to_h),
           color: @color,
         }
       end

data/lib/toji/schedule/product_event.rb

@@ -30,7 +30,7 @@ module Toji
 
       def group_key
         a = []
-        a << product.name
+        a << (product.id || product.name)
         a << type
         a << group_index
         a.map(&:to_s).join(":")
@@ -39,6 +39,16 @@ module Toji
       def weight
         @product.recipe.steps[@index].send(@type).raw
       end
+
+      def to_h
+        {
+          date: date,
+          type: type,
+          index: index,
+          group_index: group_index,
+          weight: weight,
+        }
+      end
     end
   end
 end

data/lib/toji/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport