klenod-build 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f22c9acfae008123fd3b68c5ab499c7bc8df3da4d5e135dea331f0fe6563596
-  data.tar.gz: da87ac500d4d0f26bdeb4ff3249afacd1e34d594bb2f4e18bff1c1c4dd818e64
+  metadata.gz: ceb99aac4328e67769eebf0c137e9e2f8412bbfc65c51c0757906f7e5e1ce88f
+  data.tar.gz: 7bd420cb85700ace2a34e6e0460ee5f63f8a9b1530264f8b1f5d4a8f7f4583e3
 SHA512:
-  metadata.gz: 0dd4bce3f8c250ed256e4362e6337f8ddee38c2865b9aba9ae7153066b1fb4d34f0fb324714626b4787011fde4118b1bc3f80a487865e2ee409248aebb44375f
-  data.tar.gz: a65805c594f8d0823ce2df36a1b9d2f5c00e7b5ff71d3a178c1b8d7cc5f24a0f69d09d5d254d8bd16479d9c476b3ac14f67d097ea28efb2ccc7d89fd34f6dcec
+  metadata.gz: a8225fdd2f9208f17b2feeb832d03ed7bbb0fd5669bfd875fccdff579d05050a846f229996ccdce028e028d47b48cc70f24355b7a9384409d99c77e31a0a4a62
+  data.tar.gz: 0c5e2b51e492c0a56772ff6a9ed4309924a2da19e3a973c60782b1182605be59cec2cc3b10cc4c20a1641c21ae8102d9d37c3a6b00549fcf0e6a2b6347e84430

data/lib/klenod/build/plugins/google_fonts_plugin/font_metrics.json

@@ -1106,6 +1106,15 @@
     "unitsPerEm": 1000,
     "xWidthAvg": 362
   },
+  "Asap Sharp": {
+    "familyName": "Asap Sharp",
+    "category": "sans-serif",
+    "ascent": 934,
+    "descent": -212,
+    "lineGap": 0,
+    "unitsPerEm": 1000,
+    "xWidthAvg": 442
+  },
   "Asar": {
     "familyName": "Asar",
     "category": "serif",
@@ -2537,6 +2546,15 @@
     "unitsPerEm": 16,
     "xWidthAvg": 8
   },
+  "Caacupe One": {
+    "familyName": "Caacupe One",
+    "category": "display",
+    "ascent": 960,
+    "descent": -340,
+    "lineGap": 0,
+    "unitsPerEm": 1000,
+    "xWidthAvg": 309
+  },
   "Cabin": {
     "familyName": "Cabin",
     "category": "sans-serif",
@@ -8187,7 +8205,7 @@
     "descent": -120,
     "lineGap": 0,
     "unitsPerEm": 1000,
-    "xWidthAvg": 311
+    "xWidthAvg": 313
   },
   "Macondo": {
     "familyName": "Macondo",
@@ -14993,6 +15011,15 @@
     "unitsPerEm": 1000,
     "xWidthAvg": 457
   },
+  "Scoutie Sans": {
+    "familyName": "Scoutie Sans",
+    "category": "sans-serif",
+    "ascent": 2000,
+    "descent": -600,
+    "lineGap": 0,
+    "unitsPerEm": 2000,
+    "xWidthAvg": 920
+  },
   "Seaweed Script": {
     "familyName": "Seaweed Script",
     "category": "display",
@@ -16847,6 +16874,15 @@
     "unitsPerEm": 1000,
     "xWidthAvg": 400
   },
+  "Valley Sans": {
+    "familyName": "Valley Sans",
+    "category": "sans-serif",
+    "ascent": 960,
+    "descent": -240,
+    "lineGap": 0,
+    "unitsPerEm": 1000,
+    "xWidthAvg": 487
+  },
   "Vampiro One": {
     "familyName": "Vampiro One",
     "category": "display",

data/lib/klenod/build/plugins/google_fonts_plugin/font_metrics.txt

@@ -5,7 +5,7 @@ Update them to the latest Capsize revision from the Klenod repository root:
     bundle exec rake google_fonts:metrics:update
 
 Project: https://github.com/seek-oss/capsize
-Commit: b0eb891c39e2ecd8b680f550bcda6f5fe9e38326
+Commit: 8df97f098adc19d8a6d33df301757d7e9670bae6
 Source: packages/metrics/src/entireMetricsCollection.json
 
 MIT License

data/lib/klenod/build/plugins/haml_plugin/parser.rb

@@ -46,6 +46,7 @@ module Klenod
           # invalid attribute list. Join the lines of an unclosed list first so
           # both forms work across lines.
           def parse_new_attributes(text)
+            tag_prefix = @line.text.strip[/\A[^(]*/]
             joined_lines = 0
             until (close_index = attribute_list_close_index(text)) || @next_line.eod?
               text = "#{text} #{@next_line.text}"
@@ -56,7 +57,13 @@ module Klenod
             pairs = close_index && extended_attribute_pairs(text[1...close_index])
             rest = close_index && text[(close_index + 1)..]
             unless pairs&.any? { |_name, value| value.match?(/[.\[]/) }
-              attributes, rest, last_line = super
+              begin
+                attributes, rest, last_line = super
+              rescue ::Haml::SyntaxError => error
+                raise unless pairs && error.message.start_with?("Invalid attribute list")
+
+                raise ::Haml::SyntaxError.new("#{error.message}\n\n#{hash_attributes_hint(tag_prefix, pairs)}", error.line)
+              end
               return [attributes, rest, last_line + joined_lines]
             end
 
@@ -147,6 +154,19 @@ module Klenod
             pairs
           end
 
+          # Every value is valid Ruby, but some are neither Haml's bare variables
+          # nor the member and index expressions handled above. Suggest the
+          # equivalent hash attributes, which accept any Ruby expression.
+          def hash_attributes_hint(tag_prefix, pairs)
+            entries = pairs.map do |name, value|
+              key = name.match?(/\A[a-z_]\w*\z/i) ? name : name.inspect
+              "#{key}: #{value}"
+            end
+            tag_prefix = "" unless tag_prefix.match?(/\A[%.#][-:\w.#]*\z/)
+
+            "Hint:\n  Use {} attributes for Ruby expressions: #{tag_prefix}{#{entries.join(", ")}}"
+          end
+
           # Returns the index of the `)` that closes the list opened at index 0,
           # ignoring brackets inside quoted values.
           def attribute_list_close_index(source)

data/lib/klenod/build/version.rb

@@ -2,6 +2,6 @@
 
 module Klenod
   module Build
-    VERSION = "0.0.24"
+    VERSION = "0.0.25"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-build
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Andrés Alin
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        version: 0.0.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        version: 0.0.25
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement