bridgetown-builder 1.1.0 → 1.2.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b844c16c3959200386b85e0c9b24e9ceda416546c1c5143c0ee4baafb66112b4
-  data.tar.gz: e07d64aad3700b3ee79e66692755d75a7a7cdb483febb58228d5025fbce428a2
+  metadata.gz: 4d9cc88d32be21548e06cab3342331e18d6d9a49abbf6f9283b6934a47677dc5
+  data.tar.gz: 87f3430f75a0861628fe81855f180a0a3b104bbd52698a11d37a60573b779699
 SHA512:
-  metadata.gz: 034dccebc509b960c3c183e1d963cf4aff2ab37259e168d88d542b8ae05a4bc52c23c3c5b802eebabfc3baabdeb4f0c9cba2eff0af0df13f314117907283d779
-  data.tar.gz: ebcb28861dfa0f1eef34b966d729e0ab98a30e04b211e406f52951cfb0c14801644d8b5a3bea9241bbb9da96cdfb2a9b97356bb2b50774b65667f8c960fb7478
+  metadata.gz: abe8de756be422576becd5349b00c9cfedce89e5d49b35d5663c19fcc51805ce7b89277bcbef0ba340b74b83bb8587afcb00f167936a4678af6f417f5c89433c
+  data.tar.gz: 4f2474e22ac1bfca50a5436d8f5fd4f79101c368882aaafaaa88e873702b6c6155bad9ec23a128ebe3774ea88fe4bb9cffe3002b31a8cfc029d18e2e5b21b328

data/bridgetown-builder.gemspec

@@ -14,5 +14,12 @@ 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.metadata      = {
+    "source_code_uri" => "https://github.com/bridgetownrb/bridgetown",
+    "bug_tracker_uri" => "https://github.com/bridgetownrb/bridgetown/issues",
+    "changelog_uri"   => "https://github.com/bridgetownrb/bridgetown/releases",
+    "homepage_uri"    => spec.homepage,
+  }
+
   spec.add_dependency("bridgetown-core", Bridgetown::VERSION)
 end

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

@@ -4,13 +4,21 @@ module Bridgetown
   module Builders
     module DSL
       module Helpers
+        def helpers
+          @helpers # could be nil
+        end
+
         def helper(helper_name, method_name = nil, helpers_scope: false, &block)
-          builder_self = self
           m = Module.new
 
           if block && helpers_scope
+            Deprecator.deprecation_message(
+              "The `helpers_scope' functionality is deprecated. Use the `helpers' builder " \
+              "method to access the helpers scope in your plugin."
+            )
             m.define_method helper_name, &block
           else
+            builder_self = self
             method_name ||= helper_name unless block
             unless method_name
               method_name = :"__helper_#{helper_name}"
@@ -19,7 +27,11 @@ module Bridgetown
               end
             end
             m.define_method helper_name do |*args, **kwargs, &block2|
-              builder_self.send(method_name, *args, **kwargs, &block2)
+              prev_var = builder_self.instance_variable_get(:@helpers)
+              builder_self.instance_variable_set(:@helpers, self)
+              builder_self.send(method_name, *args, **kwargs, &block2).tap do
+                builder_self.instance_variable_set(:@helpers, prev_var)
+              end
             end
           end
 

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

@@ -7,7 +7,7 @@ module Bridgetown
         # Add a couple familar DOM API features
         module QuerySelection
           def query_selector(selector)
-            css(selector).first
+            at_css(selector)
           end
 
           def query_selector_all(selector)

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

@@ -4,13 +4,25 @@ module Bridgetown
   module Builders
     module DSL
       module Liquid
+        def filters
+          @filters # could be nil
+        end
+
+        def filters_context
+          filters&.instance_variable_get(:@context)
+        end
+
         def liquid_filter(filter_name, method_name = nil, filters_scope: false, &block)
-          builder_self = self
           m = Module.new
 
           if block && filters_scope
+            Deprecator.deprecation_message(
+              "The `filters_scope' functionality is deprecated. Use the `filters' builder " \
+              "method to access the filters scope in your plugin."
+            )
             m.define_method filter_name, &block
           else
+            builder_self = self
             method_name ||= filter_name unless block
             unless method_name
               method_name = :"__filter_#{filter_name}"
@@ -19,7 +31,11 @@ module Bridgetown
               end
             end
             m.define_method filter_name do |*args, **kwargs|
-              builder_self.send(method_name, *args, **kwargs)
+              prev_var = builder_self.instance_variable_get(:@filters)
+              builder_self.instance_variable_set(:@filters, self)
+              builder_self.send(method_name, *args, **kwargs).tap do
+                builder_self.instance_variable_set(:@filters, prev_var)
+              end
             end
           end
 

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

@@ -4,6 +4,10 @@ module Bridgetown
   module Builders
     module DSL
       module Resources
+        def resource
+          @resource # could be nil
+        end
+
         def add_resource(collection_name, path, &block) # rubocop:todo Metrics/AbcSize
           data = Bridgetown::Utils::RubyFrontMatter.new(scope: self).tap do |fm|
             fm.define_singleton_method(:___) do |hsh|
@@ -36,6 +40,34 @@ module Bridgetown
             data
           ).as_resource_in_collection
         end
+
+        def define_resource_method(method_name, class_scope: false, &block)
+          unless block
+            builder_self = self
+            block = proc do |*args, **kwargs, &block2|
+              prev_var = builder_self.instance_variable_get(:@resource)
+              builder_self.instance_variable_set(:@resource, self)
+              builder_self.send(method_name, *args, **kwargs, &block2).tap do
+                builder_self.instance_variable_set(:@resource, prev_var)
+              end
+            end
+          end
+
+          m = Module.new
+          m.define_method method_name, &block
+
+          class_scope ? Bridgetown::Resource::Base.extend(m) : Bridgetown::Resource::Base.include(m)
+        end
+
+        def permalink_placeholder(key, &block)
+          Bridgetown::Resource::PermalinkProcessor.register_placeholder(
+            key, block
+          )
+        end
+
+        def placeholder_processors
+          Bridgetown::Resource::PermalinkProcessor.placeholder_processors
+        end
       end
     end
   end

data/lib/bridgetown-builder/plugin.rb

@@ -40,9 +40,13 @@ module Bridgetown
       def initialize(name = nil, current_site = nil)
         self.functions = Set.new
         self.name = name || self.class.name
-        self.site = current_site || Bridgetown.sites.first
+        self.site = current_site || Bridgetown::Current.site
 
         self.config = if defined?(self.class::CONFIG_DEFAULTS)
+                        Deprecator.deprecation_message(
+                          "Using `CONFIG_DEFAULTS' in your builder is deprecated. " \
+                          "Switch to defining config data via an initializer instead."
+                        )
                         Bridgetown::Utils.deep_merge_hashes(
                           self.class::CONFIG_DEFAULTS.with_dot_access, site.config
                         )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-builder
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.beta2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0.beta2
 description: 
 email: maintainers@bridgetownrb.com
 executables: []
@@ -46,7 +46,11 @@ files:
 homepage: https://github.com/bridgetownrb/bridgetown/tree/main/bridgetown-builder
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/bridgetownrb/bridgetown
+  bug_tracker_uri: https://github.com/bridgetownrb/bridgetown/issues
+  changelog_uri: https://github.com/bridgetownrb/bridgetown/releases
+  homepage_uri: https://github.com/bridgetownrb/bridgetown/tree/main/bridgetown-builder
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -58,9 +62,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: