cooklang 1.0.3 → 1.1.0

data/spec/models/metadata_spec.rb

@@ -81,161 +81,31 @@ RSpec.describe Cooklang::Metadata do
     end
   end
 
-  describe "recipe-specific accessors" do
+  describe "direct access to metadata" do
     let(:metadata) { described_class.new }
 
-    describe "#servings" do
-      it "returns integer servings" do
-        metadata["servings"] = "4"
+    it "stores any data types" do
+      metadata["servings"] = 4
+      metadata["tags"] = ["pasta", "italian"]
+      metadata["rating"] = 4.5
+      metadata["published"] = true
+      metadata["source"] = { "name" => "Cookbook", "url" => "https://example.com" }
 
-        expect(metadata.servings).to eq(4)
-      end
-
-      it "returns nil when not set" do
-        expect(metadata.servings).to be_nil
-      end
-    end
-
-    describe "#servings=" do
-      it "sets servings" do
-        metadata.servings = 6
-
-        expect(metadata["servings"]).to eq(6)
-      end
-    end
-
-    describe "#prep_time" do
-      it "returns prep_time" do
-        metadata["prep_time"] = "15 minutes"
-
-        expect(metadata.prep_time).to eq("15 minutes")
-      end
-
-      it "returns prep-time as fallback" do
-        metadata["prep-time"] = "15 minutes"
-
-        expect(metadata.prep_time).to eq("15 minutes")
-      end
-
-      it "returns nil when not set" do
-        expect(metadata.prep_time).to be_nil
-      end
-    end
-
-    describe "#prep_time=" do
-      it "sets prep_time" do
-        metadata.prep_time = "20 minutes"
-
-        expect(metadata["prep_time"]).to eq("20 minutes")
-      end
-    end
-
-    describe "#cook_time" do
-      it "returns cook_time" do
-        metadata["cook_time"] = "30 minutes"
-
-        expect(metadata.cook_time).to eq("30 minutes")
-      end
-
-      it "returns cook-time as fallback" do
-        metadata["cook-time"] = "30 minutes"
-
-        expect(metadata.cook_time).to eq("30 minutes")
-      end
-    end
-
-    describe "#cook_time=" do
-      it "sets cook_time" do
-        metadata.cook_time = "25 minutes"
-
-        expect(metadata["cook_time"]).to eq("25 minutes")
-      end
-    end
-
-    describe "#total_time" do
-      it "returns total_time" do
-        metadata["total_time"] = "45 minutes"
-
-        expect(metadata.total_time).to eq("45 minutes")
-      end
-
-      it "returns total-time as fallback" do
-        metadata["total-time"] = "45 minutes"
-
-        expect(metadata.total_time).to eq("45 minutes")
-      end
-    end
-
-    describe "#total_time=" do
-      it "sets total_time" do
-        metadata.total_time = "50 minutes"
-
-        expect(metadata["total_time"]).to eq("50 minutes")
-      end
-    end
-
-    describe "#title" do
-      it "returns title" do
-        metadata["title"] = "Chocolate Cake"
-
-        expect(metadata.title).to eq("Chocolate Cake")
-      end
-    end
-
-    describe "#title=" do
-      it "sets title" do
-        metadata.title = "Vanilla Cake"
-
-        expect(metadata["title"]).to eq("Vanilla Cake")
-      end
-    end
-
-    describe "#source" do
-      it "returns source" do
-        metadata["source"] = "cookbook.com"
-
-        expect(metadata.source).to eq("cookbook.com")
-      end
-    end
-
-    describe "#source=" do
-      it "sets source" do
-        metadata.source = "my-blog.com"
-
-        expect(metadata["source"]).to eq("my-blog.com")
-      end
-    end
-
-    describe "#tags" do
-      it "returns array when tags is array" do
-        metadata["tags"] = ["dessert", "chocolate"]
-
-        expect(metadata.tags).to eq(["dessert", "chocolate"])
-      end
-
-      it "splits string tags on comma" do
-        metadata["tags"] = "dessert, chocolate, sweet"
-
-        expect(metadata.tags).to eq(["dessert", "chocolate", "sweet"])
-      end
-
-      it "returns empty array when not set" do
-        expect(metadata.tags).to eq([])
-      end
-
-      it "returns empty array for non-string, non-array values" do
-        metadata["tags"] = 123
-
-        expect(metadata.tags).to eq([])
-      end
+      expect(metadata["servings"]).to eq(4)
+      expect(metadata["tags"]).to eq(["pasta", "italian"])
+      expect(metadata["rating"]).to eq(4.5)
+      expect(metadata["published"]).to eq(true)
+      expect(metadata["source"]).to eq({ "name" => "Cookbook", "url" => "https://example.com" })
     end
 
-    describe "#tags=" do
-      it "sets tags" do
-        metadata.tags = ["breakfast", "quick"]
+    it "allows any custom fields" do
+      metadata["wine_pairing"] = "Pinot Noir"
+      metadata["my_custom_field"] = { "nested" => "data" }
+      metadata["notes"] = ["note1", "note2"]
 
-        expect(metadata["tags"]).to eq(["breakfast", "quick"])
-      end
+      expect(metadata["wine_pairing"]).to eq("Pinot Noir")
+      expect(metadata["my_custom_field"]).to eq({ "nested" => "data" })
+      expect(metadata["notes"]).to eq(["note1", "note2"])
     end
   end
 end

data/spec/models/recipe_spec.rb

@@ -143,7 +143,7 @@ RSpec.describe Cooklang::Recipe do
 
     let(:expected_hash) do
       {
-        metadata: { map: { "title" => "Test Recipe", "servings" => "4", "prep_time" => "15 minutes" } },
+        metadata: { map: { "title" => "Test Recipe", "servings" => 4, "prep_time" => "15 minutes" } },
         sections: [
           {
             name: nil,
@@ -174,7 +174,7 @@ RSpec.describe Cooklang::Recipe do
 
     let(:expected_json) do
       {
-        "metadata" => { "map" => { "title" => "Test Recipe", "servings" => "4", "prep_time" => "15 minutes" } },
+        "metadata" => { "map" => { "title" => "Test Recipe", "servings" => 4, "prep_time" => "15 minutes" } },
         "sections" => [
           {
             "name" => nil,

data/spec/parser_spec.rb

@@ -96,6 +96,73 @@ RSpec.describe Cooklang::Parser do
       end
     end
 
+    context "with fixed quantities" do
+      it "parses fixed quantity with unit" do
+        recipe = parser.parse("Season with @salt{=1%tsp}.")
+
+        expect(recipe.ingredients.size).to eq(1)
+        ingredient = recipe.ingredients.first
+        expect(ingredient.name).to eq("salt")
+        expect(ingredient.quantity).to eq(1)
+        expect(ingredient.unit).to eq("tsp")
+        expect(ingredient).to be_fixed
+      end
+
+      it "parses fixed quantity without unit" do
+        recipe = parser.parse("Add @eggs{=3} exactly.")
+
+        expect(recipe.ingredients.size).to eq(1)
+        ingredient = recipe.ingredients.first
+        expect(ingredient.name).to eq("eggs")
+        expect(ingredient.quantity).to eq(3)
+        expect(ingredient).to be_fixed
+      end
+
+      it "parses fixed quantity with space after equals" do
+        recipe = parser.parse("Add @salt{= 2%tsp}.")
+
+        ingredient = recipe.ingredients.first
+        expect(ingredient.quantity).to eq(2)
+        expect(ingredient.unit).to eq("tsp")
+        expect(ingredient).to be_fixed
+      end
+
+      it "parses fixed quantity with text value" do
+        recipe = parser.parse("Add @salt{=some%pinch}.")
+
+        ingredient = recipe.ingredients.first
+        expect(ingredient.quantity).to eq("some")
+        expect(ingredient.unit).to eq("pinch")
+        expect(ingredient).to be_fixed
+      end
+
+      it "parses fixed with no quantity as fixed with 'some'" do
+        recipe = parser.parse("Add @salt{=}.")
+
+        ingredient = recipe.ingredients.first
+        expect(ingredient.quantity).to eq("some")
+        expect(ingredient).to be_fixed
+      end
+
+      it "parses regular quantity as not fixed" do
+        recipe = parser.parse("Use @flour{500%g}.")
+
+        ingredient = recipe.ingredients.first
+        expect(ingredient).not_to be_fixed
+      end
+
+      it "parses mixed fixed and regular ingredients" do
+        recipe = parser.parse("Add @salt{=1%tsp} and @flour{500%g}.")
+
+        expect(recipe.ingredients.size).to eq(2)
+        salt = recipe.ingredients.find { |i| i.name == "salt" }
+        flour = recipe.ingredients.find { |i| i.name == "flour" }
+
+        expect(salt).to be_fixed
+        expect(flour).not_to be_fixed
+      end
+    end
+
     context "with cookware" do
       it "parses simple cookware" do
         recipe = parser.parse("Heat the #pan over medium heat.")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cooklang
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - James Brooks
@@ -157,8 +157,13 @@ files:
 - spec/comprehensive_spec.rb
 - spec/cooklang_spec.rb
 - spec/fixtures/canonical.yaml
+- spec/fixtures/comprehensive_recipe.cook
+- spec/formatters/formatter_spec.rb
+- spec/formatters/hash_spec.rb
+- spec/formatters/json_spec.rb
 - spec/formatters/text_spec.rb
 - spec/integration/canonical_spec.rb
+- spec/integration/metadata_canonical_spec.rb
 - spec/lexer_spec.rb
 - spec/models/cookware_spec.rb
 - spec/models/ingredient_spec.rb
@@ -192,15 +197,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A Ruby parser for the Cooklang recipe markup language.
 test_files:
 - spec/comprehensive_spec.rb
 - spec/cooklang_spec.rb
 - spec/fixtures/canonical.yaml
+- spec/fixtures/comprehensive_recipe.cook
+- spec/formatters/formatter_spec.rb
+- spec/formatters/hash_spec.rb
+- spec/formatters/json_spec.rb
 - spec/formatters/text_spec.rb
 - spec/integration/canonical_spec.rb
+- spec/integration/metadata_canonical_spec.rb
 - spec/lexer_spec.rb
 - spec/models/cookware_spec.rb
 - spec/models/ingredient_spec.rb