bridgetown-core 1.0.0.alpha8 → 1.0.0.alpha9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0d6ef82d9ee9b28132bda459264d887de83f704a67277a0c9d4046a755e2508
-  data.tar.gz: d39e9bb5399b5d5d7167cc20a81d3ce89fff1626c7ec13847cc5042b48a802e7
+  metadata.gz: 913ec78ef91ecd5b8e9f56777878f68bcb31625c9af575597bf56a0bf025f252
+  data.tar.gz: f1e4b3292c9f4edf1ebf0318ba2d2751d0b220dc7346536014d4328772cb1879
 SHA512:
-  metadata.gz: ff214944686584ddbc3ec0f853e60d233af3cc2d34a580141fe3771d76822770c6040429266b967133356588a01aec468b54fcd40d87cdffe844b1b307f48e85
-  data.tar.gz: d6028a5f062ae873bac66ff929315e884844aae412999180484316d774c5480849c854ea731f993419552693058ada6aeb2abef74c5176e98802acb6d1c5a274
+  metadata.gz: f8affaf97ca29c3e093bf0562259bd9d878ccc216ba63a52ceb3388cfd735b92a32add0dadb8a2b748b7ba416c5a9167c0f6983dc5705b9622fbac445f4fd352
+  data.tar.gz: 56917b674308b501407ab2a4eb7882cc679794e895291db31f4bc80724c1d1e8cbcabd25b86784300e91b0ec3a0cc80bc8789f01730615965fe4b267b8a6570f

data/.rubocop.yml

@@ -11,6 +11,7 @@ AllCops:
     - vendor/**/*
     - tmp/**/*
     - test/source/**/*
+    - test/resources/src/_pages/*.rb
     - lib/site_template/Rakefile
     - lib/site_template/config.ru
     - lib/site_template/config/**/*

data/bin/bridgetown

@@ -19,11 +19,18 @@ Bridgetown::PluginManager.require_from_bundler
 # TODO: need to change behavior of Colorator gem
 ENV["THOR_SHELL"] = "Basic" if ENV["NO_COLOR"]
 
-output_version = if ARGV[0] == "-v"
+output_version = if ARGV[0] == "-v" || ARGV[0] == "--version"
                    puts "bridgetown #{Bridgetown::VERSION} \"#{Bridgetown::CODE_NAME}\""
                    true
                  end
 
+if env_index = ARGV.index { |arg| arg == "-e" } # rubocop:disable Lint/AssignmentInCondition
+  env = ARGV[env_index + 1]
+  ENV["BRIDGETOWN_ENV"] = env if env
+elsif env_flag = ARGV.find { |arg| arg.start_with?("--environment=") } # rubocop:disable Lint/AssignmentInCondition
+  ENV["BRIDGETOWN_ENV"] = env_flag.split("=").last
+end
+
 ENV["RACK_ENV"] = ENV["BRIDGETOWN_ENV"]
 
 require "bridgetown-core/commands/base"

data/bridgetown-core.gemspec

@@ -43,12 +43,12 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("kramdown",              "~> 2.1")
   s.add_runtime_dependency("kramdown-parser-gfm",   "~> 1.0")
   s.add_runtime_dependency("liquid",                "~> 5.0")
-  s.add_runtime_dependency("liquid-component",      ">= 0.1")
   s.add_runtime_dependency("listen",                "~> 3.0")
   s.add_runtime_dependency("rack-indifferent",      ">= 1.2.0")
   s.add_runtime_dependency("rake",                  ">= 13.0")
   s.add_runtime_dependency("roda",                  "~> 3.46")
   s.add_runtime_dependency("rouge",                 "~> 3.0")
+  s.add_runtime_dependency("serbea",                "~> 1.0")
   s.add_runtime_dependency("terminal-table",        "~> 1.8")
   s.add_runtime_dependency("thor",                  "~> 1.1")
   s.add_runtime_dependency("tilt",                  "~> 2.0")

data/lib/bridgetown-core/commands/concerns/configuration_overridable.rb

@@ -3,6 +3,13 @@
 module Bridgetown
   module Commands
     module ConfigurationOverridable
+      def self.included(klass)
+        desc = "The environment used for this command (aka development, test, production, etc.)"
+        klass.class_option :environment,
+                           aliases: "-e",
+                           desc: desc
+      end
+
       # Create a full Bridgetown configuration with the options passed in as overrides
       #
       # options - the configuration overrides

data/lib/bridgetown-core/commands/console.rb

@@ -1,6 +1,38 @@
 # frozen_string_literal: true
 
 module Bridgetown
+  module ConsoleMethods
+    def site
+      Bridgetown::Current.site
+    end
+
+    def collections
+      site.collections
+    end
+
+    def reload!
+      Bridgetown.logger.info "Reloading site..."
+
+      I18n.reload! # make sure any locale files get read again
+      Bridgetown::Hooks.trigger :site, :pre_reload, site
+      Bridgetown::Hooks.clear_reloadable_hooks
+      site.plugin_manager.reload_plugin_files
+      site.loaders_manager.reload_loaders
+
+      ConsoleMethods.site_reset(site)
+    end
+
+    def self.site_reset(site)
+      site.reset
+      Bridgetown.logger.info "Reading files..."
+      site.read
+      Bridgetown.logger.info "", "done!"
+      Bridgetown.logger.info "Running generators..."
+      site.generate
+      Bridgetown.logger.info "", "done!"
+    end
+  end
+
   module Commands
     class Console < Thor::Group
       extend Summarizable
@@ -37,24 +69,18 @@ module Bridgetown
         Bridgetown.logger.info "Environment:", Bridgetown.environment.cyan
         site = Bridgetown::Site.new(configuration_with_overrides(options))
 
-        unless options[:blank]
-          site.reset
-          Bridgetown.logger.info "Reading files..."
-          site.read
-          Bridgetown.logger.info "", "done!"
-          Bridgetown.logger.info "Running generators..."
-          site.generate
-          Bridgetown.logger.info "", "done!"
-        end
+        ConsoleMethods.site_reset(site) unless options[:blank]
 
-        $BRIDGETOWN_SITE = site
+        IRB::ExtendCommandBundle.include ConsoleMethods
         IRB.setup(nil)
         workspace = IRB::WorkSpace.new
         irb = IRB::Irb.new(workspace)
         IRB.conf[:IRB_RC]&.call(irb.context)
         IRB.conf[:MAIN_CONTEXT] = irb.context
-        eval("site = $BRIDGETOWN_SITE", workspace.binding, __FILE__, __LINE__)
-        Bridgetown.logger.info "Console:", "Now loaded as #{"site".cyan} variable."
+        Bridgetown.logger.info "Console:", "Your site is now available as #{"site".cyan}"
+        Bridgetown.logger.info "",
+                               "You can also access #{"collections".cyan} or perform a" \
+                               " #{"reload!".cyan}"
 
         trap("SIGINT") do
           irb.signal_handle

data/lib/bridgetown-core/commands/doctor.rb

@@ -57,8 +57,7 @@ module Bridgetown
       def conflicting_urls(site)
         conflicting_urls = false
         urls = {}
-        urls = collect_urls(urls, site.pages, site.dest)
-        urls = collect_urls(urls, site.collections.posts.docs, site.dest)
+        urls = collect_urls(urls, site.contents, site.dest)
         urls.each do |url, paths|
           next unless paths.size > 1
 
@@ -98,7 +97,11 @@ module Bridgetown
 
       def collect_urls(urls, things, destination)
         things.each do |thing|
-          dest = thing.destination(destination)
+          dest = if thing.method(:destination).arity == 1
+                   thing.destination(destination)
+                 else
+                   thing.destination
+                 end
           if urls[dest]
             urls[dest] << thing.path
           else
@@ -110,8 +113,8 @@ module Bridgetown
 
       def case_insensitive_urls(things, _destination)
         things.each_with_object({}) do |thing, memo|
-          dest = thing.destination.output_path
-          (memo[dest.downcase] ||= []) << dest
+          dest = thing.destination&.output_path
+          (memo[dest.downcase] ||= []) << dest if dest
         end
       end
 

data/lib/bridgetown-core/converters/serbea_templates.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require "serbea"
+require "rouge/lexers/serbea"
+
+module Bridgetown
+  class SerbeaView < ERBView
+    include Serbea::Helpers
+
+    def partial(partial_name, options = {}, &block)
+      options.merge!(options[:locals]) if options[:locals]
+      options[:content] = capture(&block) if block
+
+      partial_segments = partial_name.split("/")
+      partial_segments.last.sub!(%r!^!, "_")
+      partial_name = partial_segments.join("/")
+
+      Tilt::SerbeaTemplate.new(
+        site.in_source_dir(site.config[:partials_dir], "#{partial_name}.serb")
+      ).render(self, options)
+    end
+  end
+
+  module Converters
+    class SerbeaTemplates < Converter
+      priority :highest
+      input :serb
+
+      # Logic to do the Serbea content conversion.
+      #
+      # @param content [String] Content of the file (without front matter).
+      # @param convertible [
+      #   Bridgetown::GeneratedPage, Bridgetown::Resource::Base, Bridgetown::Layout]
+      #   The instantiated object which is processing the file.
+      #
+      # @return [String] The converted content.
+      def convert(content, convertible)
+        return content if convertible.data[:template_engine].to_s != "serbea"
+
+        serb_view = Bridgetown::SerbeaView.new(convertible)
+
+        serb_renderer = Tilt::SerbeaTemplate.new(convertible.relative_path) { content }
+
+        if convertible.is_a?(Bridgetown::Layout)
+          serb_renderer.render(serb_view) do
+            convertible.current_document_output
+          end
+        else
+          serb_renderer.render(serb_view)
+        end
+      end
+
+      def matches(ext, convertible)
+        if convertible.data[:template_engine].to_s == "serbea" ||
+            (convertible.data[:template_engine].nil? &&
+              @config[:template_engine].to_s == "serbea")
+          convertible.data[:template_engine] = "serbea"
+          return true
+        end
+
+        super(ext).tap do |ext_matches|
+          convertible.data[:template_engine] = "serbea" if ext_matches
+        end
+      end
+
+      def output_ext(ext)
+        ext == ".serb" ? ".html" : ext
+      end
+    end
+  end
+end

data/lib/bridgetown-core/liquid_renderer/file_system.rb

@@ -31,9 +31,7 @@ module Bridgetown
         raise Liquid::FileSystemError, "No such template '#{template_path}'" if found_paths.empty?
 
         # Last path in the list wins
-        LiquidComponent.parse(
-          ::File.read(found_paths.last, **site.file_read_opts)
-        ).content
+        ::File.read(found_paths.last, **site.file_read_opts)
       end
     end
   end

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "1.0.0.alpha8"
+  VERSION = "1.0.0.alpha9"
   CODE_NAME = "Pearl"
 end

data/lib/bridgetown-core.rb

@@ -46,7 +46,6 @@ require "active_support/descendants_tracker"
 require "hash_with_dot_access"
 require "addressable/uri"
 require "liquid"
-require "liquid-component"
 require "listen"
 require "kramdown"
 require "colorator"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha8
+  version: 1.0.0.alpha9
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -192,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: liquid-component
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +262,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: serbea
+  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: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -418,6 +418,7 @@ files:
 - lib/bridgetown-core/converters/markdown.rb
 - lib/bridgetown-core/converters/markdown/kramdown_parser.rb
 - lib/bridgetown-core/converters/ruby_templates.rb
+- lib/bridgetown-core/converters/serbea_templates.rb
 - lib/bridgetown-core/converters/smartypants.rb
 - lib/bridgetown-core/core_ext/psych.rb
 - lib/bridgetown-core/current.rb