bridgetown-core 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86af5c191c5ec6097a971ccbb66489d6d71effb8a48ffe19736a7ee8319fa672
-  data.tar.gz: 2d68656ef593e5d2ed3aa1e2a3b0f3de7e1e45e1ac29b439089e0d4419c61657
+  metadata.gz: a37c6106883a48eeb4acea0c1f06d96d55743b9a0c96da58a8ce1e8d11872f6e
+  data.tar.gz: 8b6b0fbf59db76bf0f650569fe7203548639cfb4b01d1a5dfcc60ab6d6e5f47b
 SHA512:
-  metadata.gz: caf6380687cbab8f43986faf41b3c2ca42013e4d4157ffe714b6d89f4e81f8f1b51089636c6b6360b5033699a1f9f2cda5a46650f5686058d6c92efba81fff23
-  data.tar.gz: a8d429d08d30a12efe6138e8444954a7243606c1b29fe39c44d5c3882c7fe3fddac29711b1e39b7ecededd30880ecff31b2f3d1d636d5c9ead3f4b41d3999229
+  metadata.gz: d062100e89863161cae248782db05f9b0519f56bb5965f117cf0bb5734653bd4de27bdb08a063ed996af798f3f34a5e035e59b08f39084351fce33ec80074865
+  data.tar.gz: 675f41b860201cb0d80f2598761d7f187f0d59271eaebeb99fc8cb7b25931d85947047122017037eb06c8b8e048e79c17ddddabe56c658a22fa7d805e6121a45

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

@@ -33,6 +33,8 @@ module Bridgetown
                       "try again with `--force` to proceed and overwrite any files."
           end
 
+          Bridgetown.logger.info("Creating:".green, new_site_path)
+
           create_site new_site_path
 
           after_install(new_site_path, args.join(" "), options)
@@ -121,7 +123,9 @@ module Bridgetown
             end
           end
 
-          Bridgetown.logger.info "Success! 🎉 Your new Bridgetown site was" \
+          git_init path
+
+          Bridgetown.logger.info "Success!".green, "🎉 Your new Bridgetown site was" \
                                   " generated in #{cli_path.cyan}."
           Bridgetown.logger.info "Execute cd #{cli_path.cyan} to get started."
           Bridgetown.logger.info "You'll probably also want to #{"yarn install".cyan}" \
@@ -145,6 +149,16 @@ module Bridgetown
             raise SystemExit unless process.success?
           end
         end
+
+        def git_init(path)
+          Dir.chdir(path) do
+            _process, output = Bridgetown::Utils::Exec.run("git", "init")
+            output.to_s.each_line do |line|
+              Bridgetown.logger.info("Git:".green, line.strip) unless line.to_s.empty?
+            end
+          end
+        rescue SystemCallError
+        end
       end
     end
   end

data/lib/bridgetown-core/generators/prototype_generator.rb

@@ -1,15 +1,31 @@
 # frozen_string_literal: true
 
+Bridgetown::Hooks.register :pages, :post_init do |page|
+  if page.class != Bridgetown::PrototypePage && page.data["prototype"].is_a?(Hash)
+    Bridgetown::PrototypeGenerator.add_matching_template(page)
+  end
+end
+
 module Bridgetown
   class PrototypeGenerator < Generator
     priority :low
 
+    @matching_templates = []
+
+    def self.add_matching_template(template)
+      @matching_templates << template
+    end
+
+    class << self
+      attr_reader :matching_templates
+    end
+
     def generate(site)
       @site = site
       @configured_collection = "posts"
 
-      prototype_pages = site.pages.select do |page|
-        page.data["prototype"].is_a?(Hash)
+      prototype_pages = self.class.matching_templates.select do |page|
+        site.pages.include? page
       end
 
       if prototype_pages.length.positive?
@@ -42,18 +58,7 @@ module Bridgetown
     end
 
     def generate_new_page_from_prototype(prototype_page, search_term, term)
-      new_page = PrototypePage.new(prototype_page)
-      # Use the original specified term so we get "tag" back, not "tags":
-      new_page.data[prototype_page.data["prototype"]["term"]] = term
-
-      process_title_data_placeholder(new_page, prototype_page, search_term, term)
-      process_title_simple_placeholders(new_page, prototype_page, term)
-
-      new_page.data["pagination"] = {} unless new_page.data["pagination"].is_a?(Hash)
-      new_page.data["pagination"]["enabled"] = true
-      new_page.data["pagination"]["collection"] = @configured_collection
-      new_page.data["pagination"]["where_query"] = [search_term, term]
-      new_page.slugify_term(term)
+      new_page = PrototypePage.new(prototype_page, @configured_collection, search_term, term)
       @site.pages << new_page
       new_page
     end
@@ -63,43 +68,14 @@ module Bridgetown
         document.respond_to?(:collection) && document.collection.label == @configured_collection
       end
 
-      Bridgetown::Paginate::Generator::PaginationIndexer.index_documents_by(
+      Bridgetown::Paginate::PaginationIndexer.index_documents_by(
         selected_docs, search_term
       ).keys
     end
-
-    def process_title_data_placeholder(new_page, prototype_page, search_term, term)
-      if prototype_page["prototype"]["data"]
-        if new_page.data["title"]&.include?(":prototype-data-label")
-          related_data = @site.data[prototype_page["prototype"]["data"]].dig(term)
-          if related_data
-            new_page.data["#{search_term}_data"] = related_data
-            data_label = related_data[prototype_page["prototype"]["data_label"]]
-            new_page.data["title"] = new_page.data["title"].gsub(
-              ":prototype-data-label", data_label
-            )
-          end
-        end
-      end
-    end
-
-    def process_title_simple_placeholders(new_page, _prototype_page, term)
-      if new_page.data["title"]&.include?(":prototype-term-titleize")
-        new_page.data["title"] = new_page.data["title"].gsub(
-          ":prototype-term-titleize", Bridgetown::Utils.titleize_slug(term)
-        )
-      end
-
-      if new_page.data["title"]&.include?(":prototype-term")
-        new_page.data["title"] = new_page.data["title"].gsub(
-          ":prototype-term", term
-        )
-      end
-    end
   end
 
   class PrototypePage < Page
-    def initialize(prototype_page)
+    def initialize(prototype_page, collection, search_term, term)
       @site = prototype_page.site
       @url = ""
       @name = "index.html"
@@ -116,11 +92,65 @@ module Bridgetown
 
       @dir = Pathname.new(prototype_page.relative_path).dirname.to_s
       @path = site.in_source_dir(@dir, @name)
+
+      process_prototype_page_data(prototype_page, collection, search_term, term)
+
+      Bridgetown::Hooks.trigger :pages, :post_init, self
+    end
+
+    def process_prototype_page_data(prototype_page, collection, search_term, term)
+      # Fill in pagination details to be handled later by Bridgetown::Paginate
+      data["pagination"] = Bridgetown::Utils.deep_merge_hashes(
+        prototype_page.data["pagination"].to_h, {
+          "enabled"     => true,
+          "collection"  => collection,
+          "where_query" => [search_term, term],
+        }
+      )
+      # Use the original prototype page term so we get "tag" back, not "tags":
+      data[prototype_page.data["prototype"]["term"]] = term
+      # Process title and slugs/URLs:
+      process_title_data_placeholder(prototype_page, search_term, term)
+      process_title_simple_placeholders(term)
+      slugify_term(term)
+    end
+
+    def process_title_data_placeholder(prototype_page, search_term, term)
+      if prototype_page["prototype"]["data"]
+        if data["title"]&.include?(":prototype-data-label")
+          related_data = @site.data[prototype_page["prototype"]["data"]].dig(term)
+          if related_data
+            data["#{search_term}_data"] = related_data
+            data_label = related_data[prototype_page["prototype"]["data_label"]]
+            data["title"] = data["title"].gsub(
+              ":prototype-data-label", data_label
+            )
+          end
+        end
+      end
+    end
+
+    def process_title_simple_placeholders(term)
+      if data["title"]&.include?(":prototype-term-titleize")
+        data["title"] = data["title"].gsub(
+          ":prototype-term-titleize", Bridgetown::Utils.titleize_slug(term)
+        )
+      end
+
+      if data["title"]&.include?(":prototype-term")
+        data["title"] = data["title"].gsub(
+          ":prototype-term", term
+        )
+      end
     end
 
     def slugify_term(term)
       term_slug = Bridgetown::Utils.slugify(term)
-      @url = "/#{@dir}/#{term_slug}/"
+      @url = if permalink.is_a?(String)
+               data["permalink"] = data["permalink"].sub(":term", term_slug)
+             else
+               "/#{@dir}/#{term_slug}/"
+             end
     end
   end
 end

data/lib/bridgetown-core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/lib/site_template/.gitignore

@@ -1,7 +1,35 @@
+# Bridgetown
 output
-node_modules
-.sass-cache
 .bridgetown-cache
 .bridgetown-metadata
 .bridgetown-webpack
+
+# Dependency folders
+node_modules
+bower_components
 vendor
+
+# Caches
+.sass-cache
+.npm
+.node_repl_history
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore Byebug command history file.
+.byebug_history
+
+# dotenv environment variables file
+.env
+
+# Mac files
+.DS_Store
+
+# Yarn
+yarn-error.log
+yarn-debug.log*
+.pnp/
+.pnp.js
+# Yarn Integrity file
+.yarn-integrity

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable