serbea 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1afdeb44daa8b1b9cd20c73ec82ebd02defc8d7322247cdc65870279b380450
-  data.tar.gz: 9e7371768fd0cab610e26c9b15020d6320d3d8f78a9f805e56c08d3dcec26ddd
+  metadata.gz: 328bb1110c02d6c0da3abf6d0f1c26ed1c49d6f0265b82e35dafb945320ca1d5
+  data.tar.gz: 3ec4e316fb6c126a845b22490c944d2eedcd2c91a724a3aa5125866c56b44c53
 SHA512:
-  metadata.gz: 352d91c0845ee77c0fc4cbea9953f3d9f63fcc230ad2f6f9fc52cbba64bd6da409482a6e2c5e032c39f853acd1c0f62042869a13f9a34a88c74387825b433fc1
-  data.tar.gz: fde8baf367844161f6f6afcd10c29450673d56871e67949cb831f0d7c86b2a163b644a80e171ffa4d0a104ef549cfa7201dacf7ea6d6522305bfc6aa82ca8ffc
+  metadata.gz: 7a657dce3ddf4ca466cffd7e22af1785f026a887b0103d783f9350a60640b518243140229dd140d2c7e6d8ca61e5170f1a2dc98ec8055bfca418a99d1243937b
+  data.tar.gz: 6d604bfc2749f265352cfbd75fdebd1a77be2ff02b78000b9774265f17db53833fe7b515df72531ec1de6f38aaed4ea4676121ba944ec08c40ff0245283581b4

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: [3.1.0, 3.2.0, 3.3.0]
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     # Has to be top level to cache properly
     env:

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+3.1.4

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 2.2.0
+
+- Add functionality to purge certain `Object`-based method pollution which interferes with the workings of Serbea's `Pipeline` in pure Ruby.
+- Ruby 3.1 is now the minimum required version.
+
+## 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
 
@@ -74,7 +72,27 @@ module Serbea
       @value_methods_denylist ||= Set.new
     end
 
+    def self.purge_class_pollution
+      @pollution_purged ||= begin
+        polluted_methods_list.each do |name|
+          define_method name do |*args, **kwargs|
+            filter(name, *args, **kwargs)
+          end
+        end
+
+        true
+      end
+    end
+
+    def self.polluted_method(name)
+      polluted_methods_list.merge Array(name)
+    end
+    def self.polluted_methods_list
+      @polluted_methods_list ||= Set.new(%i(select to_json))
+    end
+
     def initialize(binding, value)
+      self.class.purge_class_pollution
       @binding = binding
       @context = binding.receiver
       @value = value

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "2.0.0"
+  VERSION = "2.2.0"
 end

data/serbea.gemspec

@@ -11,12 +11,11 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/bridgetownrb/serbea"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.1"
 
   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.2.0
 platform: ruby
 authors:
 - Bridgetown Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2024-07-19 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
@@ -66,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: 
+description:
 email: maintainers@bridgetownrb.com
 executables: []
 extensions: []
@@ -91,7 +77,7 @@ homepage: https://github.com/bridgetownrb/serbea
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,15 +85,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Similar to ERB, Except Awesomer
 test_files: []