view_source_map 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fec1025cecc36c2e8e26e9af8e7e0cde28544221a4b3f95a6daf7cd82cb7b748
-  data.tar.gz: 7fcb6540bd380f80ec145532e19f967dd463851c9c6486f215df6ea6cc9342e6
+  metadata.gz: 91288add88dcab6f1f5dadc04c3ae970465e05a993835e8c0f0d9204b52ad975
+  data.tar.gz: 1fbda5300ce5b8bf210a82869293d11ca5d93048b88d6c519fd3e94d5aed6862
 SHA512:
-  metadata.gz: 555b0ee72870318f96dae8319827764056f9c8a2b0e8fd0bb5269d7a692c32ddcc3db1701ce132f7d08e353f3493a0b9b3596bcb6e5ae8f2b7f4633c60704183
-  data.tar.gz: 592bf9032aecd3f4039ca277b3e6a1eccbb821fb582f7ff90423c82f58189df354fe37f886a7757df626d80991227e80fcfce9c6a0adfbcf391105ed2dbdc494
+  metadata.gz: 9739c9992f1098b0fe5f1c5a67f6dc34732fdd237dafd0447a4a3d61c51cd8ca9e56453124f1369876abe6e981c88659e9e50efd53e0d8cba1f1c2b185378816
+  data.tar.gz: 8def99e9ff8a6a31bd77c9dedcada9014d3d9e5f9cd7a47f19e1518344c7b3c11c14efd3b19e9887f4cc0894ededbdc9b74cde60a92e128e41f254da58b17ca7

data/lib/view_source_map.rb

@@ -1,62 +1,12 @@
-module ViewSourceMap
-  class Railtie < Rails::Railtie
-    initializer "render_with_path_comment.initialize" do
-      if !ENV["DISABLE_VIEW_SOURCE_MAP"] && Rails.env.development?
-        ViewSourceMap.attach
-      end
-    end
-  end
-
-  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.rendered_format == :html
-          if options[:layout]
-            name = "#{options[:layout]}(layout)"
-          else
-            return content unless @template.respond_to?(:identifier)
-            path = Pathname.new(@template.identifier)
-            name = path.relative_path_from(Rails.root)
-          end
-          "<!-- BEGIN #{name} -->\n#{content}<!-- END #{name} -->".html_safe
-        else
-          content
-        end
-      end
-      alias_method :render_without_path_comment, :render
-      alias_method :render, :render_with_path_comment
-    end
+require 'view_source_map/railtie'
 
-    ActionView::TemplateRenderer.class_eval do
-      def render_template_with_path_comment(template, layout_name = nil, locals = {})
-        view, locals = @view, locals || {}
-
-        render_with_layout(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.rendered_format == :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
+if Rails.gem_version >= Gem::Version.new('6')
+  require 'view_source_map_rails_6'
+else
+  require 'view_source_map_rails_4_and_5'
+end
 
+module ViewSourceMap
   def self.detach
     return unless @attached
     @attached = false

data/lib/view_source_map/railtie.rb

@@ -0,0 +1,9 @@
+module ViewSourceMap
+  class Railtie < Rails::Railtie
+    initializer "render_with_path_comment.initialize" do
+      if !ENV["DISABLE_VIEW_SOURCE_MAP"] && Rails.env.development?
+        ViewSourceMap.attach
+      end
+    end
+  end
+end

data/lib/view_source_map/version.rb

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

data/lib/view_source_map_rails_4_and_5.rb

@@ -0,0 +1,52 @@
+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.rendered_format == :html
+          if options[:layout]
+            name = "#{options[:layout]}(layout)"
+          else
+            return content unless @template.respond_to?(:identifier)
+            path = Pathname.new(@template.identifier)
+            name = path.relative_path_from(Rails.root)
+          end
+          "<!-- BEGIN #{name} -->\n#{content}<!-- END #{name} -->".html_safe
+        else
+          content
+        end
+      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(template, layout_name = nil, locals = {})
+        view, locals = @view, locals || {}
+
+        render_with_layout(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.rendered_format == :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
+end

data/lib/view_source_map_rails_6.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.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 description: This is a Rails plugin to insert the path name of a rendered partial
   view as HTML comment in development environment
 email:
@@ -50,7 +36,10 @@ files:
 - README.md
 - Rakefile
 - lib/view_source_map.rb
+- lib/view_source_map/railtie.rb
 - lib/view_source_map/version.rb
+- lib/view_source_map_rails_4_and_5.rb
+- lib/view_source_map_rails_6.rb
 homepage: https://github.com/r7kamura/view_source_map
 licenses: []
 metadata: {}