munge 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0a3b52e10d621eb9279d8e67047237914533a18
-  data.tar.gz: 772664c0d20c42a8ebc98bf158cef506429b73cf
+  metadata.gz: a89ec9386b6243aad9b81eefacf82593e7ed7398
+  data.tar.gz: 207829f90d9401f2e67515ab50c8bbfb236d1bfb
 SHA512:
-  metadata.gz: 146e9511c1b41e8326657a16e20993fc44506d35b784194e8c182a2c60d0f1744a7ea85a222320ed28eb038b99e8ef9093996f7860058c377815fdeeaf7a2439
-  data.tar.gz: 77d5320774df65fd79e61dc417f2a9a4c7fd3856da5654b7055553d56d9607bbd93f3d98b9b83bd1981d178bb4330235a1f2ae3bcd75554ab6d43843a809f161
+  metadata.gz: 88bda267fc35cf2ff6b74e4e2500505aca408d306fabdc2201386721d82b801cb1bd70ee43f015caec48356d13b84f5f8c5d2922d2c2da34b03fa695996dceaa
+  data.tar.gz: acd79ec11a7b1fc356aaa3323e51c748bcbbf24add3d37ebc826dd510a8dacfb9cc9d73efdaa15c7fd0d11087987bec2a94fe880e74af332599d78aa14a7335c

data/README.md

@@ -87,6 +87,11 @@ app.create("blog/index.html.erb", "", posts: posts_for_index)
 ```
 
 
+## Guides
+
+- [FAQ](guides/faq.md)
+
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/zachahn/munge.

data/lib/munge/helpers/asset_tags.rb

@@ -15,18 +15,24 @@ module Munge
         content_tag(:script, options)
       end
 
+      def image_tag(basename, options = {})
+        options[:src] ||= image_path(basename)
+
+        empty_tag(:img, options)
+      end
+
       def inline_stylesheet_tag(basename, options = {})
-        inline_asset_tag_helper(stylesheets_root, basename, :style, options)
+        inline_asset_tag_helper(:stylesheet_path, basename, :style, options)
       end
 
       def inline_javascript_tag(basename, options = {})
-        inline_asset_tag_helper(javascripts_root, basename, :script, options)
+        inline_asset_tag_helper(:javascript_path, basename, :script, options)
       end
 
       private
 
-      def inline_asset_tag_helper(root, basename, tag, options)
-        rendered_asset = render(items["#{root}/#{basename}"])
+      def inline_asset_tag_helper(asset_path_method, basename, tag, options)
+        rendered_asset = render(send(asset_path_method, basename))
 
         content_tag(tag, rendered_asset, options)
       end

data/lib/munge/helpers/link.rb

@@ -3,7 +3,7 @@ module Munge
     module Link
       def path_to(itemish)
         item =
-          if item.is_a?(String)
+          if itemish.is_a?(String)
             system.items[itemish]
           else
             itemish

data/lib/munge/system/item_factory/item_identifier.rb

@@ -7,7 +7,7 @@ module Munge
         end
 
         def call(relpath)
-          dirname    = Munge::Util::Path.dirname(relpath)
+          dirname    = Munge::Util::Path.ensure_relpath(Munge::Util::Path.dirname(relpath))
           basename   = Munge::Util::Path.basename_no_extension(relpath)
           extensions = Munge::Util::Path.extnames(relpath)
 

data/lib/munge/version.rb

@@ -1,3 +1,3 @@
 module Munge
-  VERSION = "0.13.0".freeze
+  VERSION = "0.14.0".freeze
 end

data/seeds/layouts/blog_archives.html.erb

@@ -0,0 +1,7 @@
+<% layout("default") do %>
+  <ul>
+    <% posts.each do |post| %>
+      <li><a href="<%= path_to(post) %>"><%= post.basename %></a></li>
+    <% end %>
+  </ul>
+<% end %>

data/seeds/layouts/blog_index.html.erb

@@ -0,0 +1,7 @@
+<% layout("default") do %>
+  <h1>Blog</h1>
+
+  <% posts.each do |post| %>
+    <%= render(post) %>
+  <% end %>
+<% end %>

data/seeds/layouts/blog_show.html.erb

@@ -0,0 +1,3 @@
+<% layout("default") do %>
+  <%= yield %>
+<% end %>

data/seeds/lib/routing.rb

@@ -3,22 +3,26 @@ if ENV["MUNGE_ENV"] == "production"
     Routers::Fingerprint.new(
       extensions: config[:bin_extensions] + config[:bintext_extensions],
       separator: config[:fingeprint_separator]
-    ))
+    )
+  )
 end
 
 system.router.register(
   Routers::RemoveIndexBasename.new(
     html_extensions: config[:text_extensions],
     index: config[:index]
-  ))
+  )
+)
 
 system.router.register(
   Routers::AddIndexHtml.new(
     html_extensions: config[:text_extensions],
     index: config[:index]
-  ))
+  )
+)
 
 system.router.register(
   Routers::AutoAddExtension.new(
     keep_extensions: config[:bin_extensions] + config[:bintext_extensions]
-  ))
+  )
+)

data/seeds/rules.rb

@@ -1,35 +1,65 @@
-# HTML rules
+# General route helpers
+transform = -> (item) { item.transform }
+
+# Blog rules
+blog_items =
+  app.nonrouted
+    .select  { |item| item.relpath?("blog") }
+    .sort_by { |item| item.basename }
+    .each    { |item| item[:hide] = item.extensions.include?("draft") }
+    .each    { |item| item[:text] = item.content.valid_encoding? }
+    .each    { |item| item.route = "blog/#{item.basename}" }
+    .reverse
+
+blog_public_items = blog_items.select { |i| !i[:hide] && i[:text] }
+blog_index_items = blog_public_items[0..7]
+
+blog_items
+  .select { |item| item[:text] }
+  .each   { |item| item.layout = "blog_show" }
+  .each(&transform)
+
+app.create("blog-index.html.erb", "", posts: blog_index_items)
+  .each { |item| item.route  = "blog" }
+  .each { |item| item.layout = "blog_index" }
+  .each(&transform)
+
+app.create("blog-archive.html.erb", "", posts: blog_public_items)
+  .each { |item| item.route  = "blog/archives" }
+  .each { |item| item.layout = "blog_archives" }
+  .each(&transform)
+
+# Home page rules
 app.nonrouted
-  .select { |item| item.extensions.include?("html") }
-  .each   { |item| item.route = item.basename }
+  .select { |item| item.relpath?("home") }
+  .each   { |item| item.route = "#{item.id.sub(%r{^home/}, "")}" }
   .each   { |item| item.layout = "default" }
-  .each   { |item| item.transform }
+  .each(&transform)
+
+# Asset route helpers
+def app_asset(subdir)
+  app.nonrouted
+    .select { |item| item.relpath?("assets/#{subdir}") }
+    .reject { |item| item.basename[0] == "_" }
+end
 
 # Font rules
-app.nonrouted
-  .select { |item| item.relpath?("assets/fonts") }
-  .reject { |item| item.basename[0] == "_" }
-  .each   { |item| item.route = item.relpath }
+app_asset("fonts")
+  .each { |item| item.route = "/assets/#{item.filename}" }
 
 # Image rules
-app.nonrouted
-  .select { |item| item.relpath?("assets/images") }
-  .reject { |item| item.basename[0] == "_" }
-  .each   { |item| item.route = item.relpath }
+app_asset("images")
+  .each { |item| item.route = "/assets/#{item.filename}" }
 
 # JS rules
-app.nonrouted
-  .select { |item| item.relpath?("assets/javascripts") }
-  .reject { |item| item.basename[0] == "_" }
-  .each   { |item| item.route = "/#{item.dirname}/#{item.basename}.js" }
-  .each   { |item| item.transform }
+app_asset("javascripts")
+  .each { |item| item.route = "/assets/#{item.basename}.js" }
+  .each(&transform)
 
 # CSS rules
-app.nonrouted
-  .select { |item| item.relpath?("assets/stylesheets") }
-  .reject { |item| item.basename[0] == "_" }
-  .each   { |item| item.route = "/#{item.dirname}/#{item.basename}.css" }
-  .each   { |item| item.transform }
+app_asset("stylesheets")
+  .each { |item| item.route = "/assets/#{item.basename}.css" }
+  .each(&transform)
 
 # Sitemap
 html_pages =

data/seeds/src/blog/01-first-post.md

@@ -0,0 +1,3 @@
+## First Post
+
+I love using munge!

data/seeds/src/blog/02-second-post.md

@@ -0,0 +1,3 @@
+## Wow!
+
+This is really cool!

data/seeds/src/blog/03-third-post.draft.md

@@ -0,0 +1,3 @@
+## This is a draft
+
+This file is hidden from the primary view, but it is still compiled.

data/seeds/src/{about.html.erb → home/about.html.erb}

@@ -7,5 +7,3 @@ title: About
 <p>
   This is an example of a cool About page.
 </p>
-
-<%= render(layouts["sitemap"]) %>

data/seeds/src/{index.html.erb → home/index.html.erb}

@@ -1,5 +1,5 @@
 ---
-title: Welcome
+title: Woohoo!
 ---
 
 <h1><%= title %></h1>
@@ -28,12 +28,17 @@ title: Welcome
   <code>setup.rb</code>.
 </p>
 
-<h2>Links</h2>
+<h2>Example Links</h2>
+
+<ul>
+  <li><%= link_to(items["blog-index.html"], "Example blog") %></li>
+  <li><%= link_to(items["home/about.html"], "Example page") %></li>
+</ul>
+
+<h2>Munge Links</h2>
 
 <ul>
   <li><a href="https://github.com/zachahn/munge">Munge homepage</a></li>
   <li><a href="https://github.com/zachahn/munge/issues">Munge issues</a></li>
   <li><a href="https://rubygems.org/gems/munge">Gem homepage</a></li>
 </ul>
-
-<%= render(layouts["sitemap"]) %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: munge
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Zach Ahn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-21 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -288,27 +288,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-description: Documentation for this release is located in https://github.com/zachahn/munge/blob/v0.13.0/README.md
+description: Documentation for this release is located in https://github.com/zachahn/munge/blob/v0.14.0/README.md
 email:
 - zach.ahn@gmail.com
 executables:
@@ -373,6 +353,9 @@ files:
 - seeds/Gemfile.tt
 - seeds/config.yml
 - seeds/data.yml
+- seeds/layouts/blog_archives.html.erb
+- seeds/layouts/blog_index.html.erb
+- seeds/layouts/blog_show.html.erb
 - seeds/layouts/default.html.erb
 - seeds/layouts/sitemap.html.erb
 - seeds/lib/_asset_roots.rb
@@ -381,13 +364,16 @@ files:
 - seeds/lib/view_helpers.rb
 - seeds/rules.rb
 - seeds/setup.rb
-- seeds/src/about.html.erb
 - seeds/src/assets/fonts/.empty_directory
 - seeds/src/assets/images/.empty_directory
 - seeds/src/assets/javascripts/.empty_directory
 - seeds/src/assets/stylesheets/_vars.scss
 - seeds/src/assets/stylesheets/basic.css.scss
-- seeds/src/index.html.erb
+- seeds/src/blog/01-first-post.md
+- seeds/src/blog/02-second-post.md
+- seeds/src/blog/03-third-post.draft.md
+- seeds/src/home/about.html.erb
+- seeds/src/home/index.html.erb
 homepage: https://github.com/zachahn/munge
 licenses:
 - MIT
@@ -408,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Static site generator aiming to simplify complex build rules