serbea 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2403adca3b4cbb2e82ad7bb758df50c04257d45f1b303a1a9b03a15453d66953
-  data.tar.gz: 1ccfc568da131dd13d9cc627b05fb13577854d4edfbf2ea0a3353b69b097a5f2
+  metadata.gz: 22177afa63ae7dccc14171dbfaac1d77b237b75b97f4779eeefc4c7fdf44dd5b
+  data.tar.gz: fa0591db51fd9d2f78541d48a717369d7d9b5b5e22be38f5c126972fbba8aa57
 SHA512:
-  metadata.gz: 22633765cd7a2ce0020cdd27708e2bc349cc9ccd168d1d15f7f135926d4a0333098fa05ebd34b7f77811371620f01860d7876935e0be47160e03714f8efc01d6
-  data.tar.gz: 9c5a097fe9fdb43738e3d61f3d61d973d15bff640ad3ae85cc9fb670e61c4a31154f67522bf9651f65ec6a1e67bf755d1b50ea6bc2508b42dfe9dd6f24c627d3
+  metadata.gz: 1c5c3e615db4ea48225efc20a0f345a05aadd14f2ba9d38fe7406298fcfa371a77d3e8517d08d05dfe34f42cf7025818309b210ab6e7b0d14daeca0ccabe438c
+  data.tar.gz: 699e31b8fc7fd9bd32437170c5cf5c48b625f905c1a2b7312b4476ec8b3a89c76cbe1d7056bffdf1000099cbd67abd2862717a58177ee9725eb65090bc983ce1

data/lib/serbea/bridgetown_support.rb

@@ -1,9 +1,12 @@
+require "serbea/rouge_lexer"
+
 module Bridgetown
   class SerbeaView < RubyTemplateView
     include Serbea::Helpers
 
     def partial(partial_name, options = {})
       options.merge!(options[:locals]) if options[:locals]
+      options[:content] = yield if block_given?
 
       partial_segments = partial_name.split("/")
       partial_segments.last.sub!(%r!^!, "_")
@@ -13,14 +16,9 @@ module Bridgetown
         site.in_source_dir(site.config[:partials_dir], "#{partial_name}.serb")
       ).render(self, options)
     end
-    
-    def markdownify
-      previous_buffer_state = @_erbout
-      @_erbout = +""
-      result = yield
-      @_erbout = previous_buffer_state
-
-      content = Bridgetown::Utils.reindent_for_markdown(result)
+
+    def markdownify(&block)
+      content = Bridgetown::Utils.reindent_for_markdown(capture(&block))
       converter = site.find_converter_instance(Bridgetown::Converters::Markdown)
       md_output = converter.convert(content).strip
       @_erbout << md_output
@@ -29,6 +27,7 @@ module Bridgetown
 
   module Converters
     class SerbeaTemplates < Converter
+      priority :highest
       input :serb
 
       # Logic to do the Serbea content conversion.
@@ -51,6 +50,20 @@ module Bridgetown
           serb_renderer.render(serb_view)
         end
       end
+
+      def matches(ext, convertible)
+        if convertible.data[:template_engine] == "serbea" ||
+            (convertible.data[:template_engine].nil? &&
+              @config[:template_engine] == "serbea")
+          return true
+        end
+
+        super(ext)
+      end
+
+      def output_ext(ext)
+        ext == ".serb" ? ".html" : ext
+      end
     end
   end
 end

data/lib/serbea/helpers.rb

@@ -22,7 +22,8 @@ module Serbea
     end
   
     def h(input)
-      Erubi.h(input)
+      result = Erubi.h(input)
+      h.respond_to?(:html_safe) ? result.html_safe : result
     end
     alias_method :escape, :h
 

data/lib/serbea/pipeline.rb

@@ -32,6 +32,13 @@ module Serbea
       end
     end
 
+    def self.raise_on_missing_filters=(config_boolean)
+      @raise_on_missing_filters = config_boolean
+    end
+    def self.raise_on_missing_filters
+      @raise_on_missing_filters ||= false
+    end
+
     def self.deny_value_method(name)
       value_methods_denylist.merge Array(name)
     end
@@ -70,7 +77,7 @@ module Serbea
         end
       else
         "Serbea warning: Filter not found: #{name}".tap do |warning|
-          raise_on_missing_filters ? raise(warning) : STDERR.puts(warning)
+          self.class.raise_on_missing_filters ? raise(warning) : STDERR.puts(warning)
         end
       end
 
@@ -80,7 +87,5 @@ module Serbea
     def to_s
       self.class.output_processor.call @value.to_s
     end
-
-    def raise_on_missing_filters; false; end
   end
 end

data/lib/serbea/rouge_lexer.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require "rouge"
+
+module Rouge
+  module Lexers
+    class Serbea < TemplateLexer
+      title "Serbea"
+      desc "Embedded Ruby Serbea template files"
+
+      tag 'serb'
+
+      filenames '*.serb'
+
+      def initialize(opts={})
+        @ruby_lexer = Ruby.new(opts)
+
+        super(opts)
+      end
+
+      start do
+        parent.reset!
+        @ruby_lexer.reset!
+      end
+
+      open  = /{%%|{%=|{%#|{%-|{%|{{/
+      close = /%%}|-%}|%}|}}/
+
+      state :root do
+        rule %r/{%#/, Comment, :comment
+
+        rule open, Comment::Preproc, :ruby
+
+        rule %r/.+?(?=#{open})|.+/m do
+          delegate parent
+        end
+      end
+
+      state :comment do
+        rule close, Comment, :pop!
+        rule %r/.+?(?=#{close})|.+/m, Comment
+      end
+
+      state :ruby do
+        rule close, Comment::Preproc, :pop!
+
+        rule %r/.+?(?=#{close})|.+/m do
+          delegate @ruby_lexer
+        end
+      end
+    end
+  end
+end

data/lib/serbea/template_engine.rb

@@ -91,7 +91,7 @@ module Serbea
   
           pipeline_suffix = processed_filters ? ") %}" : ")) %}"
   
-          subs = subs.sub("{{", "{%= pipeline(self, (").sub("}}", pipeline_suffix).gsub("__PIPE_C__", '\|')
+          subs = subs.sub("{{", "{%= pipeline(self, (").sub("}}", pipeline_suffix).gsub("__PIPE_C__", '|')
 
           buff << subs
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -54,6 +54,7 @@ files:
 - lib/serbea/helpers.rb
 - lib/serbea/pipeline.rb
 - lib/serbea/rails_support.rb
+- lib/serbea/rouge_lexer.rb
 - lib/serbea/template_engine.rb
 - lib/version.rb
 - serbea.gemspec