jekyll-cooklang-converter 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84eb0c0f3f9686e895d90daa24604cad91fc3f336ba5311c20010c8fe08a877b
-  data.tar.gz: a48f36af64fb5dcd32e86d38525634f3c27c5e8c767c79646128c85ea167c8c2
+  metadata.gz: 12645bcaffa4192f683b66dba99bab13816c443e95bfc230aefe1300b3a34cb6
+  data.tar.gz: e41ce8b50f24b7ca9f78eb74016dc2a5802b90e7a87f05c95577ccfa2a2b9bf8
 SHA512:
-  metadata.gz: 796cd7fd7ebb8c7321f87cc82ca7c1708be46b657ea11fcbda63f4724a99fd739b034720aae0e1248ebdb715c32d9e271d5104c3f0493cdcdc0f633eedaffa6b
-  data.tar.gz: 26699a51dfc7a327fe0a0077ad3075ce8818dc22c84f492baec3efcae7d8eb310f9b725598056a427398c11f56870442c225f1461d4f9808823f63dfb03fbfd8
+  metadata.gz: ce4a582b365abf71907ca9b219835738be2a03339390e840a0cadb3d35c66b4686e6a75e86476c8749c55e6ed48cf9e20a8b4fec0209e76a6bbf07c09fe94645
+  data.tar.gz: 21e44551283bd5a9e2f4a01670a885bd19a654b7279a20e4910d2e7d8897f2392a42603903621983873319a706beabbbcf4c23a6846976dd420face48fda39fe

data/clash/test-site/_expected/recipes/baked-ziti.html

@@ -1,6 +1,6 @@
 <h2>Ingredients</h2>
 <ul>
-  <li><em>1 box</em> mushrooms</li>
+  <li><em>1/2 box</em> mushrooms</li>
   <li><em>1 pound</em> ground sausage</li>
   <li><em>some</em> garlic powder</li>
   <li><em>some</em> italian seasoning</li>
@@ -47,6 +47,6 @@
     <p>layer half of the cooked pasta into the bottom of a greased casserole dish. Ladle half of the meat + veggie mixture on top. Then, spread the cheese mixture from the previous step on top of everything. Layer sliced provolone on that, followed by the rest of the sauce, the rest of the pasta, and a final layer of mozarella cheese. Sprinkle the top with italian seasoning</p>
   </li>
   <li>
-    <p>put the dish in the preheated oven for . Then it's all ready!</p>
+    <p>put the dish in the preheated oven for 25 minutes. Then it's all ready!</p>
   </li>
 </ol>

data/clash/test-site/_recipes/baked-ziti.cook

@@ -2,7 +2,7 @@
 ---
 set a #pot of water on the stove, to boil (you'll need for pasta later), and preheat the oven to 350
 
-cut @mushrooms{1%box} into slices, and sautee (no oil) in a pan over medium high heat until browned. Set aside
+cut @mushrooms{1/2%box} into slices, and sautee (no oil) in a pan over medium high heat until browned. Set aside
 
 brown @ground sausage{1%pound} in the same pan, seasoning with @garlic powder{}, @italian seasoning{}, and @chili powder{} set aside
 

data/clash/test-site/_site/recipes/baked-ziti.html

@@ -1,6 +1,6 @@
 <h2>Ingredients</h2>
 <ul>
-  <li><em>1 box</em> mushrooms</li>
+  <li><em>1/2 box</em> mushrooms</li>
   <li><em>1 pound</em> ground sausage</li>
   <li><em>some</em> garlic powder</li>
   <li><em>some</em> italian seasoning</li>
@@ -47,6 +47,6 @@
     <p>layer half of the cooked pasta into the bottom of a greased casserole dish. Ladle half of the meat + veggie mixture on top. Then, spread the cheese mixture from the previous step on top of everything. Layer sliced provolone on that, followed by the rest of the sauce, the rest of the pasta, and a final layer of mozarella cheese. Sprinkle the top with italian seasoning</p>
   </li>
   <li>
-    <p>put the dish in the preheated oven for . Then it's all ready!</p>
+    <p>put the dish in the preheated oven for 25 minutes. Then it's all ready!</p>
   </li>
 </ol>

data/lib/jekyll/converters/cooklang.rb

@@ -12,9 +12,17 @@ module Jekyll
 
     class Ingredient < ToHTML
       def initialize(quantity, unit, name)
-        @name = name
-        @unit = unit
-        @quantity = quantity
+        @name = name.to_s
+        @unit = unit.to_s
+        @quantity = if quantity.respond_to? :rationalize
+          if quantity.rationalize(0.1).denominator == 1
+            quantity.to_s
+          else
+            quantity.rationalize(0.1).to_s
+          end
+        else
+          quantity.to_s
+        end
       end
 
       def to_html
@@ -23,10 +31,23 @@ module Jekyll
       end
     end
 
+    class Timer < ToHTML
+      def initialize(quantity, unit, name)
+        @name = name.to_s
+        @unit = unit.to_s
+        @quantity = quantity.to_s
+      end
+
+      def to_html
+        return "<em>#{@quantity} #{@unit}</em>" if @unit.empty?
+        "<em>#{@quantity} #{@unit}</em> (#{@name})"
+      end
+    end
+
     class CookWare < ToHTML
       def initialize(quantity, name)
-        @name = name
-        @quantity = quantity
+        @name = name.to_s
+        @quantity = quantity.to_s
       end
 
       def to_html
@@ -69,6 +90,8 @@ module Jekyll
             substep["name"]
           when "ingredient"
             substep["name"]
+          when "timer"
+            "#{substep["quantity"]} #{substep["units"]}"
           when "text"
             substep["value"]
           end
@@ -97,13 +120,13 @@ module Jekyll
         ingredients = recipe["steps"].flatten.select { |item|
           item["type"] == "ingredient"
         }.map { |item|
-          Ingredient.new(item["quantity"].to_s, item["units"].to_s, item["name"].to_s)
+          Ingredient.new(item["quantity"], item["units"], item["name"])
         }
 
         cookware = recipe["steps"].flatten.select { |item|
           item["type"] == "cookware"
         }.map { |item|
-          CookWare.new(item["quantity"].to_s, item["name"].to_s)
+          CookWare.new(item["quantity"], item["name"])
         }
 
         steps = recipe["steps"].map do |step|

data/lib/jekyll-cooklang-converter/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module CooklangConverter
-    VERSION = "0.2.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-cooklang-converter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - BraeTroutman
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-27 00:00:00.000000000 Z
+date: 2024-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll