serbea 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73996980f3fc5dad7372d79b970912fafc75ae4da2663838f6af696c57be29aa
-  data.tar.gz: d5eabe6bc2a70b461870e085ebfb9d628941e862e09b8e567b50e5dd4798f334
+  metadata.gz: 1d16e1fa13dfcc4f2b10dc287e5d4c150130c0760a8be00cf323287849132f49
+  data.tar.gz: 60ab217fb343de0d7af90cf4dc18592dc867f6bbad8ce31349901dc64e677390
 SHA512:
-  metadata.gz: d281941782dbf85eae47f60d8918bd293ffd4e9f760e8725d0e3249faf638ddd42bc5652cfe9d1d3ccc7be0619a54fe9184a5f04a8ecfef186a17c43760ce6f4
-  data.tar.gz: 8c652f07cafdd6026b81508442f6cee1d1bc8b9f87c946b53f90370b15f9da39017aeaeed27114d0c704e456010cce0a8ace18d3fd173ee6ed6b4755d1ead8d6
+  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

@@ -9,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/helpers.rb

@@ -29,9 +29,27 @@ module Serbea
       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)
       ERB::Util.h(input.to_s)

data/lib/serbea/template_engine.rb

@@ -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.6.3"
+  VERSION = "0.6.4"
 end

data/serbea.gemspec

@@ -16,6 +16,7 @@ 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")

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-29 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