floatable-rails 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edb701a8b2d34308e5a086f5a01943c3e0e240278367f79315e1dbcff3bb7937
-  data.tar.gz: '0982c58d7ffea82bae36e0119af731daa15e6e5a239a10ae3dffa79b7801a30e'
+  metadata.gz: 9288ca577a553f70abaa3928fe8dd0ac842f080a3ac4408e478fcac5c2d27c2f
+  data.tar.gz: 2947208f0c7d70d327da7ddd8d89504c92526bc142240c82ce8409af85902d63
 SHA512:
-  metadata.gz: 9a94cc87a936389b7f2c314308007169e749c33a4af2d45f355de8c4713915205a4d1368245db70573a6a8e9566f86456a88ce51d9d91f6aee83736de111447c
-  data.tar.gz: 25ff3bc99798da03cb4121b4d6e27f0d27eaf92ab7e38af66b3d11d580d5b3693cc2bcc81f59182c8c9615c301caad6ad39e2a79f3870bd57bb8b2f7b8c55bd2
+  metadata.gz: 158ba1e2e4b3d4a17891907c5cd5af51b428707add8b9d42950dea39d897689961b07e5d02f290bcef9ded34cf8587d99bf3f4e095367ba37151f5bf4088cfee
+  data.tar.gz: 746df7f292f50792d22366625b04d60e5a9ba5c09335a3bd0f68f6fc421d84ce81bf6bec8369c6924ca9e472e1e735de34cac12ea0f02fac12416ee5370b2a9a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.4
+
+- Fix Slim marker insertion to avoid interfering with block rendering.
+
 ## 0.1.3
 
 - Add `instrumentation_enabled` config to toggle HTML instrumentation separately from script injection.

data/lib/floatable/rails/slim_view_instrumentation.rb

@@ -10,42 +10,39 @@ module Floatable
 
         first_non_empty = lines.index { |l| !l.strip.empty? } || 0
 
-        # Keep optional Slim headers (doctype/html) at the very top if present.
-        doctype_idx = if lines[first_non_empty]&.lstrip&.match?(/\A(doctype\b|!!!\b)/)
-          first_non_empty
-        end
-
-        html_idx = nil
-        if doctype_idx
-          rel = lines[(doctype_idx + 1)..].to_a.index { |l| !l.strip.empty? && l.lstrip.match?(/\Ahtml\b/) }
-          html_idx = rel ? (doctype_idx + 1 + rel) : nil
-        end
+        # Keep optional Slim headers (doctype) at the very top if present.
+        doctype_idx =
+          if lines[first_non_empty]&.lstrip&.match?(/\A(doctype\b|!!!\b)/)
+            first_non_empty
+          end
 
-        insert_after = html_idx || doctype_idx || first_non_empty
-        insert_after = [ insert_after, lines.length - 1 ].min
+        # Insert before the first real line to avoid nesting inside blocks.
+        insert_at = doctype_idx ? (doctype_idx + 1) : first_non_empty
+        insert_at = [ insert_at, lines.length ].min
 
-        # Choose indentation that won't break Slim parsing.
         marker_indent =
-          begin
-            next_non_empty = lines[(insert_after + 1)..].to_a.find { |l| !l.strip.empty? }
-            if next_non_empty
-              next_non_empty[/\A[ \t]*/] || ""
-            else
-              base_line = lines[insert_after] || ""
-              (base_line[/\A[ \t]*/] || "") + "  "
-            end
+          if insert_at < lines.length
+            lines[insert_at].to_s[/\A[ \t]*/] || ""
+          else
+            lines[first_non_empty].to_s[/\A[ \t]*/] || ""
           end
 
-        begin_marker = "#{marker_indent}== (Thread.current[:floatable_enabled] && defined?(@output_buffer)) ? '<!-- #{::Floatable::Rails::VIEW_COMMENT_BEGIN} #{view_path} -->' : ''"
-        end_marker = "#{marker_indent}== (Thread.current[:floatable_enabled] && defined?(@output_buffer)) ? '<!-- #{::Floatable::Rails::VIEW_COMMENT_END} #{view_path} -->' : ''"
+        begin_marker = [
+          "#{marker_indent}- (@output_buffer.safe_concat('<!-- #{::Floatable::Rails::VIEW_COMMENT_BEGIN} #{view_path} -->') if Thread.current[:floatable_enabled] && defined?(@output_buffer)); nil"
+        ]
+        end_marker = [
+          "#{marker_indent}- (@output_buffer.safe_concat('<!-- #{::Floatable::Rails::VIEW_COMMENT_END} #{view_path} -->') if Thread.current[:floatable_enabled] && defined?(@output_buffer)); nil"
+        ]
 
         out = []
         lines.each_with_index do |line, idx|
+          out.concat(begin_marker) if idx == insert_at
           out << line
-          out << begin_marker if idx == insert_after
         end
 
-        out << end_marker
+        out.concat(begin_marker) if insert_at == lines.length
+
+        out.concat(end_marker)
         out.join("\n")
       end
     end

data/lib/floatable/rails/version.rb

@@ -1,5 +1,5 @@
 module Floatable
   module Rails
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: floatable-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tobias Almstrand