toji 1.3.0 → 1.4.0

data/example/shubo.rb

@@ -1,7 +1,7 @@
 require 'toji'
 require 'terminal-table'
 
-shubo = Toji::Brew::Shubo.template
+shubo = Toji::Brew::Shubo.load_yaml_file("shubo.yaml")
 
 table = Terminal::Table.new do |t|
   t << ["作業", "日数", "品温(度)", "ボーメ", "酸度", "経過時間", "日時"]

data/example/shubo.yaml

@@ -0,0 +1,75 @@
+date_line: 0
+records:
+- elapsed_time: 0
+  mark: mizukoji
+  temps: 12.0
+  acid: 13.0
+- elapsed_time: 3600
+  mark: shikomi
+  temps: 20.0
+  acid: 13.0
+- elapsed_time: 86400
+  mark: utase
+  temps: 14.0
+  baume: 15.0
+  acid: 13.0
+- elapsed_time: 172800
+  temps:
+  - 8.0
+  - 11.0
+  baume: 16.0
+  acid: 13.0
+  warmings: daki
+- elapsed_time: 259200
+  temps:
+  - 10.0
+  - 13.0
+  baume: 16.5
+  acid: 13.5
+  warmings: daki
+- elapsed_time: 345600
+  temps:
+  - 12.0
+  - 15.0
+  baume: 17.0
+  acid: 13.5
+  warmings: daki
+- elapsed_time: 432000
+  temps: 14.0
+  baume: 17.0
+  acid: 14.0
+  warmings: anka
+- elapsed_time: 518400
+  temps: 20.0
+  baume: 17.0
+  acid: 14.5
+  warmings: anka
+- elapsed_time: 604800
+  temps: 20.0
+  baume: 14.0
+  acid: 15.5
+- elapsed_time: 691200
+  temps: 20.0
+  baume: 12.0
+  acid: 16.0
+- elapsed_time: 777600
+  mark: wake
+  temps: 20.0
+  baume: 9.0
+  acid: 16.0
+- elapsed_time: 864000
+  temps: 15.0
+  baume: 8.0
+  acid: 16.5
+- elapsed_time: 950400
+  temps: 12.0
+  baume: 7.0
+  acid: 17.0
+- elapsed_time: 1036800
+  temps: 10.0
+  baume: 6.0
+  acid: 17.5
+- elapsed_time: 1123200
+  temps: 9.0
+  baume: 5.0
+  acid: 17.5

data/lib/toji.rb

@@ -1,5 +1,6 @@
 require "toji/version"
 require 'active_support/all'
+require 'yaml'
 
 require 'toji/recipe'
 require 'toji/brew'

data/lib/toji/brew.rb

@@ -2,10 +2,6 @@ module Toji
   module Brew
     HOUR = 60 * 60
     DAY = 24 * HOUR
-
-    WARM_DAKI = 1
-    WARM_ANKA = 1<<1
-    WARM_MAT = 1<<2
   end
 end
 

data/lib/toji/brew/base.rb

@@ -26,7 +26,6 @@ module Toji
         :amino_acid,
         :alcohol,
         :bmd,
-        :warming,
         :warmings,
         :note,
       ].freeze
@@ -116,6 +115,19 @@ module Toji
       def self.builder
         Builder.new(self)
       end
+
+      def self.load_hash(hash)
+        hash = hash.deep_symbolize_keys
+        date_line = hash[:date_line] || 0
+        records = hash[:records] || []
+
+        builder.add(records).date_line(date_line).build
+      end
+
+      def self.load_yaml_file(fname)
+        hash = YAML.load_file(fname)
+        load_hash(hash)
+      end
     end
   end
 end

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

@@ -51,6 +51,18 @@ module Toji
             }
           end
 
+          #if 0<@data.states.length && @data.states.last.time.strftime("%T")!="00:00:00"
+          #  t = @data.states.last.elapsed_time_with_offset
+          #  t -= (t % DAY) - DAY
+          #
+          #  result = result.map{|h|
+          #    h[:x] << t
+          #    h[:y] << nil
+          #    h[:text] << nil
+          #    h
+          #  }
+          #end
+
           result
         end
 
@@ -79,7 +91,6 @@ module Toji
             keys.delete(:moromi_day)
             keys.delete(:baume)
             keys.delete(:nihonshudo)
-            keys.delete(:warming)
           else
             keys &= @data.has_keys
           end

data/lib/toji/brew/koji.rb

@@ -2,68 +2,6 @@ module Toji
   module Brew
     class Koji < Base
 
-      TEMPLATES = {
-        default: [
-          {
-            elapsed_time: 0 * Brew::HOUR,
-            id: :hikikomi,
-            temps: 35.0,
-            room_temp: 28.0,
-            room_psychrometry: nil,
-          },
-          {
-            elapsed_time: 1 * Brew::HOUR,
-            id: :tokomomi,
-            temps: 32.0,
-            room_temp: 28.0,
-            room_psychrometry: nil,
-          },
-          {
-            elapsed_time: 9 * Brew::HOUR,
-            id: :kirikaeshi,
-            temps: [32.0, 31.0],
-            room_temp: 28.0,
-            room_psychrometry: nil,
-          },
-          {
-            elapsed_time: 21 * Brew::HOUR,
-            id: :mori,
-            temps: [35.0, 33.0],
-            room_temp: 28.0,
-            room_psychrometry: 4,
-          },
-          {
-            elapsed_time: 29 * Brew::HOUR,
-            id: :naka_shigoto,
-            temps: [37.0, 35.0],
-            room_temp: 28.0,
-            room_psychrometry: 4,
-          },
-          {
-            elapsed_time: 35 * Brew::HOUR,
-            id: :shimai_shigoto,
-            temps: [38.0, 37.0],
-            room_temp: 28.0,
-            room_psychrometry: 5,
-          },
-          {
-            elapsed_time: 39 * Brew::HOUR,
-            id: :tsumikae,
-            temps: 40.0,
-            room_temp: 28.0,
-            room_psychrometry: 5,
-          },
-          {
-            elapsed_time: 44 * Brew::HOUR,
-            id: :dekoji,
-            temps: 40.0,
-            room_temp: 28.0,
-            room_psychrometry: 5,
-          },
-        ],
-      }
-
-
       state_reader :hikikomi
       state_reader :tokomomi
       state_reader :kirikaeshi
@@ -77,10 +15,6 @@ module Toji
       def progress(enable_annotations: true)
         Graph::Progress.new(self, enable_annotations: enable_annotations)
       end
-
-      def self.template(key=:default)
-        create(TEMPLATES[key])
-      end
     end
   end
 end

data/lib/toji/brew/moromi.rb

@@ -2,170 +2,6 @@ module Toji
   module Brew
     class Moromi < Base
 
-      TEMPLATES = {
-        default: [
-          {
-            time: Time.mktime(2019, 1, 16),
-            mark: :soe,
-            room_temp: 9,
-            temps: [14.8, 11.0],
-          },
-          {
-            time: Time.mktime(2019, 1, 17),
-            room_temp: 9,
-            temps: 14.3,
-          },
-          {
-            time: Time.mktime(2019, 1, 18),
-            room_temp: 8.5,
-            temps: 11.3,
-          },
-          {
-            time: Time.mktime(2019, 1, 19),
-            mark: :naka,
-            room_temp: 9,
-            temps: [6.9, 10.6],
-          },
-          {
-            time: Time.mktime(2019, 1, 20),
-            mark: :tome,
-            room_temp: 6,
-            temps: [7.5, 8.0],
-          },
-          {
-            time: Time.mktime(2019, 1, 21),
-            room_temp: 7,
-            temps: 9.1,
-          },
-          {
-            time: Time.mktime(2019, 1, 22),
-            room_temp: 7,
-            temps: 10.4,
-          },
-          {
-            time: Time.mktime(2019, 1, 23),
-            room_temp: 8,
-            temps: 11.9,
-            baume: 8.6,
-          },
-          {
-            time: Time.mktime(2019, 1, 24),
-            room_temp: 8,
-            temps: 12.3,
-            baume: 8.0,
-            alcohol: 4.8,
-          },
-          {
-            time: Time.mktime(2019, 1, 25),
-            room_temp: 7.5,
-            temps: 13.1,
-            baume: 7.2,
-            alcohol: 6.75,
-          },
-          {
-            time: Time.mktime(2019, 1, 26),
-            room_temp: 7.5,
-            temps: 13.1,
-            baume: 5.8,
-            alcohol: 7.992,
-          },
-          {
-            time: Time.mktime(2019, 1, 27),
-            room_temp: 7.5,
-            temps: 12.9,
-            baume: 4.8,
-          },
-          {
-            time: Time.mktime(2019, 1, 28),
-            room_temp: 7.0,
-            temps: 12.8,
-            baume: 4.0,
-            alcohol: 10.7,
-          },
-          {
-            time: Time.mktime(2019, 1, 29),
-            room_temp: 8.0,
-            temps: 12.9,
-            baume: 3.4,
-            alcohol: 11.6,
-          },
-          {
-            time: Time.mktime(2019, 1, 30),
-            room_temp: 8.0,
-            temps: 12.6,
-            nihonshudo: -27,
-            alcohol: 12.7,
-          },
-          {
-            time: Time.mktime(2019, 1, 31),
-            room_temp: 7.0,
-            temps: 12.0,
-            nihonshudo: -21,
-            alcohol: 13.7,
-          },
-          {
-            time: Time.mktime(2019, 2, 1),
-            room_temp: 7.0,
-            temps: 11.2,
-            nihonshudo: -17,
-          },
-          {
-            time: Time.mktime(2019, 2, 2),
-            room_temp: 6.5,
-            temps: 10.2,
-            nihonshudo: -13,
-          },
-          {
-            time: Time.mktime(2019, 2, 3),
-            room_temp: 7.0,
-            temps: 9.7,
-          },
-          {
-            time: Time.mktime(2019, 2, 4),
-            room_temp: 8.0,
-            temps: 9.8,
-            nihonshudo: -8,
-            alcohol: 16.0,
-          },
-          {
-            time: Time.mktime(2019, 2, 5),
-            room_temp: 6.0,
-            temps: 9.1,
-            nihonshudo: -5,
-          },
-          {
-            time: Time.mktime(2019, 2, 6),
-            room_temp: 5.0,
-            temps: 8.4,
-            nihonshudo: -3,
-            alcohol: 16.3,
-          },
-          {
-            time: Time.mktime(2019, 2, 7),
-            room_temp: 5.0,
-            temps: 8.1,
-            nihonshudo: -2,
-          },
-          {
-            time: Time.mktime(2019, 2, 8),
-            room_temp: 7.0,
-            temps: 8.3,
-            nihonshudo: 0,
-          },
-          {
-            time: Time.mktime(2019, 2, 9),
-            room_temp: 6.0,
-            temps: 8.1,
-          },
-        ],
-      }
-
-      DAY_LABELS = {
-        default: [:soe, :odori, :naka, :tome].freeze,
-        moto1: [:moto, :soe, :odori, :naka, :tome].freeze,
-        odori2: [:soe, :odori, :odori, :naka, :tome].freeze,
-      }.freeze
-
       state_reader :moto
       state_reader :soe
       state_reader :naka
@@ -236,10 +72,6 @@ module Toji
       def ab(coef=1.5)
         Graph::Ab.new(coef).actual(self)
       end
-
-      def self.template(key=:default)
-        create(TEMPLATES[key])
-      end
     end
   end
 end

data/lib/toji/brew/shubo.rb

@@ -2,109 +2,6 @@ module Toji
   module Brew
     class Shubo < Base
 
-      TEMPLATES = {
-        default: [
-          {
-            elapsed_time: 0 * Brew::DAY,
-            mark: :mizukoji,
-            temps: 12.0,
-            acid: 13.0,
-          },
-          {
-            elapsed_time: 0 * Brew::DAY + 1 * Brew::HOUR,
-            mark: :shikomi,
-            temps: 20.0,
-            acid: 13.0,
-          },
-          {
-            elapsed_time: 1 * Brew::DAY,
-            mark: :utase,
-            temps: 14.0,
-            baume: 15.0,
-            acid: 13.0,
-          },
-          {
-            elapsed_time: 2 * Brew::DAY,
-            temps: [8.0, 11.0],
-            baume: 16.0,
-            acid: 13.0,
-            warming: WARM_DAKI,
-          },
-          {
-            elapsed_time: 3 * Brew::DAY,
-            temps: [10.0, 13.0],
-            baume: 16.5,
-            acid: 13.5,
-            warming: WARM_DAKI,
-          },
-          {
-            elapsed_time: 4 * Brew::DAY,
-            temps: [12.0, 15.0],
-            baume: 17.0,
-            acid: 13.5,
-            warming: WARM_DAKI,
-          },
-          {
-            elapsed_time: 5 * Brew::DAY,
-            temps: 14.0,
-            baume: 17.0,
-            acid: 14.0,
-            warming: WARM_ANKA,
-          },
-          {
-            elapsed_time: 6 * Brew::DAY,
-            temps: 20.0,
-            baume: 17.0,
-            acid: 14.5,
-            warming: WARM_ANKA,
-          },
-          {
-            elapsed_time: 7 * Brew::DAY,
-            temps: 20.0,
-            baume: 14.0,
-            acid: 15.5,
-          },
-          {
-            elapsed_time: 8 * Brew::DAY,
-            temps: 20.0,
-            baume: 12.0,
-            acid: 16.0,
-          },
-          {
-            elapsed_time: 9 * Brew::DAY,
-            mark: :wake,
-            temps: 20.0,
-            baume: 9.0,
-            acid: 16.0,
-          },
-          {
-            elapsed_time: 10 * Brew::DAY,
-            temps: 15.0,
-            baume: 8.0,
-            acid: 16.5,
-          },
-          {
-            elapsed_time: 11 * Brew::DAY,
-            temps: 12.0,
-            baume: 7.0,
-            acid: 17.0,
-          },
-          {
-            elapsed_time: 12 * Brew::DAY,
-            temps: 10.0,
-            baume: 6.0,
-            acid: 17.5,
-          },
-          {
-            elapsed_time: 13 * Brew::DAY,
-            temps: 9.0,
-            baume: 5.0,
-            acid: 17.5,
-          },
-        ],
-      }
-
-
       state_reader :mizukoji
       state_reader :shikomi
       state_reader :utase
@@ -113,10 +10,6 @@ module Toji
       def progress(enable_annotations: true)
         Graph::Progress.new(self, enable_annotations: enable_annotations)
       end
-
-      def self.template(key=:default)
-        create(TEMPLATES[key])
-      end
     end
   end
 end