serbea 0.5.0 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce17e2b60c2abf63a033d8d358686d4df115e87a4c149ba3c625a403863e129c
-  data.tar.gz: a3901a5286afc92e84b2ecc29b2622e80a592f0d0d9de46a7aa58d836e150c65
+  metadata.gz: 1d16e1fa13dfcc4f2b10dc287e5d4c150130c0760a8be00cf323287849132f49
+  data.tar.gz: 60ab217fb343de0d7af90cf4dc18592dc867f6bbad8ce31349901dc64e677390
 SHA512:
-  metadata.gz: 52aadba5419583064f26be67a99805ea66af5798b3bd3a34604967c91fdee3f2e6010ba692b6f70a2de798fa5d899bb7760fd3a76975e415932e5922c7f21c6a
-  data.tar.gz: 4bc3fcfa08bb021ceb68ae675f4f47d4fd72a2e1cdd71fe68d8b4e435493238c49f205f10ccc52e0980d160a226433af19b70d39d18bc3d73b30c9afb8be0698
+  metadata.gz: ed744553b4a670b1de4a617a8d34d2ecd4fac83135795994f601b4873f9ef46763e2ec09d814881c4005a5f070ed530f35e4334998e0e3445a62d5025030a665
+  data.tar.gz: 3d875dc56647f48098b1ba129a05c5fa56a7be4294de207199fb5e7ca5ab41d19ce511585e4b0533a74b000e6671fb6e3a0dd54d7779e9e5ee27ae0003df0d0d

data/Gemfile

@@ -4,3 +4,5 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in serbea.gemspec
 gemspec
+
+gem "erubi", github: "jaredcwhite/erubi", branch: "config-literal-prefix"

data/Rakefile

@@ -1,10 +1,12 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "bundler"
+
+Bundler.setup
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/test_*.rb"]
+  t.test_files = FileList["test/test.rb"]
+  t.warning = false
 end
 
 task :default => :test

data/lib/serbea.rb

@@ -1,6 +1,5 @@
 require "tilt"
 require "tilt/erubi"
-require "erubi/capture_end"
 
 require "serbea/helpers"
 require "serbea/pipeline"
@@ -10,7 +9,13 @@ require "serbea/component_renderer"
 module Tilt
   class SerbeaTemplate < ErubiTemplate
     def prepare
-      @options.merge!(outvar: "@_erbout", bufval: "Serbea::Buffer.new", engine_class: Serbea::TemplateEngine)
+      @options.merge!(
+        outvar: "@_erbout",
+        bufval: "Serbea::Buffer.new", 
+        literal_prefix: "{%",
+        literal_postfix: "%}",
+        engine_class: Serbea::TemplateEngine
+      )
       super
     end
 

data/lib/serbea/bridgetown_support.rb

@@ -1,4 +1,5 @@
 require "serbea/rouge_lexer"
+require "bridgetown-core"
 
 module Bridgetown
   class SerbeaView < RubyTemplateView
@@ -70,3 +71,13 @@ module Bridgetown
     end
   end
 end
+
+Bridgetown::Hooks.register :site, :pre_render, reloadable: false do |site|
+  # make sure Liquid doesn't find {% %} and decide to process Serbea code!
+  site.contents.each do |convertible|
+    convertible.data.render_with_liquid = false if convertible.extname == ".serb"
+  end
+  site.layouts.values.each do |convertible|
+    convertible.data.render_with_liquid = false if convertible.ext == ".serb"
+  end
+end

data/lib/serbea/helpers.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/string/output_safety"
+
 module Serbea
   module Helpers
     def self.included(mod)
@@ -20,23 +22,45 @@ module Serbea
       @_erbout = previous_buffer_state
       @output_buffer = previous_ob_state
 
-      result.respond_to?(:html_safe) ? result.html_safe : result
+      result.html_safe
     end
   
     def pipeline(context, value)
       Pipeline.new(context, value)
     end
   
-    def helper(name, &block)
-      self.class.send(:define_method, name, &block)
+    def helper(name, &helper_block)
+      self.class.define_method(name) do |*args, &block|
+        previous_buffer_state = @_erbout
+        @_erbout = Serbea::Buffer.new
+  
+        # For compatibility with ActionView, not used by Bridgetown normally
+        previous_ob_state = @output_buffer
+        @output_buffer = Serbea::Buffer.new
+  
+        result = helper_block.call(*args, &block)
+        if @output_buffer != ""
+          # use Rails' ActionView buffer if present
+          result = @output_buffer
+        end
+        @_erbout = previous_buffer_state
+        @output_buffer = previous_ob_state
+  
+        result.is_a?(String) ? result.html_safe : result
+      end
     end
+    alias_method :macro, :helper
   
     def h(input)
-      result = Erubi.h(input)
-      result.respond_to?(:html_safe) ? result.html_safe : result
+      ERB::Util.h(input.to_s)
     end
     alias_method :escape, :h
 
+    def safe(input)
+      input.to_s.html_safe
+    end
+    alias_method :raw, :safe
+
     def prepend(old_string, new_string)
       "#{new_string}#{old_string}"
     end

data/lib/serbea/pipeline.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/string/output_safety"
+
 module Serbea
   class Pipeline
     def self.exec(template, input: (no_input_passed = true; nil), include_helpers: nil)
@@ -27,11 +29,17 @@ module Serbea
     end
     def self.output_processor
       @output_processor ||= lambda do |input|
-        # no-op
-        input
+        (!input.html_safe? && self.autoescape) ? ERB::Util.h(input) : input.html_safe
       end
     end
 
+    def self.autoescape=(config_boolean)
+      @autoescape = config_boolean
+    end
+    def self.autoescape
+      @autoescape.nil? ? true : @autoescape
+    end
+
     def self.raise_on_missing_filters=(config_boolean)
       @raise_on_missing_filters = config_boolean
     end
@@ -85,7 +93,7 @@ module Serbea
     end
 
     def to_s
-      self.class.output_processor.call @value.to_s
+      self.class.output_processor.call(@value.is_a?(String) ? @value : @value.to_s)
     end
   end
 end

data/lib/serbea/rails_support.rb

@@ -16,19 +16,7 @@ module Serbea
 
       new.compile(template, source)
     end
-
-#    def cache_fragment(block, name = {}, options = nil)
-#      @view.fragment_for(block, name, options) do
-#        eval("_hamlout.buffer", block.binding)
-#      end
-#    end
   end
 end
 
 ActionView::Template.register_template_handler(:serb, Serbea::Plugin)
-
-if defined?(ActionController::Base)
-  Serbea::Pipeline.output_processor = lambda do |input|
-    input.html_safe? ? input : ActionController::Base.helpers.strip_tags(input)
-  end
-end

data/lib/serbea/template_engine.rb

@@ -38,7 +38,7 @@ module Serbea
   
     def add_postamble(postamble)
       src << postamble
-      src << "#{@bufvar}.html_safe" if postamble.respond_to?(:html_safe)
+      src << "#{@bufvar}.html_safe"
   
       src.gsub!("__RAW_START_PRINT__", "{{")
       src.gsub!("__RAW_END_PRINT__", "}}")
@@ -127,8 +127,8 @@ module Serbea
   
         buff << text
         if code.length > 0
-          code.sub! /^\{%@/, ""
-          code.sub! /%}$/, ""
+          code.sub!(/^\{%@/, "")
+          code.sub!(/%}$/, "")
           unless ["end", ""].include? code.strip
             original_line_length = code.lines.size
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "0.5.0"
+  VERSION = "0.6.4"
 end

data/serbea.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|script|spec|features)/!) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency("rake", "~> 13.0")
   spec.add_runtime_dependency("erubi", "~> 1.9")
+  spec.add_runtime_dependency("activesupport", "~> 6.0")
   spec.add_runtime_dependency("tilt", "~> 2.0")
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.4
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-10-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement