bridgetown-core 0.15.0.beta3 → 0.15.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0731d836363a7cc613e8a42a833fb1d45e50f293558cd78238d9b214b73e2d99
-  data.tar.gz: 2597ac785d145bcd26083d08e803d4f0937165d8150bfb05eea5b9ba90ad6e4f
+  metadata.gz: 71735e11ccbfa90136e92df69397f7c27555e846a509064e5ec44640e34a807f
+  data.tar.gz: 81f2e343ca9b675dbbc15877129d3c3a1d1e410f020d006fbbcf7ba3032a56a0
 SHA512:
-  metadata.gz: 7bead893392ffe25b85bcef0419201fa5a8752793f9b8812ac26e512ab35e2638d888ec02c64c672e7930c509afbe0fffa2c98b40316351028951469e63c9310
-  data.tar.gz: e8083bd29fb64deef6f0fe17b028cb1aa373944cfcb15fe0ce686b03f6db6e12bcdbcb25842e4a508b2979facb9655cfe358fac685f7c2af4c44e2a6edb65c1c
+  metadata.gz: 96f9dd7c20e611506bacc39b87bc74bef99281f98e08fb16f05a14b2f7d3e08da8929fe9036146cce3ebdc98cf5aad3466ab6c45f34853a5af7c8c0411827155
+  data.tar.gz: be4dbaa9575a318e31555f9a1d591090fa7c12d4a3a6e53d59d1b3f92783ed910bf62db97c36c6bb1dc3f4acdbf3a2b45991b37fea5be0fd395ae72b86ea62af

data/bridgetown-core.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency("activesupport",         "~> 6.0")
   s.add_runtime_dependency("addressable",           "~> 2.4")
+  s.add_runtime_dependency("awesome_print",         "~> 1.8")
   s.add_runtime_dependency("colorator",             "~> 1.0")
   s.add_runtime_dependency("faraday",               "~> 1.0")
   s.add_runtime_dependency("faraday_middleware",    "~> 1.0")

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

@@ -8,6 +8,10 @@ require "active_support/core_ext/string/indent"
 module Bridgetown
   module Commands
     module Actions
+      GITHUB_REGEX = %r!https://github\.com!.freeze
+      GITHUB_TREE_REGEX = %r!#{GITHUB_REGEX}/.*/.*/tree/.*/?!.freeze
+      GITHUB_BLOB_REGEX = %r!#{GITHUB_REGEX}/.*/.*/blob/!.freeze
+
       def create_builder(filename, data = nil)
         say_status :create_builder, filename
         data ||= yield if block_given?
@@ -89,35 +93,36 @@ module Bridgetown
       end
 
       # TODO: option to download and confirm remote automation?
+      # rubocop:disable Metrics/MethodLength
       def transform_automation_url(arg)
         return arg unless arg.start_with?("http")
 
         remote_file = determine_remote_filename(arg)
+        github_match = GITHUB_REGEX.match(arg)
+
+        arg = if arg.start_with?("https://gist.github.com")
+                arg.sub(
+                  "https://gist.github.com", "https://gist.githubusercontent.com"
+                ) + "/raw"
+              elsif github_match
+                new_url = arg.sub(GITHUB_REGEX, "https://raw.githubusercontent.com")
+                github_tree_match = GITHUB_TREE_REGEX.match(arg)
+                github_blob_match = GITHUB_BLOB_REGEX.match(arg)
+
+                if github_tree_match
+                  new_url.sub("/tree/", "/")
+                elsif github_blob_match
+                  new_url.sub("/blob/", "/")
+                else
+                  "#{new_url}/master"
+                end
+              else
+                arg
+              end
 
-        github_regex = %r!https://github\.com!
-        github_tree_regex = %r!#{github_regex}/.*/.*/tree/.*/?!
-
-        github_match = github_regex.match(arg)
-        github_tree_match = github_tree_regex.match(arg)
-
-        if arg.start_with?("https://gist.github.com")
-          return arg.sub(
-            "https://gist.github.com", "https://gist.githubusercontent.com"
-          ) + "/raw/#{remote_file}"
-        elsif github_match
-          new_url = arg.sub(github_regex, "https://raw.githubusercontent.com")
-
-          if github_tree_match
-            new_url = new_url.sub("/tree/", "/")
-          else
-            new_url += "/master"
-          end
-
-          return "#{new_url}/#{remote_file}"
-        end
-
-        arg + "/#{remote_file}"
+        "#{arg}/#{remote_file}"
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "irb"
-
 module Bridgetown
   module Commands
     class Console < Thor::Group
@@ -21,11 +19,17 @@ module Bridgetown
                    type: :array,
                    banner: "FILE1 FILE2",
                    desc: "Custom configuration file(s)"
+      class_option :"bypass-ap",
+                   type: :boolean,
+                   desc: "Don't load AwesomePrint when IRB opens"
       class_option :blank,
                    type: :boolean,
                    desc: "Skip reading content and running generators before opening console"
 
       def console
+        require "irb"
+        require "awesome_print" unless options[:"bypass-ap"]
+
         Bridgetown.logger.info "Starting:", "Bridgetown v#{Bridgetown::VERSION.magenta}" \
                                     " (codename \"#{Bridgetown::CODE_NAME.yellow}\")" \
                                     " console…"
@@ -56,6 +60,12 @@ module Bridgetown
 
         begin
           catch(:IRB_EXIT) do
+            unless options[:"bypass-ap"]
+              AwesomePrint.defaults = {
+                indent: 2,
+              }
+              AwesomePrint.irb!
+            end
             irb.eval_input
           end
         end

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

@@ -29,6 +29,11 @@ module Bridgetown
       class_option :skip_initial_build,
                    type: :boolean,
                    desc: "Skips the initial site build which occurs before the server is started."
+      class_option :watch,
+                   type: :boolean,
+                   aliases: "-w",
+                   default: true,
+                   desc: "Watch for changes and rebuild"
 
       def self.banner
         "bridgetown serve [options]"

data/lib/bridgetown-core/drops/document_drop.rb

@@ -12,7 +12,15 @@ module Bridgetown
       mutable false
 
       def_delegator :@obj, :relative_path, :path
-      def_delegators :@obj, :id, :output, :content, :to_s, :relative_path, :url, :date
+      def_delegators :@obj,
+                     :id,
+                     :output,
+                     :content,
+                     :to_s,
+                     :relative_path,
+                     :url,
+                     :date,
+                     :related_posts
 
       private def_delegator :@obj, :data, :fallback_data
 

data/lib/bridgetown-core/page.rb

@@ -165,7 +165,7 @@ module Bridgetown
 
     # The path to the page source file, relative to the site source
     def relative_path
-      @relative_path ||= File.join(*[@dir, @name].map(&:to_s).reject(&:empty?)).sub(%r!\A\/!, "")
+      @relative_path ||= File.join(*[@dir, @name].map(&:to_s).reject(&:empty?)).delete_prefix("/")
     end
 
     # Obtain destination path.

data/lib/bridgetown-core/plugin_manager.rb

@@ -3,6 +3,7 @@
 module Bridgetown
   class PluginManager
     PLUGINS_GROUP = :bridgetown_plugins
+    YARN_DEPENDENCY_REGEXP = %r!(.+)@([^@]*)$!.freeze
 
     attr_reader :site
 
@@ -83,10 +84,10 @@ module Bridgetown
     end
 
     def self.find_yarn_dependency(loaded_gem)
-      yarn_dependency = loaded_gem.to_spec&.metadata&.dig("yarn-add")&.split("@")
-      return nil if yarn_dependency&.length != 2
+      yarn_dependency = loaded_gem.to_spec&.metadata&.dig("yarn-add")&.match(YARN_DEPENDENCY_REGEXP)
+      return nil if yarn_dependency&.length != 3 || yarn_dependency[2] == ""
 
-      yarn_dependency
+      yarn_dependency[1..2]
     end
 
     def self.add_yarn_dependency?(yarn_dependency, package_json)

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

@@ -212,7 +212,9 @@ module Bridgetown
             else
               File.join(site.config["collections_dir"], page_payload["path"])
             end
+          # rubocop:disable Performance/DeleteSuffix
           resource_path.sub!(%r!/#excerpt\z!, "")
+          # rubocop:enable Performance/DeleteSuffix
           site.in_source_dir File.dirname(resource_path)
         end
       end

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

@@ -3,6 +3,7 @@
 module Bridgetown
   module Tags
     class BlockRenderTag < Liquid::Block
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def render(context)
         context.stack({}) do
           # unindent the incoming text
@@ -19,7 +20,15 @@ module Bridgetown
           unless regions.empty?
             regions.each do |region_name, region_content|
               region_name = region_name.sub("content_with_region_", "")
-              context[region_name] = converter.convert(region_content.strip_heredoc)
+
+              if region_name.end_with? ":markdown"
+                region_name.sub!(%r!:markdown$!, "")
+                context[region_name] = converter.convert(
+                  Bridgetown::Utils.reindent_for_markdown(region_content)
+                )
+              else
+                context[region_name] = region_content
+              end
               render_params.push "#{region_name}: #{region_name}"
             end
           end
@@ -28,6 +37,7 @@ module Bridgetown
             .render_tag(context, +"")
         end
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       private
 

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.15.0.beta3"
+  VERSION = "0.15.0.beta4"
   CODE_NAME = "Overlook"
 end

data/lib/site_template/bridgetown.config.yml

@@ -10,12 +10,14 @@
 # For reloadable site metadata like title, SEO description, social media
 # handles, etc., take a look at src/_data/site_metadata.yml
 #
-# If you need help with YAML syntax, here are some quick references for you: 
+# If you need help with YAML syntax, here are some quick references for you:
 # https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml
 # https://learnxinyminutes.com/docs/yaml/
 #
 
 baseurl: "" # OPTIONAL: the subpath of your site, e.g. /blog
-url: "" # the base hostname & protocol for your site, e.g. http://example.com
+url: "" # the base hostname & protocol for your site, e.g. https://example.com
 
-# Additional build settings go here
+permalink: pretty
+
+# timezone: America/Los_Angeles

data/lib/site_template/src/_layouts/default.html

@@ -4,7 +4,7 @@
     {% render "head", metadata: site.metadata, title: page.title %}
   </head>
   <body class="{{ page.layout }} {{ page.page_class }}">
-    {% render "navbar" %}
+    {% render "navbar", metadata: site.metadata, page: page %}
 
     <main>
       {{ content }}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.15.0.beta3
+  version: 0.15.0.beta4
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: colorator
   requirement: !ruby/object:Gem::Requirement
@@ -370,9 +384,9 @@ files:
 - lib/site_template/plugins/builders/.keep
 - lib/site_template/plugins/site_builder.rb
 - lib/site_template/src/404.html
-- lib/site_template/src/_components/footer.html
-- lib/site_template/src/_components/head.html
-- lib/site_template/src/_components/navbar.html
+- lib/site_template/src/_components/footer.liquid
+- lib/site_template/src/_components/head.liquid
+- lib/site_template/src/_components/navbar.liquid
 - lib/site_template/src/_data/site_metadata.yml
 - lib/site_template/src/_layouts/default.html
 - lib/site_template/src/_layouts/home.html