toji 2.22.0 → 2.23.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/example/example_core.rb +58 -30
  4. data/example/kake_ingredient.rb +2 -1
  5. data/example/koji_ingredient.rb +2 -1
  6. data/lib/toji/ingredient/kake.rb +1 -1
  7. data/lib/toji/ingredient/koji.rb +1 -1
  8. data/lib/toji/ingredient/rice.rb +2 -1
  9. data/lib/toji/version.rb +1 -1
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 494121b64259737e8f8e942f688db54c630a5ae468d9a5530ad5e98b91d99ddb
4
- data.tar.gz: 10585215b677950ecaebb9e4eccb7fa19fa0803e6e915c6d5d2dd2e1f0d1191d
3
+ metadata.gz: a51d6b6e91fd23768914d1cb2b30ce492bb606e9811b73b3e02aa3b8517a239c
4
+ data.tar.gz: 12bc91c43c77ccd3326bcb9438adb452fa7b00c5c2b23dcb5dc98e43e145ef71
5
5
  SHA512:
6
- metadata.gz: 3b6b8d00a2f0b5f4494c07ab5c9eefb496db64eb1096e323c7d2f232ad32279a74da24c646b48ea0057ab3ac3a9bb3ec9548b9b66a1b995b2f4317d8471e9a23
7
- data.tar.gz: 5dc4965df7dd65c8f3dafc41af8a884c557cb029875aa3694e9ff011402ac7614368c96aa9d55e592ae7fc0f52ba8a591152f414ad60dbd14d0d48de775868e8
6
+ metadata.gz: '038ee2caa6615141060ba5a32570aed5f12d2c6639dc071821252f710ce6fbcfed99e3ec930a47adf4ecf8f62ca264ea8852d815c173cd51868712197a50df46'
7
+ data.tar.gz: 05a780910af22d2d1de5cac1cd584ba7310d77964a0497117a8ad8c20ab06d16c4b321e76d4d0818baa044d9fa370a5346ddd44cf07e196ad25bd98ef91b3da1
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # Toji
2
2
 
3
- Management tools for brewing japanese sake.
3
+ Data models for brewing japanese sake.
4
4
 
5
5
  - 仕込み配合表の生成。
6
6
  - 仕込み日程表の生成。
data/example/example_core.rb CHANGED
@@ -129,7 +129,8 @@ module Example
129
129
  attr_reader :brand
130
130
  attr_reader :polishing_ratio
131
131
  attr_reader :made_in
132
- attr_reader :year
132
+ attr_reader :farmer
133
+ attr_reader :rice_year
133
134
  attr_reader :soaking_ratio
134
135
  attr_reader :steaming_ratio
135
136
  attr_reader :cooling_ratio
@@ -138,12 +139,13 @@ module Example
138
139
  attr_reader :interval_days
139
140
  attr_reader :process_group
140
141
 
141
- def initialize(weight:, brand:, polishing_ratio:, made_in:, year:, soaking_ratio:, steaming_ratio:, cooling_ratio:, tanekojis:, dekoji_ratio:, interval_days:)
142
+ def initialize(weight:, brand:, polishing_ratio:, made_in:, farmer:, rice_year:, soaking_ratio:, steaming_ratio:, cooling_ratio:, tanekojis:, dekoji_ratio:, interval_days:)
142
143
  @weight = weight
143
144
  @brand = brand
144
145
  @polishing_ratio = polishing_ratio
145
146
  @made_in = made_in
146
- @year = year
147
+ @farmer = farmer
148
+ @rice_year = rice_year
147
149
  @soaking_ratio = soaking_ratio
148
150
  @steaming_ratio = steaming_ratio
149
151
  @cooling_ratio = cooling_ratio
@@ -160,7 +162,8 @@ module Example
160
162
  @brand = obj.brand.dup
161
163
  @polishing_ratio = obj.polishing_ratio.dup
162
164
  @made_in = obj.made_in.dup
163
- @year = obj.year.dup
165
+ @farmer = obj.farmer.dup
166
+ @rice_year = obj.rice_year.dup
164
167
  @soaking_ratio = obj.soaking_ratio.dup
165
168
  @steaming_ratio = obj.steaming_ratio.dup
166
169
  @cooling_ratio = obj.cooling_ratio.dup
@@ -201,19 +204,21 @@ module Example
201
204
  attr_reader :brand
202
205
  attr_reader :polishing_ratio
203
206
  attr_reader :made_in
204
- attr_reader :year
207
+ attr_reader :farmer
208
+ attr_reader :rice_year
205
209
  attr_reader :soaking_ratio
206
210
  attr_reader :steaming_ratio
207
211
  attr_reader :cooling_ratio
208
212
  attr_reader :interval_days
209
213
  attr_reader :process_group
210
214
 
211
- def initialize(weight:, brand:, polishing_ratio:, made_in:, year:, soaking_ratio:, steaming_ratio:, cooling_ratio:, interval_days:)
215
+ def initialize(weight:, brand:, polishing_ratio:, made_in:, farmer:, rice_year:, soaking_ratio:, steaming_ratio:, cooling_ratio:, interval_days:)
212
216
  @weight = weight
213
217
  @brand = brand
214
218
  @polishing_ratio = polishing_ratio
215
219
  @made_in = made_in
216
- @year = year
220
+ @farmer = farmer
221
+ @rice_year = rice_year
217
222
  @soaking_ratio = soaking_ratio
218
223
  @steaming_ratio = steaming_ratio
219
224
  @cooling_ratio = cooling_ratio
@@ -333,7 +338,8 @@ module Example
333
338
  brand: :yamadanishiki,
334
339
  polishing_ratio: 0.55,
335
340
  made_in: :hyogo,
336
- year: 2020,
341
+ farmer: nil,
342
+ rice_year: 2020,
337
343
  soaking_ratio: 0.33,
338
344
  steaming_ratio: 0.41,
339
345
  cooling_ratio: 0.33,
@@ -353,7 +359,8 @@ module Example
353
359
  brand: :yamadanishiki,
354
360
  polishing_ratio: 0.55,
355
361
  made_in: :hyogo,
356
- year: 2020,
362
+ farmer: nil,
363
+ rice_year: 2020,
357
364
  soaking_ratio: 0.33,
358
365
  steaming_ratio: 0.41,
359
366
  cooling_ratio: 0.33,
@@ -385,7 +392,8 @@ module Example
385
392
  brand: :yamadanishiki,
386
393
  polishing_ratio: 0.55,
387
394
  made_in: :hyogo,
388
- year: 2020,
395
+ farmer: nil,
396
+ rice_year: 2020,
389
397
  soaking_ratio: 0.33,
390
398
  steaming_ratio: 0.41,
391
399
  cooling_ratio: 0.33,
@@ -405,7 +413,8 @@ module Example
405
413
  brand: :yamadanishiki,
406
414
  polishing_ratio: 0.55,
407
415
  made_in: :hyogo,
408
- year: 2020,
416
+ farmer: nil,
417
+ rice_year: 2020,
409
418
  soaking_ratio: 0.33,
410
419
  steaming_ratio: 0.41,
411
420
  cooling_ratio: 0.33,
@@ -427,7 +436,8 @@ module Example
427
436
  brand: :yamadanishiki,
428
437
  polishing_ratio: 0.55,
429
438
  made_in: :hyogo,
430
- year: 2020,
439
+ farmer: nil,
440
+ rice_year: 2020,
431
441
  soaking_ratio: 0.33,
432
442
  steaming_ratio: 0.41,
433
443
  cooling_ratio: 0.33,
@@ -447,7 +457,8 @@ module Example
447
457
  brand: :yamadanishiki,
448
458
  polishing_ratio: 0.55,
449
459
  made_in: :hyogo,
450
- year: 2020,
460
+ farmer: nil,
461
+ rice_year: 2020,
451
462
  soaking_ratio: 0.33,
452
463
  steaming_ratio: 0.41,
453
464
  cooling_ratio: 0.33,
@@ -469,7 +480,8 @@ module Example
469
480
  brand: :yamadanishiki,
470
481
  polishing_ratio: 0.55,
471
482
  made_in: :hyogo,
472
- year: 2020,
483
+ farmer: nil,
484
+ rice_year: 2020,
473
485
  soaking_ratio: 0.33,
474
486
  steaming_ratio: 0.41,
475
487
  cooling_ratio: 0.33,
@@ -489,7 +501,8 @@ module Example
489
501
  brand: :yamadanishiki,
490
502
  polishing_ratio: 0.55,
491
503
  made_in: :hyogo,
492
- year: 2020,
504
+ farmer: nil,
505
+ rice_year: 2020,
493
506
  soaking_ratio: 0.33,
494
507
  steaming_ratio: 0.41,
495
508
  cooling_ratio: 0.33,
@@ -511,7 +524,8 @@ module Example
511
524
  brand: :yamadanishiki,
512
525
  polishing_ratio: 0.55,
513
526
  made_in: :hyogo,
514
- year: 2020,
527
+ farmer: nil,
528
+ rice_year: 2020,
515
529
  soaking_ratio: 0.33,
516
530
  steaming_ratio: 0.41,
517
531
  cooling_ratio: 0.33,
@@ -556,7 +570,8 @@ module Example
556
570
  brand: :yamadanishiki,
557
571
  polishing_ratio: 0.55,
558
572
  made_in: :hyogo,
559
- year: 2020,
573
+ farmer: nil,
574
+ rice_year: 2020,
560
575
  soaking_ratio: 0.33,
561
576
  steaming_ratio: 0.41,
562
577
  cooling_ratio: 0.33,
@@ -576,7 +591,8 @@ module Example
576
591
  brand: :yamadanishiki,
577
592
  polishing_ratio: 0.55,
578
593
  made_in: :hyogo,
579
- year: 2020,
594
+ farmer: nil,
595
+ rice_year: 2020,
580
596
  soaking_ratio: 0.33,
581
597
  steaming_ratio: 0.41,
582
598
  cooling_ratio: 0.33,
@@ -608,7 +624,8 @@ module Example
608
624
  brand: :yamadanishiki,
609
625
  polishing_ratio: 0.55,
610
626
  made_in: :hyogo,
611
- year: 2020,
627
+ farmer: nil,
628
+ rice_year: 2020,
612
629
  soaking_ratio: 0.33,
613
630
  steaming_ratio: 0.41,
614
631
  cooling_ratio: 0.33,
@@ -628,7 +645,8 @@ module Example
628
645
  brand: :yamadanishiki,
629
646
  polishing_ratio: 0.55,
630
647
  made_in: :hyogo,
631
- year: 2020,
648
+ farmer: nil,
649
+ rice_year: 2020,
632
650
  soaking_ratio: 0.33,
633
651
  steaming_ratio: 0.41,
634
652
  cooling_ratio: 0.33,
@@ -650,7 +668,8 @@ module Example
650
668
  brand: :yamadanishiki,
651
669
  polishing_ratio: 0.55,
652
670
  made_in: :hyogo,
653
- year: 2020,
671
+ farmer: nil,
672
+ rice_year: 2020,
654
673
  soaking_ratio: 0.33,
655
674
  steaming_ratio: 0.41,
656
675
  cooling_ratio: 0.33,
@@ -670,7 +689,8 @@ module Example
670
689
  brand: :yamadanishiki,
671
690
  polishing_ratio: 0.55,
672
691
  made_in: :hyogo,
673
- year: 2020,
692
+ farmer: nil,
693
+ rice_year: 2020,
674
694
  soaking_ratio: 0.33,
675
695
  steaming_ratio: 0.41,
676
696
  cooling_ratio: 0.33,
@@ -692,7 +712,8 @@ module Example
692
712
  brand: :yamadanishiki,
693
713
  polishing_ratio: 0.55,
694
714
  made_in: :hyogo,
695
- year: 2020,
715
+ farmer: nil,
716
+ rice_year: 2020,
696
717
  soaking_ratio: 0.33,
697
718
  steaming_ratio: 0.41,
698
719
  cooling_ratio: 0.33,
@@ -712,7 +733,8 @@ module Example
712
733
  brand: :yamadanishiki,
713
734
  polishing_ratio: 0.55,
714
735
  made_in: :hyogo,
715
- year: 2020,
736
+ farmer: nil,
737
+ rice_year: 2020,
716
738
  soaking_ratio: 0.33,
717
739
  steaming_ratio: 0.41,
718
740
  cooling_ratio: 0.33,
@@ -766,7 +788,8 @@ module Example
766
788
  brand: :yamadanishiki,
767
789
  polishing_ratio: 0.55,
768
790
  made_in: :hyogo,
769
- year: 2020,
791
+ farmer: nil,
792
+ rice_year: 2020,
770
793
  soaking_ratio: 0.33,
771
794
  steaming_ratio: 0.41,
772
795
  cooling_ratio: 0.33,
@@ -809,7 +832,8 @@ module Example
809
832
  brand: :yamadanishiki,
810
833
  polishing_ratio: 0.55,
811
834
  made_in: :hyogo,
812
- year: 2020,
835
+ farmer: nil,
836
+ rice_year: 2020,
813
837
  soaking_ratio: 0.33,
814
838
  steaming_ratio: 0.41,
815
839
  cooling_ratio: 0.33,
@@ -831,7 +855,8 @@ module Example
831
855
  brand: :yamadanishiki,
832
856
  polishing_ratio: 0.55,
833
857
  made_in: :hyogo,
834
- year: 2020,
858
+ farmer: nil,
859
+ rice_year: 2020,
835
860
  soaking_ratio: 0.33,
836
861
  steaming_ratio: 0.41,
837
862
  cooling_ratio: 0.33,
@@ -851,7 +876,8 @@ module Example
851
876
  brand: :yamadanishiki,
852
877
  polishing_ratio: 0.55,
853
878
  made_in: :hyogo,
854
- year: 2020,
879
+ farmer: nil,
880
+ rice_year: 2020,
855
881
  soaking_ratio: 0.33,
856
882
  steaming_ratio: 0.41,
857
883
  cooling_ratio: 0.33,
@@ -873,7 +899,8 @@ module Example
873
899
  brand: :yamadanishiki,
874
900
  polishing_ratio: 0.55,
875
901
  made_in: :hyogo,
876
- year: 2020,
902
+ farmer: nil,
903
+ rice_year: 2020,
877
904
  soaking_ratio: 0.33,
878
905
  steaming_ratio: 0.41,
879
906
  cooling_ratio: 0.33,
@@ -893,7 +920,8 @@ module Example
893
920
  brand: :yamadanishiki,
894
921
  polishing_ratio: 0.55,
895
922
  made_in: :hyogo,
896
- year: 2020,
923
+ farmer: nil,
924
+ rice_year: 2020,
897
925
  soaking_ratio: 0.33,
898
926
  steaming_ratio: 0.41,
899
927
  cooling_ratio: 0.33,
data/example/kake_ingredient.rb CHANGED
@@ -8,7 +8,8 @@ kake = Example::Kake.new(
8
8
  brand: :yamadanishiki,
9
9
  polishing_ratio: 0.55,
10
10
  made_in: :hyogo,
11
- year: 2020,
11
+ farmer: nil,
12
+ rice_year: 2020,
12
13
  soaking_ratio: 0.33,
13
14
  steaming_ratio: 0.41,
14
15
  cooling_ratio: 0.33,
data/example/koji_ingredient.rb CHANGED
@@ -8,7 +8,8 @@ koji = Example::Koji.new(
8
8
  brand: :yamadanishiki,
9
9
  polishing_ratio: 0.55,
10
10
  made_in: :hyogo,
11
- year: 2020,
11
+ farmer: nil,
12
+ rice_year: 2020,
12
13
  soaking_ratio: 0.33,
13
14
  steaming_ratio: 0.41,
14
15
  cooling_ratio: 0.33,
data/lib/toji/ingredient/kake.rb CHANGED
@@ -4,7 +4,7 @@ module Toji
4
4
  include Rice
5
5
 
6
6
  def ingredient_key
7
- [brand, polishing_ratio, made_in, year, soaking_ratio, steaming_ratio, cooling_ratio].join(":")
7
+ [brand, polishing_ratio, made_in, farmer, rice_year, soaking_ratio, steaming_ratio, cooling_ratio].join(":")
8
8
  end
9
9
 
10
10
  def default_process_group
data/lib/toji/ingredient/koji.rb CHANGED
@@ -19,7 +19,7 @@ module Toji
19
19
 
20
20
  # Scheduleへのグループ識別子
21
21
  def ingredient_key
22
- keys1 = [brand, polishing_ratio, made_in, year, soaking_ratio, steaming_ratio, cooling_ratio, dekoji_ratio]
22
+ keys1 = [brand, polishing_ratio, made_in, farmer, rice_year, soaking_ratio, steaming_ratio, cooling_ratio, dekoji_ratio]
23
23
  keys2 = tanekojis&.map(&:ingredient_key)&.sort || []
24
24
  (keys1 + keys2).join(":")
25
25
  end
data/lib/toji/ingredient/rice.rb CHANGED
@@ -11,7 +11,8 @@ module Toji
11
11
  # @dynamic brand
12
12
  # @dynamic polishing_ratio
13
13
  # @dynamic made_in
14
- # @dynamic year
14
+ # @dynamic farmer
15
+ # @dynamic rice_year
15
16
 
16
17
  # 浸漬米吸水率
17
18
  #
data/lib/toji/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Toji
2
- VERSION = "2.22.0"
2
+ VERSION = "2.23.0"
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: 2.22.0
4
+ version: 2.23.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yoshida Tetsuya
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-01-17 00:00:00.000000000 Z
11
+ date: 2021-01-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport