toji 1.3.0 → 1.4.0

data/lib/toji/brew/state.rb

@@ -18,7 +18,6 @@ module Toji
       def_delegators :@record, :acid
       def_delegators :@record, :amino_acid
       def_delegators :@record, :alcohol
-      def_delegators :@record, :warming
       def_delegators :@record, :warmings
       def_delegators :@record, :note
 
@@ -71,7 +70,8 @@ module Toji
         if @time
           @time.strftime(format)
         else
-          Time.at(@elapsed_time).strftime(format)
+          utc_offset = Time.at(0).utc_offset
+          Time.at(@elapsed_time - utc_offset).strftime(format)
         end
       end
 

data/lib/toji/brew/state_record.rb

@@ -14,12 +14,8 @@ module Toji
         :acid,
         :amino_acid,
         :alcohol,
-        :warming,
-        :note,
-      ].freeze
-
-      RO_KEYS = [
         :warmings,
+        :note,
       ].freeze
 
       attr_accessor :time
@@ -37,25 +33,19 @@ module Toji
       attr_accessor :amino_acid
       attr_accessor :alcohol
 
-      attr_accessor :warming
+      attr_accessor :warmings
       attr_accessor :note
 
       def temps=(val)
-        @temps = [val].flatten.select{|t| t}
+        @temps = [val].flatten.compact
       end
 
-      def warmings
-        result = []
-        if @warming & WARM_DAKI
-          result << :daki
-        end
-        if @warming & WARM_ANKA
-          result << :anka
-        end
-        if @warming & WARM_MAT
-          result << :mat
-        end
-        result
+      def time=(val)
+        @time = val&.to_time
+      end
+
+      def warmings=(val)
+        @warmings = [val].flatten.compact
       end
 
       def self.create(r)

data/lib/toji/schedule/calendar.rb

@@ -47,21 +47,10 @@ module Toji
           }
         end
 
-        case rice_len
-        when 1
-          headers += [:moto]
-        when 2
-          headers += [:moto, :soe]
-        when 3
-          headers += [:moto, :soe, :naka]
-        when 4
-          headers += [:moto, :soe, :naka, :tome]
-        else
-          headers += [:moto, :soe, :naka, :tome]
-          (4...rice_len).each {|i|
-            headers << "#{i}dan"
-          }
-        end
+        headers += [:moto, :soe, :naka, :tome, :yodan][0...rice_len]
+        (5...rice_len).each {|i|
+          headers << "#{i}dan"
+        }
 
         rows = date_rows
 
@@ -110,6 +99,23 @@ module Toji
           }
         )
       end
+
+      def self.load_hash(hash)
+        hash = hash.deep_symbolize_keys
+        products = hash[:products] || []
+
+        cal = new
+        products.each {|product|
+          cal.add(Product.create(product))
+        }
+
+        cal
+      end
+
+      def self.load_yaml_file(fname)
+        hash = YAML.load_file(fname)
+        load_hash(hash)
+      end
     end
   end
 end

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-22 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -111,13 +111,18 @@ files:
 - bin/setup
 - example/koji_making.ipynb
 - example/koji_making.rb
+- example/koji_making.yaml
 - example/koji_recipe.rb
 - example/moromi.ipynb
 - example/moromi.rb
+- example/moromi.yaml
 - example/rice_recipe.rb
 - example/schedule.ipynb
+- example/schedule.yaml
+- example/schedule_file.ipynb
 - example/shubo.ipynb
 - example/shubo.rb
+- example/shubo.yaml
 - example/three_step_mashing_recipe.rb
 - lib/toji.rb
 - lib/toji/brew.rb