bridgetown-builder 0.18.6 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0d75ed6b31b7644966c11eadfdd5c7ec313eb245864b507592ce51822ded2c5
-  data.tar.gz: 2ce03dd9a1f1a438e4b96ab2394566635565e126e78caed73cceaec4ede59ed1
+  metadata.gz: 5de4e75e44d6d399c323bd42e9515ca3a3e079b2f1f3d113e0dad7e1aceca4b1
+  data.tar.gz: a196d14c4f9d9a2da5d5459a749ce82b46c56a9872d2877e06343bb137f3fce0
 SHA512:
-  metadata.gz: 3bea57f485c649d6063fdb9234946b0816d37159f7536141f842d32cb5dfd84a54126c9e748aa51ef23cf561955a5fc881bfafbb309cbbc0c317f10854168ac1
-  data.tar.gz: ed9da6ec35cc3d3a6cda7b7b85b8d16ae39c24df45edc07beaa4ee1be3e215b35076f0be87a784203a41eb6de89a956b48b1d7862b33f1e1108a7ae7a3af0909
+  metadata.gz: 4795ff6e4dea9efdccbbabc482c38fb85114ac8d63940e145683257498bbd3205a8573ddfb69868104b3539917a849498cf15e7e2d4574d593490b7526645aa8
+  data.tar.gz: de0a86da5607451ab2032154962a308dc560d6fd925bfbfc6b08d2a9074b282f7cbaa029b983773cf407851328041c68a290342a41851549e3ca15aa3f3b1052

data/lib/bridgetown-builder/builder.rb

@@ -3,6 +3,8 @@
 module Bridgetown
   # Superclass for a website's SiteBuilder abstract class
   class Builder < Bridgetown::Builders::PluginBuilder
+    extend ActiveSupport::DescendantsTracker
+
     class << self
       def register
         Bridgetown::Hooks.register_one :site, :pre_read, reloadable: false do |site|
@@ -21,25 +23,8 @@ module Bridgetown
       name
     end
 
-    def self.inherited(const)
-      (@children ||= Set.new).add const
-      catch_inheritance(const) do |const_|
-        catch_inheritance(const_)
-      end
-    end
-
-    def self.catch_inheritance(const)
-      const.define_singleton_method :inherited do |const_|
-        (@children ||= Set.new).add const_
-        yield const_ if block_given?
-      end
-    end
-
     def self.descendants
-      @children ||= Set.new
-      out = @children.map(&:descendants)
-      out << self unless ["SiteBuilder", "Bridgetown::Builder"].include?(name)
-      Set.new(out).flatten
+      super.reject { |klass| ["SiteBuilder"].include?(klass.name) }
     end
   end
 end

data/lib/bridgetown-builder/dsl/liquid.rb

@@ -4,16 +4,16 @@ module Bridgetown
   module Builders
     module DSL
       module Liquid
-        def liquid_filter(filter_name, method_name = nil, &block)
+        def liquid_filter(filter_name, method_name = nil, filters_scope: false, &block)
           builder_self = self
           m = Module.new
 
-          if block
+          if block && !filters_scope
             m.define_method filter_name do |*args|
               builder_self.instance_exec(*args, &block)
             end
-          elsif method_name
-            block = method(method_name)
+          else
+            block = method(method_name) if method_name
             m.define_method filter_name, &block
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-builder
 version: !ruby/object:Gem::Version
-  version: 0.18.6
+  version: 0.20.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.6
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.6
+        version: 0.20.0
 description: 
 email: maintainers@bridgetownrb.com
 executables: []