floatable-rails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad3e03eaeceb57403d07ba57454e2227c3d0190605eee0a77e46431800e83c44
-  data.tar.gz: 07a2ea3745784a0a864ce4423d2e74f2fa6707297f81eac782e1b0215144191f
+  metadata.gz: 7d7ba3f4dd67001b178b9cc2ce798c344f93f1f6048835797d50ab30e3b8b233
+  data.tar.gz: 6ac0062262bb636e6e53db639f9cf5ae4efa3abeace90203c93691ccf205b6cc
 SHA512:
-  metadata.gz: 9264dfb773215371f885c0e0e873a9d813316f8087d39fcf4ac4fd7a281196e3fae94471d39bca485518c4f5c07801ee4e757e19a0f05ddb52fb133cc9a03f79
-  data.tar.gz: e0d206d8866f8d9651476c79c522b39f6e81ab6500d810a947e260b70230e746236b650df8ec7d8227565d51a8c6d81e8aa18146db87279cf2dba13edfe1e252
+  metadata.gz: 0f446eb455149fd63b77525932f3d61e978f898c687e373218b538e06f307fce16e289073616c4e41b75de9ba55f60b718a1928506399f1793c77d4df0408c97
+  data.tar.gz: 0cfa54163524653e4f0624c17f6677c0ba686e1ef904d168dd7868076ab21a2913d0c3974c9be6801767acaaab2dc83586dfba309128755122b0b1fb071fc298

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.2
+
+- Fix Slim instrumentation for doctype/header structure, filters, and control-flow continuations.
+
 ## 0.1.1
 
 - Relax Rails dependency to allow earlier versions.

data/lib/floatable/rails/response_middleware.rb

@@ -35,6 +35,9 @@ module Floatable
         [ status, headers, [ final_html ] ]
       rescue => e
         ::Rails.logger.error("[Floatable::Rails::ResponseMiddleware] failed: #{e.class} - #{e.message}")
+        status ||= 500
+        headers ||= {}
+        body ||= []
         [ status, headers, body ]
       end
 

data/lib/floatable/rails/slim_line_instrumentation.rb

@@ -5,16 +5,70 @@ module Floatable
     module SlimLineInstrumenter
       def self.instrument(source, view_path)
         lines = source.to_s.split("\n", -1)
+        first_non_empty = lines.index { |line| !line.strip.empty? }
+        doctype_index = if first_non_empty && lines[first_non_empty].lstrip.match?(/\A(doctype\b|!!!\b)/)
+          first_non_empty
+        end
+        html_index = nil
+        if doctype_index
+          html_index = lines[(doctype_index + 1)..].to_a.index { |line| !line.strip.empty? && line.lstrip.match?(/\Ahtml\b/) }
+          html_index = html_index ? html_index + doctype_index + 1 : nil
+        end
+        header_index = html_index || doctype_index
+        marker_indent = ""
+        if header_index
+          next_non_empty = lines[(header_index + 1)..].to_a.find { |line| !line.strip.empty? }
+          marker_indent = next_non_empty ? (next_non_empty[/\A[ \t]*/] || "") : ((lines[header_index][/\A[ \t]*/] || "") + "  ")
+        end
         out = []
-        out << "- @output_buffer.safe_concat('<!-- BEGIN #{view_path} -->') if Thread.current[:floatable_enabled] && defined?(@output_buffer)"
+        begin_marker = "#{marker_indent}== (Thread.current[:floatable_enabled] && defined?(@output_buffer)) ? '<!-- BEGIN #{view_path} -->' : ''"
+        end_marker = "#{marker_indent}== (Thread.current[:floatable_enabled] && defined?(@output_buffer)) ? '<!-- END #{view_path} -->' : ''"
+        out << begin_marker if header_index.nil?
+        filter_indent = nil
 
         lines.each_with_index do |line, idx|
+          if header_index && idx < header_index
+            out << line
+            next
+          end
+
+          if header_index && idx == header_index
+            out << line
+            out << begin_marker
+            next
+          end
+
           indent = line[/\A[ \t]*/] || ""
-          out << "#{indent}- @output_buffer.safe_concat('<!--#{ErbLineInstrumentation::LINE_MARKER_PREFIX}#{idx + 1}-->') if Thread.current[:floatable_enabled] && defined?(@output_buffer)"
+          indent_level = indent.size
+          stripped = line.lstrip
+          if stripped.empty?
+            out << line
+            next
+          end
+
+          if stripped.match?(/\A-\s*(else|elsif|when|rescue|ensure)\b/)
+            out << line
+            next
+          end
+
+          if filter_indent && indent_level > filter_indent
+            out << line
+            next
+          end
+
+          filter_indent = nil if filter_indent && indent_level <= filter_indent
+
+          if stripped.match?(/\A[a-zA-Z_][\w-]*:\s*\z/) && !stripped.start_with?("-", "=", "|")
+            filter_indent = indent_level
+            out << line
+            next
+          end
+
+          out << "#{indent}== (Thread.current[:floatable_enabled] && defined?(@output_buffer)) ? '<!--#{ErbLineInstrumentation::LINE_MARKER_PREFIX}#{idx + 1}-->' : ''"
           out << line
         end
 
-        out << "- @output_buffer.safe_concat('<!-- END #{view_path} -->') if Thread.current[:floatable_enabled] && defined?(@output_buffer)"
+        out << end_marker
         out.join("\n")
       end
     end

data/lib/floatable/rails/version.rb

@@ -1,5 +1,5 @@
 module Floatable
   module Rails
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

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