klenod-build 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58fe212ce18825d676c6661925007d46a8e7c68785f1c4b2af82e377fdc25f94
-  data.tar.gz: fa1abefa0576d6e2944bb240597f10abc979e19004af881c4c8bc90e261a3d5c
+  metadata.gz: 971caae6ad82448ab179cd8dc98c0920ac4422a2eea50a11d9a67c1097ecda7c
+  data.tar.gz: 8b1e33ab86a8c09a8a659d3caf68cf093b5adb7f33b3c6d988a85913ca865bbd
 SHA512:
-  metadata.gz: d2178c1a71530cbc648000abf216ee1f72495006bf41626e0c9e592dda97985921fb41e4714c10ff08e87889b1d7ab6334815531922248d5ac51dcf155177732
-  data.tar.gz: 0ddc8e894a70a6cf94aa9100ded80f4833c1ce64824ea10557a1dcf1cb2f2e7aff89bb2084763222f81559b1a04d33229bda4bcd98bfedb537d73ea334cc0aa6
+  metadata.gz: a664ddf7e161448788a7c5b3c8680acb07b12a16edeaccf9640cd260d8613457e096621ec2649ad3c7c6196364d353436bad856de1e390cb61a45142d6f7423e
+  data.tar.gz: eedab53d4360f66b32ff8397f280ce57b9d620d5a54fed5379a7aece96444cea1ef6a98219f5964fa2b7c931b5fce55f252ca62207f3a038bce9d314791e166f

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

@@ -216,7 +216,7 @@ module Klenod
             measure_compile(:haml_build_expression_list) { builder.expressions(expressions) }
           end
 
-          def compile_node_expressions(nodes, factory:, builder:, markdown_compiler:, styleable: false)
+          def compile_node_expressions(nodes, factory:, builder:, markdown_compiler:, styleable: false, join_adjacent_plain_text: false)
             expressions = []
             previous_node = nil
             index = 0
@@ -224,7 +224,21 @@ module Klenod
             while index < nodes.length
               node = nodes[index]
 
-              if script_node?(node) && !continuation?(node)
+              if join_adjacent_plain_text && node.type == :plain
+                plain_nodes = [node]
+                index += 1
+
+                while index < nodes.length && nodes[index].type == :plain
+                  plain_nodes << nodes[index]
+                  index += 1
+                end
+
+                text = plain_nodes.map { it.value.fetch(:text).strip }.reject(&:empty?).join(" ")
+                next if text.empty?
+
+                expression = builder.marked_expression(source_mark(plain_nodes.first, builder: builder), builder.literal(text))
+                node = plain_nodes.last
+              elsif script_node?(node) && !continuation?(node)
                 group = [node]
                 index += 1
 
@@ -453,7 +467,14 @@ module Klenod
             unless node.children.empty?
               children.concat(
                 measure_compile_detail(:haml_compile_tag_children) do
-                  compile_node_expressions(node.children, factory: factory, styleable: styleable, builder: builder, markdown_compiler: markdown_compiler)
+                  compile_node_expressions(
+                    node.children,
+                    factory: factory,
+                    styleable: styleable,
+                    builder: builder,
+                    markdown_compiler: markdown_compiler,
+                    join_adjacent_plain_text: true
+                  )
                 end
               )
             end
@@ -602,35 +623,40 @@ module Klenod
 
           def dynamic_attributes(node, builder:, props:)
             dynamic_attributes = node.value.fetch(:dynamic_attributes)
-            source = dynamic_attributes.old || dynamic_attributes.new
-            return {} unless source
+            sources = [dynamic_attributes.new, dynamic_attributes.old].compact
+            return {} if sources.empty?
 
             measure_compile(:haml_compile_dynamic_attributes) do
-              source = builder.line_rewritten_source(source, node.line)
-              simple = simple_dynamic_attributes(source, builder: builder) unless @event_handler
-              if simple
-                simple.each { |key, value| props[key] = value }
-                return simple
-              end
-
-              hash = builder.hash_expression(source, line_no: node.line)
-              unless hash
-                builder.ruby_parse_error(source, line_no: node.line, context: "Could not parse Haml dynamic attributes")
-              end
-
               dynamic = {}
-              hash.node.assocs.each do |assoc|
-                if assoc.is_a?(SyntaxTree::AssocSplat)
-                  splat_source = hash.source[assoc.value.location.start_char...assoc.value.location.end_char]
-                  props[ATTRIBUTE_SPLATS_KEY] ||= []
-                  props[ATTRIBUTE_SPLATS_KEY] << builder.expression(splat_source)
+              sources.each do |source|
+                source = builder.line_rewritten_source(source, node.line)
+                simple = simple_dynamic_attributes(source, builder: builder) unless @event_handler
+                if simple
+                  simple.each do |key, value|
+                    dynamic[key] = value
+                    props[key] = value
+                  end
                   next
                 end
 
-                key = attribute_key(assoc.key, builder: builder)
-                value = event_handler_value(key, assoc.value, builder: builder) || attribute_value(assoc, builder: builder)
-                dynamic[key] = value
-                props[key] = value
+                hash = builder.hash_expression(source, line_no: node.line)
+                unless hash
+                  builder.ruby_parse_error(source, line_no: node.line, context: "Could not parse Haml dynamic attributes")
+                end
+
+                hash.node.assocs.each do |assoc|
+                  if assoc.is_a?(SyntaxTree::AssocSplat)
+                    splat_source = hash.source[assoc.value.location.start_char...assoc.value.location.end_char]
+                    props[ATTRIBUTE_SPLATS_KEY] ||= []
+                    props[ATTRIBUTE_SPLATS_KEY] << builder.expression(splat_source)
+                    next
+                  end
+
+                  key = attribute_key(assoc.key, builder: builder)
+                  value = event_handler_value(key, assoc.value, builder: builder) || attribute_value(assoc, builder: builder)
+                  dynamic[key] = value
+                  props[key] = value
+                end
               end
               dynamic
             end

data/lib/klenod/build/version.rb

@@ -2,6 +2,6 @@
 
 module Klenod
   module Build
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

metadata

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