toji 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1a2b7e3b28049c6bcea4e592b05b34e30d6401f000a2c34131587bdb618cebc
-  data.tar.gz: 9b2ea8360654519981cb1e892107b4210f04b4fd01a41bbd9e9635c102456401
+  metadata.gz: 5a988802371162370669a50350ab7878a88e76366f2d9f32401dcb3a06fadf4e
+  data.tar.gz: b8300b0795e0eee8055765301a165a191fd334736ec0d19f76278dc4cb1262b4
 SHA512:
-  metadata.gz: 44ba2b32fa2d77088a3161730b5621e770f7ce800d2a241fa5cbecf107189f0e6b047d99723f8a442c91276ef4cbefd68ba7621f94b2efe686cbaba22cffcadb
-  data.tar.gz: 90a4964b60455e1be915052aa54656459651c2f8b3868097c2ac279fd9b19495f3c31b399d334f385800482b6a38a1cd8780e2bbe703a82d3374a325d166289d
+  metadata.gz: 312348c96281f8576e078446c76044855d45c02ad7165691d817c0958f83539e9c8d03f0bf2d1a7eb882e890e0e575ae041370e0c8ce594546bc308016b18640
+  data.tar.gz: 85a29ffef5ef2055102890a74509e38ffd090a5ea5336adeb3710c74f69ad4ffaeaa8271f7c88b194239d279087d72ad52b321bccbeac9ca6366ddf71bee4004

data/lib/toji/recipe/step.rb

@@ -97,6 +97,17 @@ module Toji
           x * y
         end
       end
+
+      def to_h
+        {
+          name: name,
+          rice: rice.raw,
+          koji: koji.raw,
+          water: water,
+          lactic_acid: lactic_acid,
+          alcohol: alcohol,
+        }
+      end
     end
   end
 end

data/lib/toji/recipe/three_step_mashing.rb

@@ -70,7 +70,7 @@ module Toji
       #
       # 出典: 酒造教本 P96
       def shubo_rate
-        cumulative_shubo_rates.last
+        cumulative_shubo_rates.last || 0.0
       end
 
       # 白米比率
@@ -87,6 +87,16 @@ module Toji
         }
       end
 
+      def to_h
+        {
+          steps: steps.map(&:to_h),
+          cumulative_rice_totals: cumulative_rice_totals,
+          cumulative_shubo_rates: cumulative_shubo_rates,
+          shubo_rate: shubo_rate,
+          rice_rates: rice_rates,
+        }
+      end
+
       def table_data
         headers = [""] + @steps.map(&:name) + [:total]
         keys = [:rice_total, :rice, :koji, :alcohol, :water, :lactic_acid]

data/lib/toji/schedule/product.rb

@@ -44,6 +44,16 @@ module Toji
         events
       end
 
+      def to_h
+        {
+          id: @id,
+          name: @name,
+          description: @description,
+          recipe: @recipe.table_data,
+          color: @color,
+        }
+      end
+
       def self.create(args)
         if self===args
           args

data/lib/toji/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Yoshida Tetsuya