serbea 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72bb8c66c7a574ed69bbec8995cd8a5e28fa72caf82768264b95b602ce1db815
-  data.tar.gz: 3cece4d891ef8100bf0a5eb51570f89bdc58566914fe6f0b514d21a3a76e2f7e
+  metadata.gz: 439fb102e78e2208de075b03b058b77d1cc909a6fe9414c341a48370fd3988e2
+  data.tar.gz: d0ff78ac67f00a59fa1047f7f05795cee88051ff0fdb9c179601984601fecae4
 SHA512:
-  metadata.gz: 3b8d9d2677748d88ec34dbea4abbf65fb05253c0ccd8d1f4bcde2f9781ef9056194a6c25bfe8027dc20f906055fd7db023587aedbb944025109cc443ad9e720a
-  data.tar.gz: a9622d5f4a502291fd8472eb24f2f6e479f434897eec51095eb2ba668b95fd1dd438eb400274d9811eaddfbd485e523d76ce7230245f9e8d11a284170afe3725
+  metadata.gz: 6ca9922186315539c54e3a44fad5da81b3075425bb991dd8521e4777f5d46e515d4a65f9fd7fd54c52b870df21c8155b32beb3a24c84080c95367b1143526ff5
+  data.tar.gz: ccb34f9d8129fe5c4e34f96d7cbce118f5dbf8538151ae554cca9c35f63e223a0d14b4456e1463c8a79661de6109831ca3058aaee184f2925af974acfbc5f6b1

data/lib/serbea.rb

@@ -32,9 +32,7 @@ if defined?(Rails::Railtie)
       ActiveSupport.on_load(:action_view) do
         require "serbea/rails_support"
 
-        app.config.after_initialize do
-          Serbea::Plugin.initialize_frontmatter
-        end
+        ActionController::Base.include Serbea::Rails::FrontmatterControllerActions
       end
     end
   end

data/lib/serbea/rails_support.rb

@@ -1,34 +1,40 @@
 # frozen_string_literal: true
 
-# inspired by https://github.com/haml/haml/blob/main/lib/haml/plugin.rb
 module Serbea
-  # This module makes Serbea work with Rails using the template handler API.
-  class Plugin
-    def handles_encoding?; true; end
-
-    def compile(template, source)
-      "self.class.include(Serbea::Helpers);" + Tilt::SerbeaTemplate.new { source }.precompiled_template([])
+  module Rails
+    module FrontmatterHelpers
+      def set_page_frontmatter=(data)
+        @frontmatter ||= HashWithDotAccess::Hash.new
+        @frontmatter.update(data)
+      end
     end
 
-    def self.call(template, source = nil)
-      source ||= template.source
+    module FrontmatterControllerActions
+      extend ActiveSupport::Concern
 
-      new.compile(template, source)
+      included do
+        Serbea::TemplateEngine.front_matter_preamble = "self.set_page_frontmatter = local_frontmatter = YAML.load"
+    
+        before_action { @frontmatter ||= HashWithDotAccess::Hash.new }
+
+        helper Serbea::Rails::FrontmatterHelpers
+      end
     end
 
-    def self.initialize_frontmatter
-      if defined?(ApplicationHelper)
-        Serbea::TemplateEngine.front_matter_preamble = "self.set_page_frontmatter = local_frontmatter = YAML.load"
-      
-        ApplicationHelper.define_method(:set_page_frontmatter=) do |data|
-          @frontmatter ||= HashWithDotAccess::Hash.new
-          @frontmatter.update(data)
-        end
-      
-        ApplicationController.before_action { @frontmatter ||= HashWithDotAccess::Hash.new }
+    class TemplateHandler
+      def handles_encoding?; true; end
+
+      def compile(template, source)
+        "self.class.include(Serbea::Helpers);" + Tilt::SerbeaTemplate.new { source }.precompiled_template([])
+      end
+
+      def self.call(template, source = nil)
+        source ||= template.source
+
+        new.compile(template, source)
       end
     end
   end
 end
 
-ActionView::Template.register_template_handler(:serb, Serbea::Plugin)
+ActionView::Template.register_template_handler(:serb, Serbea::Rails::TemplateHandler)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Bridgetown Team