frails 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 322669f68bd84081e8486c39f5fb28a531603a3a059044556c6d4ede45c13893
-  data.tar.gz: 334028b2e58f8ecb973623f8a13cfe9cd1ec92a5d4eb8ff374570f279f01996c
+  metadata.gz: 4a5dc3c71ad5adadae28c1dd72b8b2dbff630c6b51d93084b3dce0b6902eed42
+  data.tar.gz: 580fe686a4e0e93779571144fbc3ccd9d55398cb1a67683310068310903954bf
 SHA512:
-  metadata.gz: 4f98d83b83354a19a6d6469cc16704fcf1053623e0ff2862515c313795a65d9318eafe8d804aaf2852ff54c7a462f68eb6d1093292fe244c59e77eab74d50b06
-  data.tar.gz: 6818327395fb917c763dc9d93179f95b39cf846b3c215583195885639d031e617a3bc3993450fb2ad780ac43efff7f519a856a469cba338088094103b56c3c27
+  metadata.gz: 28ee475ad7e401f72434510f8ed2fce9d05ecf57640ab13f7655e897b3995d3f422d9dfdec946f763c88cf7ce0282c531d280da23c641040ea39708923618ece
+  data.tar.gz: a3142865ffd21446af2f877c30938fe6b91ea3eedf550d6dc585478ed6c87f15fa7b7fa7e3676f9592ea68cd8580529c4af35cd07e61976d62e557a8298d22a6

data/README.md

@@ -100,11 +100,12 @@ image_pack_tag 'logo.png'
 Frails has the ability to automatically include your Javascript and CSS based on the current layout
 and/or view. It even supports side loading partials.
 
-Just add the following tio your `ApplicationController`:
+Just set the `side_load_assets` class variable to your `ApplicationController`, or indeed to any
+controller.
 
 ```ruby
 class ApplicationController < ActionController::Base
-  side_load_assets
+  self.side_load_assets = true
 end
 ```
 

data/lib/frails/helper.rb

@@ -2,31 +2,24 @@
 
 module Frails::Helper
   def render(options = {}, locals = {}, &block)
+    sload_assets = respond_to?(:side_load_assets?) ? side_load_assets? : false
+
     case options
     when Hash
-      if Rails::VERSION::MAJOR >= 6
-        in_rendering_context(options) do |_renderer|
-          if block_given?
-            # MONKEY PATCH! simply renders the component with the given block.
-            return view_renderer.render_component(self, options, &block) if options.key?(:component)
-
-            view_renderer.render_partial(self, options.merge(partial: options[:layout]), &block)
-          else
-            view_renderer.render(self, options)
-          end
-        end
-      else
-        if block_given?
-          # MONKEY PATCH! simply renders the component with the given block.
-          return view_renderer.render_component(self, options, &block) if options.key?(:component)
+      in_rendering_context(options) do
+        options[:side_load_assets] = sload_assets
 
+        return view_renderer.render_component(self, options, &block) if options.key?(:component)
+
+        if block_given?
           view_renderer.render_partial(self, options.merge(partial: options[:layout]), &block)
         else
           view_renderer.render(self, options)
         end
       end
     else
-      view_renderer.render_partial(self, partial: options, locals: locals, &block)
+      view_renderer.render_partial(self, side_load_assets: sload_assets, partial: options,
+                                         locals: locals, &block)
     end
   end
 

data/lib/frails/monkey/action_view/abstract_renderer.rb

@@ -5,8 +5,6 @@ module Frails
     module ActionView
       module AbstractRenderer
         def side_load_assets(view, tpl)
-          return unless view.controller._side_load_assets?
-
           path = tpl.short_identifier.delete_prefix('app/').delete_suffix('.html.erb')
 
           instrument :side_loaded_assets, identifier: tpl.identifier, asset_types: [] do |payload|

data/lib/frails/monkey/action_view/partial_renderer.rb

@@ -6,7 +6,13 @@ module Frails
       module PartialRenderer
         def render_partial(view, template)
           # Side load partial assets - if any.
-          @asset_path = side_load_assets(view, template)
+          @asset_path = @side_load_assets && side_load_assets(view, template)
+
+          super
+        end
+
+        def setup(context, options, as, block)
+          @side_load_assets = options.key?(:side_load_assets) ? options[:side_load_assets] : false
 
           super
         end

data/lib/frails/monkey/action_view/template_renderer.rb

@@ -4,8 +4,15 @@ module Frails
   module Monkey
     module ActionView
       module TemplateRenderer
+        def render(context, options)
+          # See Frails::SideLoadAssets
+          @side_load_assets = options.key?(:side_load_assets) ? options[:side_load_assets] : false
+
+          super
+        end
+
         def render_template(view, template, layout_name, locals)
-          return super if template.type != :html
+          return super if !@side_load_assets || template.type != :html
 
           # Side load layout assets - if any.
           if layout_name

data/lib/frails/railtie.rb

@@ -9,7 +9,7 @@ class Frails::Engine < ::Rails::Engine
     app.middleware.insert_before 0, Frails::DevServerProxy, ssl_verify_none: true
   end
 
-  initializer 'frails.rendering' do
+  initializer 'frails' do
     ActiveSupport.on_load :action_controller do
       require 'frails/side_load_assets'
 
@@ -32,15 +32,7 @@ class Frails::Engine < ::Rails::Engine
       ActionView::TemplateRenderer.send :prepend, Frails::Monkey::ActionView::TemplateRenderer
       ActionView::PartialRenderer.send :prepend, Frails::Monkey::ActionView::PartialRenderer
       ActionView::Renderer.send :prepend, Frails::Monkey::ActionView::Renderer
-    end
-  end
-
-  initializer 'frails.helper' do
-    ActiveSupport.on_load :action_controller do
-      ActionController::Base.helper Frails::Helper
-    end
 
-    ActiveSupport.on_load :action_view do
       include Frails::Helper
     end
   end

data/lib/frails/side_load_assets.rb

@@ -4,12 +4,15 @@ module Frails::SideLoadAssets
   extend ActiveSupport::Concern
 
   included do
-    class_attribute :_side_load_assets, default: false
+    class_attribute :side_load_assets, default: false
+    helper_method :side_load_assets?
   end
 
-  class_methods do
-    def side_load_assets
-      self._side_load_assets = true
-    end
+  # Add _side_load_assets flag to the options hash, which will be available in TemplateRenderer,
+  # allowing us control if views/layouts are side loaded.
+  def _normalize_options(options)
+    super
+    options[:side_load_assets] = side_load_assets
+    options
   end
 end

data/lib/frails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Frails
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Joel Moss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri