serbea 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce17e2b60c2abf63a033d8d358686d4df115e87a4c149ba3c625a403863e129c
-  data.tar.gz: a3901a5286afc92e84b2ecc29b2622e80a592f0d0d9de46a7aa58d836e150c65
+  metadata.gz: edd4caa76947988e564a917a9457014cfe194d53ec8b0edf1aae5479ea8b9cf4
+  data.tar.gz: e93987c1eb193535cf47fc7dc57b412407d5ad6a832bc8ffd5966bc7bbc5c322
 SHA512:
-  metadata.gz: 52aadba5419583064f26be67a99805ea66af5798b3bd3a34604967c91fdee3f2e6010ba692b6f70a2de798fa5d899bb7760fd3a76975e415932e5922c7f21c6a
-  data.tar.gz: 4bc3fcfa08bb021ceb68ae675f4f47d4fd72a2e1cdd71fe68d8b4e435493238c49f205f10ccc52e0980d160a226433af19b70d39d18bc3d73b30c9afb8be0698
+  metadata.gz: e59b9abc02d1f2a272bef3adf5239fb385bde5924ad4c3a2bb2f8efe6ec11caab6cf2a4b2901fc9ea59821e119b8ea7fb9dc700a4e22773b535633284da89afe
+  data.tar.gz: 1bddcc5a82fa3cd62ceead72600ec621e6fcad08d2e3a6c58041cca972505917c19f89b2861514599feef93f9449c0eec78b7fbb69de97135fd2aefebcc4bab8

data/lib/serbea.rb

@@ -1,6 +1,5 @@
 require "tilt"
 require "tilt/erubi"
-require "erubi/capture_end"
 
 require "serbea/helpers"
 require "serbea/pipeline"

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,7 +22,7 @@ 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)
@@ -32,11 +34,15 @@ module Serbea
     end
   
     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__", "}}")

data/lib/version.rb

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

data/serbea.gemspec

@@ -17,5 +17,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency("erubi", "~> 1.9")
+  spec.add_runtime_dependency("activesupport", "~> 6.0")
   spec.add_runtime_dependency("tilt", "~> 2.0")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Bridgetown Team
@@ -24,6 +24,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