toji 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: babdb8cea1bd57660a6e5eb2652b1f6a99e45f8a10e4249ce7406db9195255da
-  data.tar.gz: 488d9490343ff3828b974c3cff9ec5784cd4cc7fb618e47420a2f1099eae47b2
+  metadata.gz: da8a1b74fff1ead3a469ab8609d313b86641348b0ced33d88ea3210d53346c55
+  data.tar.gz: 0fde77cdbc4df03c63ef13d3a2792c790b7c3dfcd200f19f6a3a0d156411e196
 SHA512:
-  metadata.gz: 8fd8b2552331a81cb0c584b39a5f8f816f155e6d09d6bc28de30d55144631f6e451abbd4ecc49ba2a880a94e4db120106532f74dda7a8ae99e36ec1cc1e0935b
-  data.tar.gz: 85dab7b8fdf06c7a8fe31ac0b5c2643a5702530e37d477ebe56fd414c3329fd4141c2828151cecc166d76ae64c6cf8a1d3eaf817c2eaf7b6d5e4c6010757654e
+  metadata.gz: b623b8508553a10c40a5c38dc5247a257d26057a5f38c2ce56cc2ac16a670f6fa2937ac43265cb0a7f1bfe5860d789c3ea7ccbc7541e2c559d773d8c8410987f
+  data.tar.gz: 3cd36627d7d0c4f2bd765b0c3eb57efacb1842b447a7b767de6db6e7da0d7e99f9b9871bec6cb140db2fce1f04e0a92ac45912f5bf734a70eeff9f30018db912

data/lib/toji/brew/base.rb

@@ -106,6 +106,16 @@ module Toji
         }
       end
 
+      def to_h
+        {
+          states: map(&:to_h),
+          has_keys: has_keys,
+          day_offset: day_offset,
+          days: days,
+          day_labels: day_labels,
+        }
+      end
+
       def self.create(records, date_line: 0)
         if Base===records
           records

data/lib/toji/brew/graph/multi_progress.rb

@@ -40,16 +40,12 @@ module Toji
         alias_method :add, :<<
 
         def plot_data(keys=nil)
-          use_name = 2<=@progresses.length
-
           @progresses.map {|progress|
-            progress.plot_data(keys, use_name)
+            progress.plot_data(keys, true)
           }.inject([], :+)
         end
 
         def annotations
-          use_name = 2<=@progresses.length
-
           @progresses.map {|progress|
             progress.annotations
           }.inject([], :+)

data/lib/toji/brew/graph/progress.rb

@@ -44,7 +44,7 @@ module Toji
           end
 
           name = ""
-          if @name
+          if use_name && @name
             name = "#{@name} "
           end
 

data/lib/toji/brew/state.rb

@@ -103,6 +103,32 @@ module Toji
           target_alc - (_baume - target_nihonshudo * -0.1) * coef
         end
       end
+
+      def to_h
+        {
+          elapsed_time: elapsed_time,
+          time: time,
+          mark: mark,
+          temps: temps,
+          preset_temp: preset_temp,
+          room_temp: room_temp,
+          room_psychrometry: room_psychrometry,
+          acid: acid,
+          amino_acid: amino_acid,
+          alcohol: alcohol,
+          warmings: warmings,
+          note: note,
+
+          day: day,
+          day_label: day_label,
+          elapsed_time_with_offset: elapsed_time_with_offset,
+          baume: baume,
+          nihonshudo: nihonshudo,
+          display_baume: display_baume,
+          moromi_day: moromi_day,
+          bmd: bmd,
+        }
+      end
     end
   end
 end

data/lib/toji/schedule/date_column.rb

@@ -25,6 +25,15 @@ module Toji
           "#{name}: #{weight}"
         }.join("<br>")
       end
+
+      def to_h_a
+        event_groups.map {|es|
+          {
+            product: es.first.product.to_h,
+            weight: es.map(&:weight).sum,
+          }
+        }
+      end
     end
   end
 end

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

metadata

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