bulmatown 1.0.5 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff24e6b8dc01e065dffbb38f338fdd954c320c78f8375a111d9e0444e1954410
-  data.tar.gz: 618f4bfa44cc4fe46cbf29242afbfbcc78d8c0d26f2f9aef5054d89935e205c1
+  metadata.gz: b2ab8568946d58b89c9ba7e71ff5d589cbf0038894d2a04914417fbf3913e4a0
+  data.tar.gz: a11ba62cd8c2677ef4a1d74d35ae6548f91ffd8fde8ae226112ec466b917588c
 SHA512:
-  metadata.gz: a5b5fb68cf6d4ace9dd357136817d9df798bc77b63e8db1c3bdb5f8d55c0c9fb7ca1d43143f9ef64a428409cf6b56570fe14968e1d012981139fa8d4ae5da5fc
-  data.tar.gz: 6eb5ab2b27eef236e83beebda9682045e8498dfe5a6ca19563b6d4572dc36fd3bdc92fbde85523edab403c4fb1ac0afc5578d2e43854b35fe893b3d34de7878d
+  metadata.gz: 84a080d252e43ec2e97c05cbe8a58e3875adae93558a23dcd9ba2e1471b07050865a88b110d3d59aaddfda356179225a9599acdb7edd4f6d522e95075740b947
+  data.tar.gz: 7b041ef1bfa8125573b5aaf2b9a70b30c3dfc334bf407073ec90940d77f0a822e5c1634d60a69e2eb60a95f64fa3e00d718babc57591a049adeb3164700676af

data/.rubocop.yml

@@ -4,19 +4,22 @@ inherit_gem:
   rubocop-bridgetown: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
-  Include:
-    - lib/**/*.rb
+  TargetRubyVersion: 2.7
 
   Exclude:
     - .gitignore
     - .rspec
     - .rubocop.yml
 
+    - Rakefile
+    - bridgetown.automation.rb
+    - "*.gemspec"
     - Gemfile.lock
     - CHANGELOG.md
     - LICENSE.txt
     - README.md
 
+    - example/**/*
     - script/**/*
     - vendor/**/*
+    - spec/**/*

data/CHANGELOG.md

@@ -1,7 +1,18 @@
 # master
 
-* Use this file to keep track of plugin updates
+# 1.1.0 / 2021-02-01
 
-# 0.1.0 / 2020-05-01
+* Fix installation now that Liquid components use `.liquid` extension [#4](https://github.com/whitefusionhq/bulmatown/pull/4) ([arca0](https://github.com/arca0))
 
-* First version
+# 1.0.7 / 2020-10-19
+
+* Change layout files to .liquid extension for better compatibility with Bridgetown 0.18 template engine configurations
+
+# 1.0.6 / 2020-10-02
+
+* Remove red border from error syntax #3
+* Remove italics from syntax highlighting #2
+
+# 1.0.5 / 2020-06-27
+
+* Wide release

data/README.md

@@ -3,13 +3,13 @@
 
 [Bulma](https://bulma.io) is a clean, modern CSS framework for rapid prototyping of content-focused websites. Use this theme to start using Bulma in your new [Bridgetown](https://www.bridgetownrb.com) site quickly, while preserving _all_ of the advanced customization possibilities as if you configured Bulma manually.
 
-**[LIVE DEMO](https://bulmatown.vercel.app)**
+**[LIVE DEMO](https://bulmatown.onrender.com)**
 
 ![Bulmatown Example](https://res.cloudinary.com/mariposta/image/upload/c_thumb,w_900/v1593195961/bulmatown/bulmatown-example.jpg)
 
 ## Installation
 
-Bulmatown requires Bridgetown v0.15 or later
+Bulmatown requires Bridgetown v1.0 or later (for >= 1.2), or v0.15 or later (~1.1)
 
 To install Bulmatown while creating a new Bridgetown site:
 
@@ -114,4 +114,4 @@ Then you can go to the `bulmatown` folder in your layouts or components folders
 3. Create your feature branch (`git checkout -b my-new-feature`)
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
-6. Create a new Pull Request
+6. Create a new Pull Request

data/bridgetown.automation.rb

@@ -4,11 +4,7 @@
 add_bridgetown_plugin "bulmatown"
 add_bridgetown_plugin "bridgetown-quick-search"
 
-# 0.15 bug! :( can't use this:
-#add_yarn_for_gem "bulmatown"
-
-gem_version = (`bundle info bulmatown`).match(/\*.*\((.*?)\)/)[1]
-run "yarn add bulmatown@#{gem_version}"
+add_yarn_for_gem "bulmatown"
 
 require 'fileutils'
 require 'shellwords'
@@ -60,17 +56,28 @@ def add_template_repository_to_source_path
   end
 end
 
+def copy_if_exists(file)
+  target = File.exist?("src/_layouts/#{file}.html") ? "src/_layouts/#{file}.html" : "src/_layouts/#{file}.liquid"
+  copy_file "example/src/_layouts/#{file}.liquid", target
+end
+
+def substitute_in_default_if_exists
+  if File.exists?("src/_layouts/default.liquid")
+    gsub_file "src/_layouts/default.liquid", '{% render "footer", ', '{% render "footer", url: site.url, '
+  elsif File.exists?("src/_layouts/default.html")
+    gsub_file "src/_layouts/default.html", '{% render "footer", ', '{% render "footer", url: site.url, '
+  else
+    say_status :bulmatown, "Could not find the default template. You will have to add the url parameter to the render command manually"
+  end
+end
+
 if yes? "The Bulmatown installer can update styles, layouts, and page templates to use the new theme. You'll have the option to type 'a' to overwrite all existing files or 'd' to inspect each change. Would you like to proceed? (Y/N)"
   add_template_repository_to_source_path
 
   create_file "frontend/styles/index.scss", '@import "~bulmatown/frontend/styles"'
-  
-  copy_file "example/src/_layouts/home.html", "src/_layouts/home.html"
-  copy_file "example/src/_layouts/page.html", "src/_layouts/page.html"
-  copy_file "example/src/_layouts/post.html", "src/_layouts/post.html"
-
 
-  gsub_file "src/_layouts/default.html", '{% render "footer", ', '{% render "footer", url: site.url, '
+  ["home", "page", "post"].each { |f| copy_if_exists(f) }
+  substitute_in_default_if_exists
 
   copy_file "example/src/index.md", "src/index.md"
   copy_file "example/src/posts.md", "src/posts.md"
@@ -94,4 +101,4 @@ if twitter != "" && twitter != "no"
   end
 end
 
-say_status :bulmatown, "Theme installation complete! Enjoy your fresh new design :)"
+say_status :bulmatown, "Theme installation complete! Enjoy your fresh new design :)"

data/bulmatown.gemspec

@@ -6,24 +6,24 @@ Gem::Specification.new do |spec|
   spec.name          = "bulmatown"
   spec.version       = Bulmatown::VERSION
   spec.author        = "Jared White"
-  spec.email         = "jared@whitefusion.io"
+  spec.email         = "jared@whitefusion.studio"
   spec.summary       = "A Bulma CSS starter theme for Bridgetown"
   spec.homepage      = "https://github.com/whitefusionhq/bulmatown"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|script|spec|features|frontend)/!) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|script|spec|features|frontend|example)/!) }
   spec.test_files    = spec.files.grep(%r!^spec/!)
   spec.require_paths = ["lib"]
   spec.metadata      = { "yarn-add" => "bulmatown@#{Bulmatown::VERSION}" }
 
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
-  spec.add_dependency "bridgetown", ">= 0.15", "< 2.0"
-  spec.add_dependency "bridgetown-quick-search", "~> 1.0"
+  spec.add_dependency "bridgetown", ">= 1.0.0.alpha10", "< 2.0"
+  spec.add_dependency "bridgetown-quick-search", "~> 1.1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "nokogiri", "~> 1.6"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", ">= 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop-bridgetown", "~> 0.2"
+  spec.add_development_dependency "rubocop-bridgetown", "~> 0.3"
 end

data/components/bulmatown/collection.liquid

@@ -1,34 +1,34 @@
 <div class="columns is-multiline">
-  {% for document in collection %}
+  {% for resource in collection %}
     {%- assign imagesource = metadata.bulmatown_theme.image_sizes.embed | default: "image" %}
     <div class="column is-full-mobile is-full-tablet is-half-desktop">
       <div class="box document-entry">
-        {% if document.image %}
+        {% if resource.image %}
           <figure class="image is-5by3">
-            <a href="{{ document.url }}">
-              <img src="{{ document[imagesource] }}" />
+            <a href="{{ resource.relative_url }}">
+              <img src="{{ resource[imagesource] }}" />
             </a>
           </figure>
         {% endif %}
     
         <div class="content">
           <h3>
-            <a class="is-decorationless" href="{{ document.url }}">
-              {{ document.title | smartify }}
+            <a class="is-decorationless" href="{{ resource.relative_url }}">
+              {{ resource.title | smartify }}
             </a>
           </h3>
     
-          {% if document.subtitle and document.subtitle != "" %}
-            {% assign excerpt = document.subtitle | smartify | prepend: "<p>" | append: "</p>" %}
-          {% elsif document.description and document.description != "" %}
-            {% assign excerpt = document.description | smartify | prepend: "<p>" | append: "</p>" %}
+          {% if resource.subtitle and resource.subtitle != "" %}
+            {% assign excerpt = resource.subtitle | smartify | prepend: "<p>" | append: "</p>" %}
+          {% elsif resource.description and resource.description != "" %}
+            {% assign excerpt = resource.description | smartify | prepend: "<p>" | append: "</p>" %}
           {% else %}
-            {% assign excerpt = document.excerpt %}
+            {% assign excerpt = resource.excerpt %}
           {% endif %}
           {{ excerpt }}
           
           <p class="mt-5">
-            {% render "bulmatown/button", type: "primary", label: "Continue Reading", link: document.url, icon: "file-text" %}
+            {% render "bulmatown/button", type: "primary", label: "Continue Reading", link: resource.relative_url, icon: "file-text" %}
           </p>
         </div>
       </div>

data/components/bulmatown/pagination.liquid

@@ -1,18 +1,3 @@
----
-name: Pagination
-description: Display previous page and/or next page buttons to navigate through paginated pages.
-variables:
-  paginator:
-    - object
-    - The Bridgetown Paginator object ([see documentation here](https://www.bridgetownrb.com/docs/content/pagination/))
-mocks:
-  paginator:
-    total_pages: 3
-    previous_page: true
-    previous_page_path: "#previous"
-    next_page: true
-    next_page_path: "#next"
----
 {% if paginator.total_pages > 1 %}
   <ul class="pagination mt-6">
     {% if paginator.previous_page %}

data/lib/bulmatown/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bulmatown
-  VERSION = "1.0.5"
+  VERSION = "1.2.2"
 end

data/package.json

@@ -1,13 +1,13 @@
 {
   "name": "bulmatown",
   "description": "A Bulma CSS starter theme for Bridgetown",
-  "version": "1.0.5",
+  "version": "1.2.2",
   "main": "frontend/javascript/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/whitefusiohq/bulmatown.git"
   },
-  "author": "Jared White <jared@whitefusion.io>",
+  "author": "Jared White <jared@whitefusion.studio>",
   "homepage": "https://www.bridgetownrb.com",
   "license": "MIT",
   "private": false,
@@ -16,7 +16,7 @@
     "frontend"
   ],
   "dependencies": {
-    "bridgetown-quick-search": "^1.0.3",
+    "bridgetown-quick-search": "^1.1.3",
     "bulma": "^0.9",
     "fork-awesome": "^1.1.7"
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulmatown
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.2.2
 platform: ruby
 authors:
 - Jared White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-27 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 1.0.0.alpha10
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 1.0.0.alpha10
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +76,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -106,16 +106,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description: 
-email: jared@whitefusion.io
+email: jared@whitefusion.studio
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -139,44 +139,9 @@ files:
 - components/bulmatown/navbar.liquid
 - components/bulmatown/navbar.scss
 - components/bulmatown/pagination.liquid
-- example/.gitignore
-- example/Gemfile
-- example/bridgetown.config.yml
-- example/frontend/fonts/forkawesome-webfont.eot
-- example/frontend/fonts/forkawesome-webfont.svg
-- example/frontend/fonts/forkawesome-webfont.ttf
-- example/frontend/fonts/forkawesome-webfont.woff
-- example/frontend/fonts/forkawesome-webfont.woff2
-- example/frontend/javascript/index.js
-- example/frontend/styles/index.scss
-- example/package.json
-- example/plugins/builders/.keep
-- example/plugins/site_builder.rb
-- example/src/404.html
-- example/src/_components/footer.liquid
-- example/src/_components/head.liquid
-- example/src/_components/navbar.liquid
-- example/src/_data/authors.yml
-- example/src/_data/site_metadata.yml
-- example/src/_layouts/default.html
-- example/src/_layouts/home.html
-- example/src/_layouts/page.html
-- example/src/_layouts/post.html
-- example/src/_posts/2020-06-13-this-is-groovy.md
-- example/src/_posts/2020-06-13-welcome-to-bridgetown.md
-- example/src/about.md
-- example/src/authors/author.html
-- example/src/favicon.ico
-- example/src/images/jared-white-avatar.jpg
-- example/src/index.md
-- example/src/posts.md
-- example/start.js
-- example/sync.js
-- example/webpack.config.js
-- example/yarn.lock
-- layouts/bulmatown/homepage.html
-- layouts/bulmatown/page.html
-- layouts/bulmatown/post.html
+- layouts/bulmatown/homepage.liquid
+- layouts/bulmatown/page.liquid
+- layouts/bulmatown/post.liquid
 - lib/bulmatown.rb
 - lib/bulmatown/version.rb
 - package.json
@@ -185,7 +150,7 @@ homepage: https://github.com/whitefusionhq/bulmatown
 licenses:
 - MIT
 metadata:
-  yarn-add: bulmatown@1.0.5
+  yarn-add: bulmatown@1.2.2
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -194,14 +159,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A Bulma CSS starter theme for Bridgetown

data/example/.gitignore

@@ -1,35 +0,0 @@
-# Bridgetown
-output
-.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

data/example/Gemfile

@@ -1,22 +0,0 @@
-source "https://rubygems.org"
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-
-# Hello! This is where you manage which Bridgetown version is used to run.
-# When you want to use a different version, change it below, save the
-# file and run `bundle install`. Run Bridgetown with `bundle exec`, like so:
-#
-#   bundle exec bridgetown serve
-#
-# This will help ensure the proper Bridgetown version is running.
-#
-# To install a plugin, simply run bundle add and specify the group
-# "bridgetown_plugins". For example:
-#
-#   bundle add some-new-plugin -g bridgetown_plugins
-#
-# Happy Bridgetowning!
-
-gem "bridgetown"
-gem "bridgetown-quick-search", "~> 1.0", :group => :bridgetown_plugins
-
-gem "bulmatown", group: :bridgetown_plugins

data/example/bridgetown.config.yml

@@ -1,26 +0,0 @@
-# Welcome to Bridgetown!
-#
-# This config file is for settings that affect your whole site, values
-# which you are expected to set up once and rarely edit after that.
-#
-# For technical reasons, this file is *NOT* reloaded automatically when you use
-# 'bundle exec bridgetown serve'. If you change this file, please restart the
-# server process.
-#
-# 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: 
-# 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
-# Additional build settings go here
-permalink: pretty
-
-timezone: America/Los_Angeles
-
-pagination:
-  enabled: true