klenod-build 0.0.18 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b36ee8205987d239a6301d55da7f4ef92548303139d04b5bbc2246ba6e94e8e3
-  data.tar.gz: 8f6db6e13f72e4b290b91d115df9e38e8e907100db677baea5a5fec047bc6ae0
+  metadata.gz: 9bbeb7b858f12c3e373b4ddfc2a1d1c097048c84a24bf62babdd9b6abfad0903
+  data.tar.gz: 743d7dbbb2850cb175e0ba54dafd2989fd66a2c7ad653338d989f7953a6b50e6
 SHA512:
-  metadata.gz: d9572bdc8295bfa42c28a88057e6625d1b105cfb8b7c9f51bc7d426ffb0e090c472237f86f549258da64b1095931921e5259a78a41050590b4d67254c92590c5
-  data.tar.gz: e4b49528fe297b00c61d9f45bd8b780e88d485c9c3c4e1f37c1a28ce63ee128af0c64bccdaa68567197f0aa5beae51f568fd4371cb4d4a273c82ca7204a73b19
+  metadata.gz: 39651b21e98ac61f0f4f1e2f014f036a815b317d21107b6422d20767a6e0117227f640ad19c1436251a58b8c4a1e7b7d8c2c52b26776b0ce28e6d9a8a0199332
+  data.tar.gz: 1d4c523e9fff5640b5bf724067c924bfc8f869aca77633e5566388de5365ec6d114cf92972b5737a2067f8ac4d2064911c4df8f9e3d0115bd8839a0829d1a78b

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

@@ -46,9 +46,12 @@ module Klenod
                 end
 
                 def self.normalize_prop_key(key)
-                  return key if key.is_a?(Symbol) && !key.to_s.include?("-")
+                  return key if key.is_a?(Symbol)
 
-                  key.to_s.tr("-", "_").to_sym
+                  name = key.to_s
+                  return key if name.include?("-")
+
+                  name.to_sym
                 end
 
                 def self.collect_class_values(classes, value)

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

@@ -89,7 +89,10 @@ module Klenod
 
               index += name.length
               index += 1 while source[index]&.match?(/\s/)
-              return nil unless source[index] == "="
+              unless source[index] == "="
+                pairs << [name, "true"]
+                next
+              end
 
               index += 1
               index += 1 while source[index]&.match?(/\s/)
@@ -114,14 +117,14 @@ module Klenod
                   when "(", "[", "{" then depth += 1
                   when ")", "]", "}" then depth -= 1
                   when " ", "\t"
-                    break if depth.zero? && source[index..].match?(/\A\s+[-:@#\w.]+\s*=/)
+                    break if depth.zero? && attribute_boundary?(source[index..])
                   end
                 end
                 index += 1
               end
 
               value = source[value_start...index].strip
-              return nil if value.empty? || depth.negative? || quote
+              return nil if value.empty? || depth.negative? || quote || !Ripper.sexp(value)
 
               pairs << [name, value]
             end
@@ -129,6 +132,23 @@ module Klenod
             pairs
           end
 
+          def attribute_boundary?(remaining_source)
+            attribute_sequence?(remaining_source)
+          end
+
+          def attribute_sequence?(source)
+            source = source.lstrip
+            name = source.match(/\A[-:@#\w.]*\w[-:@#\w.]*/)&.to_s
+            return false unless name
+            return false if %w[true false nil].include?(name)
+
+            rest = source[name.length..]
+            return true if rest.empty? || rest.lstrip.start_with?("=")
+            return false unless rest.start_with?(" ", "\t")
+
+            attribute_sequence?(rest)
+          end
+
           def literal_class_names_from_old_attributes(source)
             parsed = ::Haml::AttributeParser.parse(source)
             return [] unless parsed&.key?("class")

data/lib/klenod/build/version.rb

@@ -2,6 +2,6 @@
 
 module Klenod
   module Build
-    VERSION = "0.0.18"
+    VERSION = "0.0.20"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-build
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.20
 platform: ruby
 authors:
 - Andrés Alin
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.18
+        version: 0.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.18
+        version: 0.0.20
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
@@ -46,7 +46,7 @@ dependencies:
         version: 0.95.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.104.0
+        version: 0.106.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: 0.95.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.104.0
+        version: 0.106.0
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement