ichiban 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e432ce9f46b90434cc7dbbdaf5dc43d5797c90f3
-  data.tar.gz: 40ad539678520c0931556150b139e8f49dccde5a
+  metadata.gz: 40da37f436ac3296743d2becb2098d58e59ef504
+  data.tar.gz: 78927f05443992fde4ae019ffd842c5f29e7e611
 SHA512:
-  metadata.gz: bc627c2d62143885e1527df917e98f0ec849042cb8cbf1461c47807f600ba4e800600388b73b20ed62244e6aa585c63d0bb21db8c9dc435df05e5cf750000033
-  data.tar.gz: e9ac06ee5c7d1d9290d3ab939f5d33020f3f5bcfb2ceb688dd1d98611a8ab3778ea41d6281e4d805563f848aec6878d5a03492ec5428d5de13f6c7eab7f8f3f8
+  metadata.gz: 628a764f66be754f023e99a7eaf7669c9ec3695538d98fd3ad5dc87216e8dd989567b3b94e871b838649e1a0d937bf02c3ae0435edb7613e5e36d4e53edcb8b2
+  data.tar.gz: bb431afb2682dfe43124451b4dd955d716e4f5b4a0684dbcbf3c9cb57fd542d4117a0173cd2ae5a5a8303910102c1894061165c67abd442521282f6c83d5c561

data/lib/ichiban/nav_helper.rb

@@ -45,12 +45,9 @@ module Ichiban
         
         # The path for this menu item did not match. So search recursively for a matching
         # path in this item's sub-menu.
-        !sub_menu.detect do |item|        
-          # If an item has a sub-menu, then that menu must be the third element of the array.
-          # (The format is [text, path, sub_menu, li_options].) So we recursively search the
-          # descendant menu(s) of this item.
-          (item[2].is_a?(Array) and menu_matches_current_path?(item[1], item[2], options))
-        end.nil?
+        (!sub_menu.nil? and sub_menu.any? do |_, sub_path, sub_sub_menu|
+          menu_matches_current_path? sub_path, sub_sub_menu, options
+        end)
       end
       
       # Recursive
@@ -67,7 +64,13 @@ module Ichiban
         @ctx.content_tag('ul', ul_options) do
           items.inject('') do |lis, item|
             text = item.shift
+            unless text.is_a?(String)
+              raise "Invalid data structure passed to nav. Expected String, but got #{text.inspect}"
+            end
             path = item.shift
+            unless path.is_a?(String)
+              raise "Invalid data structure passed to nav. Expected String, but got #{path.inspect}"
+            end
             
             # After the text and path, there are two optional parameters: Sub-menu (an array)
             # and <li> options (a hash). If both exist, they must come in that order. But either
@@ -85,11 +88,20 @@ module Ichiban
             case third
             when Array
               sub_menu = third
-              if fourth.is_a?(Hash)
+              case fourth
+              when Hash
                 li_attrs = fourth
+              when nil
+                # Do nothing.
+              else
+                raise "Invalid data structure passed to nav. Expected Hash or nil, but got #{fourth.inspect}"
               end
             when Hash
               li_attrs.merge!(third)
+            when nil
+              # Do nothing.
+            else
+              raise "Invalid data structure passed to nav. Expected Array, Hash, or nil, but got #{third.inspect}"
             end
             
             # If the path has a leading slash, consider it absolute and prepend it with

data/lib/ichiban/version.rb

@@ -1,3 +1,3 @@
 module Ichiban
-  VERSION = '1.2.7'
+  VERSION = '1.2.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ichiban
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Jarrett Colby