serbea 1.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b747bafc667c67c0826b3cbe2c979825df89174d43a3a617780eaec53da6a059
-  data.tar.gz: 7b359e8cd5faa91971c58974bd2be1daa89dcd666d55a4430bf3a3f3ffd57dd0
+  metadata.gz: cbaec081de265cae08c41dbcbfe2ea7686447ff169d8756f45ea446d756a4519
+  data.tar.gz: 40d58553c10c8c10299064ce1ae88a030b947ac6c0b92aea8e8c9282cca7ac16
 SHA512:
-  metadata.gz: 68a4dce4eb9edafc3fcf3f127421889188d5d4d2bc10b20bd16b48c053baeb2be00ee3cea3ff04d0cc82a764036ef853cd655e47001145f459c9f6745f6e8e89
-  data.tar.gz: 55e7eb37b580e4c3b2998d52e938fc79fe58db94c7e8e3522b278471e7a971070adfc94b51ff82c54646b584c61a368d41604cd35d6c4edc131a1b2434e48fc2
+  metadata.gz: e4762251bb0285d122b59ac3611cbda5afdfedb6c075f97b2746456ce6be3fffd6362a82967d9bbedbc8fa092649f9e8240de293e58826dd79e4128be15c4922
+  data.tar.gz: 3e224dbdf536ac4f8207a217cb216151ce5609c3be8e984971470267cce69b7c1ab85fa3f6c88f95467fcc553d7f6f790ef5ba54563647203b114d4221a8800c

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: [2.7.2, 3.0.0]
+        ruby_version: [2.7.2, 3.0.0, 3.2.0]
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     # Has to be top level to cache properly
     env:

data/.gitignore

@@ -15,7 +15,6 @@ mkmf.log
 *.gem
 Gemfile.lock
 .bundle
-.ruby-version
 
 # Mac files
 .DS_Store

data/.ruby-version

@@ -0,0 +1 @@
+2.7.2

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+# Changelog
+
+## 2.1.0
+
+- Remove Active Support as a dependency
+  - This now provides rudimentary support of `html_safe` mechanics. Note that
+    it does NOT handle _any_ additional String methods. It simply allows cloning a string via `html_safe` to mark it safe, and `html_safe?` to query if it's safe.
+  - This _might_ be a breaking change, but likely not if you're using Serbea along with Rails or Bridgetown. To restore previous functionality manually, just install the `activesupport` gem and `require "active_support/core_ext/string/output_safety"` before you require the Serbea gem.
+
+## 2.0.0
+
+- Add plain ol' Ruby pipeline functionality
+- Raise errors using gem-based classes
+- Upgrade docs site to Bridgetown 1.3.1 and esbuild
+
+## 1.0.1
+
+- Widespread release.

data/lib/serbea/helpers.rb

@@ -1,4 +1,15 @@
-require "active_support/core_ext/string/output_safety"
+unless "".respond_to?(:html_safe)
+  # The simplest HTML safety "polyfill" around
+  class String
+    def html_safe
+      self.class.new(self).tap { _1.instance_variable_set(:@html_safe, true) }
+    end
+
+    def html_safe?
+      instance_variable_get(:@html_safe) == true
+    end
+  end
+end
 
 module Serbea
   module Helpers
@@ -10,7 +21,7 @@ module Serbea
       previous_buffer_state = @_erbout
       @_erbout = Serbea::OutputBuffer.new
       result = yield(*args)
-      result = @_erbout.presence || result
+      result = @_erbout.empty? ? result : @_erbout
       @_erbout = previous_buffer_state
 
       Serbea::OutputBuffer === result ? result.html_safe : result
@@ -30,13 +41,13 @@ module Serbea
     def import(*args, **kwargs, &block)
       helper_names = %i(partial render)
       available_helper = helper_names.find { |meth| respond_to?(meth) }
-      raise "Serbea Error: no `render' or `partial' helper available in #{self.class}" unless available_helper
+      raise Serbea::Error, "Serbea Error: no `render' or `partial' helper available in #{self.class}" unless available_helper
       available_helper == :partial ? partial(*args, **kwargs, &block) : render(*args, **kwargs, &block)
       nil
     end
 
     def h(input)
-      ERB::Util.h(input.to_s)
+      Erubi.h(input.to_s)
     end
     alias_method :escape, :h
 

data/lib/serbea/pipeline.rb

@@ -1,9 +1,18 @@
 require "set"
-require "active_support/core_ext/string/output_safety"
-require "active_support/core_ext/object/blank"
 
 module Serbea
   class Pipeline
+    # If you include this in any regular Ruby template environment (say ERB),
+    # you can then use Serbea-style pipeline code within the block, e.g.
+    #
+    # `pipe "Hello world" do upcase | split(" ") | join(", ") end`
+    # => `HELLO, WORLD`
+    module Helper
+      def pipe(input = nil, &blk)
+        Pipeline.new(binding, input).tap { _1.instance_exec(&blk) }.value
+      end
+    end
+
     # Exec the pipes!
     # @param template [String]
     # @param locals [Hash]
@@ -25,7 +34,7 @@ module Serbea
       full_template = "{{ #{template} | assign_to: :output }}"
 
       tmpl = Tilt::SerbeaTemplate.new { full_template }
-      tmpl.render(pipeline_obj, locals.presence || kwargs)
+      tmpl.render(pipeline_obj, locals.empty? ? kwargs : locals)
 
       pipeline_obj.output
     end
@@ -38,7 +47,7 @@ module Serbea
     # @return [Proc]
     def self.output_processor
       @output_processor ||= lambda do |input|
-        (!input.html_safe? && self.autoescape) ? ERB::Util.h(input) : input.html_safe
+        (!input.html_safe? && self.autoescape) ? Erubi.h(input) : input.html_safe
       end
     end
 
@@ -85,13 +94,13 @@ module Serbea
         if var.respond_to?(:call)
           @value = var.call(@value, *args, **kwargs)
         else
-          "Serbea warning: Filter #{name} does not respond to call".tap do |warning|
-            self.class.raise_on_missing_filters ? raise(warning) : STDERR.puts(warning)
+          "Serbea warning: Filter '#{name}' does not respond to call".tap do |warning|
+            self.class.raise_on_missing_filters ? raise(Serbea::FilterMissing, warning) : STDERR.puts(warning)
           end
         end
       else
-        "Serbea warning: Filter not found: #{name}".tap do |warning|
-          self.class.raise_on_missing_filters ? raise(warning) : STDERR.puts(warning)
+        "Serbea warning: Filter `#{name}' not found".tap do |warning|
+          self.class.raise_on_missing_filters ? raise(Serbea::FilterMissing, warning) : STDERR.puts(warning)
         end
       end
 
@@ -101,5 +110,24 @@ module Serbea
     def to_s
       self.class.output_processor.call(@value.is_a?(String) ? @value : @value.to_s)
     end
+  
+    def |(*)
+      self
+    end
+
+    def method_missing(...)
+      filter(...)
+    end
+
+    def value(callback = nil)
+      return @value unless callback
+
+      @value = if callback.is_a?(Proc)
+                 callback.(@value)
+               else
+                 callback
+               end
+      self
+    end
   end
 end

data/lib/serbea/template_engine.rb

@@ -188,7 +188,7 @@ module Serbea
                 buff << "{% %}\n" # preserve original directive line length
               end
             else
-              raise "Handler for Serbea template directive `#{$1}' not found"
+              raise Serbea::Error, "Handler for Serbea template directive `#{$1}' not found"
             end
           else
             buff << "{% end %}"

data/lib/serbea.rb

@@ -1,6 +1,12 @@
 require "tilt"
 require "tilt/erubi"
 
+module Serbea
+  class Error < StandardError; end
+
+  class FilterMissing < Error; end
+end
+
 require "serbea/helpers"
 require "serbea/pipeline"
 require "serbea/template_engine"

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "1.0.1"
+  VERSION = "2.1.0"
 end

data/serbea.gemspec

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2023-11-04 00:00:00.000000000 Z
 dependencies:
-- !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: erubi
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +60,8 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md