serbea 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1afdeb44daa8b1b9cd20c73ec82ebd02defc8d7322247cdc65870279b380450
-  data.tar.gz: 9e7371768fd0cab610e26c9b15020d6320d3d8f78a9f805e56c08d3dcec26ddd
+  metadata.gz: cbaec081de265cae08c41dbcbfe2ea7686447ff169d8756f45ea446d756a4519
+  data.tar.gz: 40d58553c10c8c10299064ce1ae88a030b947ac6c0b92aea8e8c9282cca7ac16
 SHA512:
-  metadata.gz: 352d91c0845ee77c0fc4cbea9953f3d9f63fcc230ad2f6f9fc52cbba64bd6da409482a6e2c5e032c39f853acd1c0f62042869a13f9a34a88c74387825b433fc1
-  data.tar.gz: fde8baf367844161f6f6afcd10c29450673d56871e67949cb831f0d7c86b2a163b644a80e171ffa4d0a104ef549cfa7201dacf7ea6d6522305bfc6aa82ca8ffc
+  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/CHANGELOG.md

@@ -1,5 +1,12 @@
 # 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

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
@@ -36,7 +47,7 @@ module Serbea
     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,6 +1,4 @@
 require "set"
-require "active_support/core_ext/string/output_safety"
-require "active_support/core_ext/object/blank"
 
 module Serbea
   class Pipeline
@@ -36,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
@@ -49,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
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "2.0.0"
+  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: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-21 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