jekyll-menus 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 112ca0fd0d0030fd3bcb7b6d7f945fe52f36a8cf
-  data.tar.gz: 4ec95edef9cacf10e9671babc3e5007ea28fba9b
+  metadata.gz: 9857598b8220c0edd8d1dcf67b6452480f71310f
+  data.tar.gz: a72b862239c693afd8b6d28d928c45ea368d0737
 SHA512:
-  metadata.gz: 4dd4067ac10a03c54a8be8966d9b8ca4592ac0544b05c6627f239ae08bab9b582d377733471e0acfb88c52aa2bd41664e1c357f605013734efa4a09b587699e8
-  data.tar.gz: 55ce626ee70a53eb6b4e28c6f208894c9c1ce4d9dfbb39b41c74bda11660fa9373bb3def5bb4d1562c4668ac59843990989a9daf997dee20b65565307347bc34
+  metadata.gz: d0337c7462c70ef80160995ff03ea2fe75c344d306eeaa313674a8f528582bee552d98f6759d3df8892a7c688f87da72926e1de6610b6ba14bac6396ed3c16bd
+  data.tar.gz: a964078532e50ce39446c318193f6263363e0739ebeed5f5d13c17b49a804dd9826c3be688493447394166b6e069e3eb953ea79519282422eaa5b84fcf9796aa

data/lib/jekyll/menus.rb

@@ -15,33 +15,34 @@ module Jekyll
 
     def to_liquid_drop
       Drops::All.new(Utils.deep_merge(
-        _config_menus, _page_menus
+        _data_menus, _page_menus
       ))
     end
 
     #
 
-    def _config_menus
-      mns = [@site.data["menu"], @site.data["menus"]]
-      out = {}; mns.compact.each do |menus|
-        menus.each do |key, menu|
-          if menu.is_a?(Hash) || menu.is_a?(Array)
-            (menu = [menu].flatten).each do |item|
-              _validate_config_menu_item(
-                item
-              )
-            end
+    def _data_menus
+      out = {}
 
-          else
-            _throw_invalid_menu_entry(
-              menu
+      @site.data["menus"].each do |key, menu|
+        if menu.is_a?(Hash) || menu.is_a?(Array)
+          (menu = [menu].flatten).each do |item|
+            _validate_config_menu_item(
+              item
             )
           end
 
-          out = Utils.deep_merge(out, {
-            key => menu
-          })
+        else
+          _throw_invalid_menu_entry(
+            menu
+          )
         end
+
+        merge = { key => menu }
+        merge["_fronmatter"] = false
+        out = Utils.deep_merge(
+          out, merge
+        )
       end
 
       out
@@ -157,8 +158,9 @@ module Jekyll
       val ||= {}
 
       val["url"] ||= page.url
-      val["title"] ||= page.data["title"]
       val["identifier"] ||= File.basename(page.name, page.ext)
+      val["title"] ||= page.data["title"]
+      val["_frontmatter"] = true
       val["weight"] ||= -1
       val
     end

data/lib/jekyll/menus/version.rb

@@ -4,6 +4,6 @@
 
 module Jekyll
   class Menus
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-menus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll