jekyll-menus 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 859faa05008b32a4dc901ab2bf3d4ebf20999a59
-  data.tar.gz: bd2c4676878bebb4043f0435daf75bdcbc5369ec
+  metadata.gz: 23caf21f1f3caca6e45203449759dcf3bac8290f
+  data.tar.gz: 2e36f81c8552475453e2d428fe0be32840af0843
 SHA512:
-  metadata.gz: e7b2e957ddcf6dd1e3b2e9673a3a6c2e75897551ca09e82bfde65c0cf307076dd5e9af19dda5b58bcccc45acc20e1b0181653696d5c0167fbf14e9f5c63f0c16
-  data.tar.gz: a1249183b2204a72c7a25608202ef152387a512307a0d4343b0233ad926902d9c0207b2dc77bf5053d22eeac364f147238b27e54d7620a12eaa04c2b3280cf60
+  metadata.gz: 629e105dc21e21dca324213daa0b8972aa5db6ac0cfe7a89c0acaaaa2494f4fdb5e486a1921ca6abac736eabac0dc17f21cf02894f126e5bc9e364b7a47db263
+  data.tar.gz: fe67cf3459e6ff81dddf6f5cc5ebed7c04d65289cf0bc8c865a2db2f1abdac530d1fa7dcd3909fe472a480191050c56e42878a4823639ed7f6d262f808fbae6b

data/lib/jekyll/menus.rb

@@ -14,9 +14,7 @@ module Jekyll
     #
 
     def menus
-      Utils.deep_merge(
-        _data_menus, _page_menus
-      )
+      Utils.deep_merge(_data_menus, Utils.deep_merge(_page_menus, _collection_menus))
     end
 
     #
@@ -38,6 +36,8 @@ module Jekyll
             _validate_config_menu_item(
               item
             )
+
+            item["_frontmatter"] = false
           end
 
         else
@@ -47,7 +47,6 @@ module Jekyll
         end
 
         merge = { key => menu }
-        merge["_fronmatter"] = false
         out = Utils.deep_merge(
           out, merge
         )
@@ -63,70 +62,93 @@ module Jekyll
 
       @site.pages.select { |p| p.data.keys.grep(/menus?/).size > 0 }.each_with_object({}) do |page|
         [page.data["menus"], page.data["menu"]].flatten.compact.map do |menu|
+          out = _front_matter_menu(menu, page, out)
+        end
+      end
+
+      out
+    end
+
+    #
+
+    def _collection_menus
+      out = {}
+
+      @site.collections.each do |collection, pages|
+        pages.select { |p| p.data.keys.grep(/menus?/).size > 0 }.each_with_object({}) do |page|
+          [page.data["menus"], page.data["menu"]].flatten.compact.map do |menu|
+            out = _front_matter_menu(menu, page, out)
+          end
+        end
+      end
+
+      out
+    end
+
+    #
+
+    def _front_matter_menu(menu, page, out={})
+      # --
+      # menu: key
+      # menu:
+      #   - key1
+      #   - key2
+      # --
+
+      if menu.is_a?(Array) || menu.is_a?(String)
+        _simple_front_matter_menu(menu, {
+          :mergeable => out, :page => page
+        })
+
+      #
+
+      elsif menu.is_a?(Hash)
+        menu.each do |key, item|
+          out[key] ||= []
 
           # --
-          # menu: key
           # menu:
-          #   - key1
-          #   - key2
+          #   key: identifier
           # --
 
-          if menu.is_a?(Array) || menu.is_a?(String)
-            _simple_front_matter_menu(menu, {
-              :mergeable => out, :page => page
+          if item.is_a?(String)
+            out[key] << _fill_front_matter_menu({ "identifier" => item }, {
+              :page => page
             })
 
-          #
-
-          elsif menu.is_a?(Hash)
-            menu.each do |key, item|
-              out[key] ||= []
-
-              # --
-              # menu:
-              #   key: identifier
-              # --
-
-              if item.is_a?(String)
-                out[key] << _fill_front_matter_menu({ "identifier" => item }, {
-                  :page => page
-                })
-
-              # --
-              # menu:
-              #   key:
-              #     url: /url
-              # --
-
-              elsif item.is_a?(Hash)
-                out[key] << _fill_front_matter_menu(item, {
-                  :page => page
-                })
-
-              # --
-              # menu:
-              #   key:
-              #     - url: /url
-              # --
-
-              else
-                _throw_invalid_menu_entry(
-                  item
-                )
-              end
-            end
+          # --
+          # menu:
+          #   key:
+          #     url: /url
+          # --
+
+          elsif item.is_a?(Hash)
+            out[key] << _fill_front_matter_menu(item, {
+              :page => page
+            })
 
           # --
           # menu:
-          #   key: 3
+          #   key:
+          #     - url: /url
           # --
 
           else
             _throw_invalid_menu_entry(
-              menu
+              item
             )
           end
         end
+
+      # --
+      # menu:
+      #   key: 3
+      # --
+
+      else
+        _throw_invalid_menu_entry(
+          menu
+        )
       end
 
       out
@@ -166,15 +188,25 @@ module Jekyll
       val ||= {}
 
       val["url"] ||= page.url
-      val["identifier"] ||= File.basename(page.name, page.ext)
+      val["identifier"] ||= slug(page)
+      val["_frontmatter"] = page.relative_path # `page.url` can be changed with permalink frontmatter
       val["title"] ||= page.data["title"]
-      val["_frontmatter"] = true
       val["weight"] ||= -1
       val
     end
 
     #
 
+    private
+    def slug(page)
+      out = File.join(File.dirname(page.path), File.basename(page.path, page.ext))
+      out.tr("^a-z0-9-_\\/", "").gsub(
+        /\/|\-+/, "_"
+      )
+    end
+
+    #
+
     private
     def _validate_config_menu_item(item)
       if !item.is_a?(Hash) || !item.values_at("url", "title", "identifier").compact.size == 3

data/lib/jekyll/menus/version.rb

@@ -4,6 +4,6 @@
 
 module Jekyll
   class Menus
-    VERSION = "0.0.5"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-menus
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll