toji 1.6.6 → 1.6.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5a988802371162370669a50350ab7878a88e76366f2d9f32401dcb3a06fadf4e
4
- data.tar.gz: b8300b0795e0eee8055765301a165a191fd334736ec0d19f76278dc4cb1262b4
3
+ metadata.gz: e794a27e9bb5b5d342fe42b1e81c489417c8bcc4011fadaf541b7ed87634e2b0
4
+ data.tar.gz: 477371e1a2dc89d0d48416078a7b90da89010b7850bf544bc22c02d5d455aea6
5
5
  SHA512:
6
- metadata.gz: 312348c96281f8576e078446c76044855d45c02ad7165691d817c0958f83539e9c8d03f0bf2d1a7eb882e890e0e575ae041370e0c8ce594546bc308016b18640
7
- data.tar.gz: 85a29ffef5ef2055102890a74509e38ffd090a5ea5336adeb3710c74f69ad4ffaeaa8271f7c88b194239d279087d72ad52b321bccbeac9ca6366ddf71bee4004
6
+ metadata.gz: 48cb8b530918ea6de1aa9ca32de2a47276390e7d69777f1eb68758df2ff15ea1a1ddde11d29c69b93a29bf4ce735c80bb59c70344c2ab8923e8266c5f287d38c
7
+ data.tar.gz: 1d04e4faef757aee2518981f5518062693ebe2c140b64f69577faf143dcfb12b2c113e1fc40e406af1d7b79bb588489c09ef1b0d9e17ce1310ac3ea0e0d1f577
@@ -50,6 +50,9 @@ module Toji
50
50
  name: @name,
51
51
  description: @description,
52
52
  recipe: @recipe.table_data,
53
+ koji_dates: @koji_dates,
54
+ rice_dates: @rice_dates,
55
+ events: events.map(&:to_h),
53
56
  color: @color,
54
57
  }
55
58
  end
@@ -30,7 +30,7 @@ module Toji
30
30
 
31
31
  def group_key
32
32
  a = []
33
- a << product.name
33
+ a << (product.id || product.name)
34
34
  a << type
35
35
  a << group_index
36
36
  a.map(&:to_s).join(":")
@@ -39,6 +39,16 @@ module Toji
39
39
  def weight
40
40
  @product.recipe.steps[@index].send(@type).raw
41
41
  end
42
+
43
+ def to_h
44
+ {
45
+ date: date,
46
+ type: type,
47
+ index: index,
48
+ group_index: group_index,
49
+ weight: weight,
50
+ }
51
+ end
42
52
  end
43
53
  end
44
54
  end
data/lib/toji/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Toji
2
- VERSION = "1.6.6"
2
+ VERSION = "1.6.7"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: toji
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.6
4
+ version: 1.6.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yoshida Tetsuya
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-05-05 00:00:00.000000000 Z
11
+ date: 2020-05-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport