view_source_map 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91288add88dcab6f1f5dadc04c3ae970465e05a993835e8c0f0d9204b52ad975
-  data.tar.gz: 1fbda5300ce5b8bf210a82869293d11ca5d93048b88d6c519fd3e94d5aed6862
+  metadata.gz: f923daab2e503883194ea18ae3b22910194657bd2204f8ca500eea302bf16e85
+  data.tar.gz: c93b843812ea243aa14aba360220e38e0cecb769bf065ab5ac62944070b52122
 SHA512:
-  metadata.gz: 9739c9992f1098b0fe5f1c5a67f6dc34732fdd237dafd0447a4a3d61c51cd8ca9e56453124f1369876abe6e981c88659e9e50efd53e0d8cba1f1c2b185378816
-  data.tar.gz: 8def99e9ff8a6a31bd77c9dedcada9014d3d9e5f9cd7a47f19e1518344c7b3c11c14efd3b19e9887f4cc0894ededbdc9b74cde60a92e128e41f254da58b17ca7
+  metadata.gz: 8a24d8e8bd7a2179811fe387737b6a58728d5986d8c19a7a6dff417448bc13a2f0fa8b015a21cc5c31a03b7294aeccb6590e7c794390870f52a7fc638bc203a9
+  data.tar.gz: ec45b183e48a0d735fc6cbe3eecc3df082675c5c51402b24c799f8fdc27c5dc4e85578de0fbf961530b4260f336d1cee32daae9e94c885b5f6dae5c7ed701be5

data/lib/view_source_map.rb

@@ -1,7 +1,9 @@
 require 'view_source_map/railtie'
 
-if Rails.gem_version >= Gem::Version.new('6')
+if Rails.gem_version >= Gem::Version.new('6.1')
   require 'view_source_map_rails_6'
+elsif Rails.gem_version >= Gem::Version.new('6.0')
+  require 'view_source_map_rails_6_0'
 else
   require 'view_source_map_rails_4_and_5'
 end

data/lib/view_source_map/version.rb

@@ -1,3 +1,3 @@
 module ViewSourceMap
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/view_source_map_rails_6.rb

@@ -4,18 +4,18 @@ module ViewSourceMap
     @attached = true
 
     ActionView::PartialRenderer.class_eval do
-      def render_with_path_comment(context, options, block)
-        content = render_without_path_comment(context, options, block)
-        return content if ViewSourceMap.force_disabled?(options)
+      def render_with_path_comment(partial, context, block)
+        content = render_without_path_comment(partial, context, block)
+        return content if ViewSourceMap.force_disabled?(@options)
 
         if @lookup_context.formats.first == :html
           case content
           when ActionView::AbstractRenderer::RenderedCollection
             content.rendered_templates.each do |rendered_template|
-              ViewSourceMap.wrap_rendered_template(rendered_template, options)
+              ViewSourceMap.wrap_rendered_template(rendered_template, @options)
             end
           when ActionView::AbstractRenderer::RenderedTemplate
-            ViewSourceMap.wrap_rendered_template(content, options)
+            ViewSourceMap.wrap_rendered_template(content, @options)
           end
         end
         content
@@ -27,7 +27,11 @@ module ViewSourceMap
     ActionView::TemplateRenderer.class_eval do
       def render_template_with_path_comment(view, template, layout_name, locals)
         render_with_layout(view, template, layout_name, locals) do |layout|
-          instrument(:template, identifier: template.identifier, layout: layout.try(:virtual_path)) do
+          ActiveSupport::Notifications.instrument(
+            'render_template.action_view',
+            identifier: template.identifier,
+            layout: layout.try(:virtual_path),
+          ) do
             content = template.render(view, locals) { |*name| view._layout_for(*name) }
             return content if ViewSourceMap.force_disabled?(locals)
 

data/lib/view_source_map_rails_6_0.rb

@@ -0,0 +1,69 @@
+module ViewSourceMap
+  def self.attach
+    return if defined?(@attached) && @attached
+    @attached = true
+
+    ActionView::PartialRenderer.class_eval do
+      def render_with_path_comment(context, options, block)
+        content = render_without_path_comment(context, options, block)
+        return content if ViewSourceMap.force_disabled?(options)
+
+        if @lookup_context.formats.first == :html
+          case content
+          when ActionView::AbstractRenderer::RenderedCollection
+            content.rendered_templates.each do |rendered_template|
+              ViewSourceMap.wrap_rendered_template(rendered_template, options)
+            end
+          when ActionView::AbstractRenderer::RenderedTemplate
+            ViewSourceMap.wrap_rendered_template(content, options)
+          end
+        end
+        content
+      end
+      alias_method :render_without_path_comment, :render
+      alias_method :render, :render_with_path_comment
+    end
+
+    ActionView::TemplateRenderer.class_eval do
+      def render_template_with_path_comment(view, template, layout_name, locals)
+        render_with_layout(view, template, layout_name, locals) do |layout|
+          instrument(:template, identifier: template.identifier, layout: layout.try(:virtual_path)) do
+            content = template.render(view, locals) { |*name| view._layout_for(*name) }
+            return content if ViewSourceMap.force_disabled?(locals)
+
+            path = Pathname.new(template.identifier)
+
+            if @lookup_context.formats.first == :html && path.file?
+              name = path.relative_path_from(Rails.root)
+              "<!-- BEGIN #{name} -->\n#{content}<!-- END #{name} -->".html_safe
+            else
+              content
+            end
+          end
+        end
+      end
+      alias_method :render_template_without_path_comment, :render_template
+      alias_method :render_template, :render_template_with_path_comment
+    end
+  end
+
+  # @private
+  # @param [ActionView::AbstractRenderer::RenderedTemplate] rendered_template
+  # @param [Hash] options Options passed to #render method.
+  def self.wrap_rendered_template(rendered_template, options)
+    name = begin
+      if options[:layout]
+        "#{options[:layout]}(layout)"
+      elsif rendered_template.template.respond_to?(:identifier)
+        Pathname.new(rendered_template.template.identifier).relative_path_from(Rails.root)
+      end
+    end
+
+    if name
+      rendered_template.instance_variable_set(
+        :@body,
+        "<!-- BEGIN #{name} -->\n#{rendered_template.body}<!-- END #{name} -->".html_safe
+      )
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_source_map
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2020-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -40,6 +40,7 @@ files:
 - lib/view_source_map/version.rb
 - lib/view_source_map_rails_4_and_5.rb
 - lib/view_source_map_rails_6.rb
+- lib/view_source_map_rails_6_0.rb
 homepage: https://github.com/r7kamura/view_source_map
 licenses: []
 metadata: {}
@@ -58,8 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Rails plugin to view source map