bridgetown-core 0.17.0 → 0.18.3

data/lib/bridgetown-core/ruby_template_view.rb

@@ -5,28 +5,9 @@ require "active_support/core_ext/hash/keys"
 
 module Bridgetown
   class RubyTemplateView
-    class Helpers
-      include Bridgetown::Filters
+    require "bridgetown-core/helpers"
 
-      Context = Struct.new(:registers)
-
-      def initialize(site)
-        @site = site
-
-        # duck typing for Liquid context
-        @context = Context.new({ site: @site })
-      end
-
-      def webpack_path(asset_type)
-        Bridgetown::Utils.parse_webpack_manifest_file(@site, asset_type.to_s)
-      end
-
-      def t(*args)
-        I18n.send :t, *args
-      end
-    end
-
-    attr_reader :layout, :page, :site, :content
+    attr_reader :layout, :page, :paginator, :site, :content
 
     def initialize(convertible)
       if convertible.is_a?(Layout)
@@ -34,8 +15,10 @@ module Bridgetown
         @page = layout.current_document
         @content = layout.current_document_output
       else
+        @layout = convertible.site.layouts[convertible.data["layout"]]
         @page = convertible
       end
+      @paginator = page.paginator if page.respond_to?(:paginator)
       @site = page.site
     end
 
@@ -43,11 +26,20 @@ module Bridgetown
       raise "Must be implemented in a subclass"
     end
 
+    def render(item, options = {}, &block)
+      if item.respond_to?(:render_in)
+        item.render_in(self, &block)
+      else
+        partial(item, options, &block)
+      end
+    end
+
     def site_drop
       site.site_payload.site
     end
 
-    def liquid_render(component, options = {})
+    def liquid_render(component, options = {}, &block)
+      options[:_block_content] = capture(&block) if block && respond_to?(:capture)
       render_statement = _render_statement(component, options)
 
       template = site.liquid_renderer.file(
@@ -61,7 +53,7 @@ module Bridgetown
     end
 
     def helpers
-      @helpers ||= Helpers.new(@site)
+      @helpers ||= Helpers.new(self, site)
     end
 
     def method_missing(method, *args, &block)
@@ -79,11 +71,19 @@ module Bridgetown
     private
 
     def _render_statement(component, options)
-      render_statement = ["{% render \"#{component}\""]
+      render_statement = if options[:_block_content]
+                           ["{% rendercontent \"#{component}\""]
+                         else
+                           ["{% render \"#{component}\""]
+                         end
       unless options.empty?
         render_statement << ", " + options.keys.map { |k| "#{k}: #{k}" }.join(", ")
       end
       render_statement << " %}"
+      if options[:_block_content]
+        render_statement << options[:_block_content]
+        render_statement << "{% endrendercontent %}"
+      end
       render_statement.join
     end
 
@@ -91,8 +91,8 @@ module Bridgetown
       {
         registers: {
           site: site,
-          page: page,
-          cached_partials: Bridgetown::Renderer.cached_partials,
+          page: page.to_liquid,
+          cached_partials: Bridgetown::Converters::LiquidTemplates.cached_partials,
         },
         strict_filters: site.config["liquid"]["strict_filters"],
         strict_variables: site.config["liquid"]["strict_variables"],

data/lib/bridgetown-core/site.rb

@@ -15,8 +15,18 @@ module Bridgetown
     attr_reader   :root_dir, :source, :dest, :cache_dir, :config,
                   :regenerator, :liquid_renderer, :components_load_paths,
                   :includes_load_paths
-    attr_accessor :layouts, :pages, :static_files,
-                  :exclude, :include, :lsi, :highlighter, :permalink_style,
+
+    # All files not pages/documents or structured data in the source folder
+    # @return [Array<StaticFile>]
+    attr_accessor :static_files
+
+    # @return [Array<Layout>]
+    attr_accessor :layouts
+
+    # @return [Array<Page>]
+    attr_accessor :pages
+
+    attr_accessor :exclude, :include, :lsi, :highlighter, :permalink_style,
                   :time, :future, :unpublished, :limit_posts,
                   :keep_files, :baseurl, :data, :file_read_opts,
                   :plugin_manager, :converters, :generators, :reader

data/lib/bridgetown-core/tags/render_content.rb

@@ -3,7 +3,7 @@
 module Bridgetown
   module Tags
     class BlockRenderTag < Liquid::Block
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength
       def render(context)
         context.stack({}) do
           # unindent the incoming text
@@ -37,7 +37,7 @@ module Bridgetown
             .render_tag(context, +"")
         end
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:enable Metrics/MethodLength
 
       private
 

data/lib/bridgetown-core/utils.rb

@@ -23,6 +23,20 @@ module Bridgetown
       slug.gsub(%r![_ ]!, "-").split("-").map!(&:capitalize).join(" ")
     end
 
+    # XML escape a string for use. Replaces any special characters with
+    # appropriate HTML entity replacements.
+    #
+    # Examples
+    #
+    #   xml_escape('foo "bar" <baz>')
+    #   # => "foo &quot;bar&quot; &lt;baz&gt;"
+    #
+    # @param input [String] The String to escape.
+    # @return [String] the escaped String.
+    def xml_escape(input)
+      input.to_s.encode(xml: :attr).gsub(%r!\A"|"\Z!, "")
+    end
+
     # Non-destructive version of deep_merge_hashes! See that method.
     #
     # Returns the merged hashes.

data/lib/bridgetown-core/utils/ruby_exec.rb

@@ -59,7 +59,7 @@ module Bridgetown
 
         # This is where the magic happens! DON'T BE EVIL!!! ;-)
         output = obj.instance_eval(ruby_code)
-        output.is_a?(Hash) ? output.with_indifferent_access : output
+        output.is_a?(Hash) ? output.with_dot_access : output
       end
     end
   end

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.17.0"
-  CODE_NAME = "Mount Scott"
+  VERSION = "0.18.3"
+  CODE_NAME = "Taylor Street"
 end

data/lib/bridgetown-core/watcher.rb

@@ -130,6 +130,7 @@ module Bridgetown
         Bridgetown::Hooks.trigger :site, :pre_reload, site
         Bridgetown::Hooks.clear_reloadable_hooks
         site.plugin_manager.reload_plugin_files
+        site.plugin_manager.reload_component_loaders
         site.process
         Bridgetown.logger.info "Done! 🎉", "#{"Completed".green} in less than" \
                                " #{(Time.now - time).ceil(2)} seconds."

data/lib/site_template/src/images/.keep

@@ -0,0 +1 @@
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.3
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: hash_with_dot_access
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -298,6 +312,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
 - Rakefile
 - bin/bridgetown
 - bridgetown-core.gemspec
@@ -336,6 +351,7 @@ files:
 - lib/bridgetown-core/converter.rb
 - lib/bridgetown-core/converters/erb_templates.rb
 - lib/bridgetown-core/converters/identity.rb
+- lib/bridgetown-core/converters/liquid_templates.rb
 - lib/bridgetown-core/converters/markdown.rb
 - lib/bridgetown-core/converters/markdown/kramdown_parser.rb
 - lib/bridgetown-core/converters/smartypants.rb
@@ -363,6 +379,7 @@ files:
 - lib/bridgetown-core/frontmatter_defaults.rb
 - lib/bridgetown-core/generator.rb
 - lib/bridgetown-core/generators/prototype_generator.rb
+- lib/bridgetown-core/helpers.rb
 - lib/bridgetown-core/hooks.rb
 - lib/bridgetown-core/layout.rb
 - lib/bridgetown-core/liquid_extensions.rb
@@ -435,6 +452,7 @@ files:
 - lib/site_template/src/_posts/0000-00-00-welcome-to-bridgetown.md.erb
 - lib/site_template/src/about.md
 - lib/site_template/src/favicon.ico
+- lib/site_template/src/images/.keep
 - lib/site_template/src/index.md
 - lib/site_template/src/posts.md
 - lib/site_template/start.js
@@ -464,7 +482,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.7.0
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A Webpack-aware, Ruby-based static site generator for the modern Jamstack