simpler_navigation 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6f6f19aa6714540a0ac3161f958b90d8fa963a3ec9113828be5e764b3b2d3e6
-  data.tar.gz: 9af30ae6fcc8dc3f5c98d31abc99b77e7cfccaf5a2b58b05d8faca641248ed39
+  metadata.gz: 898421e7c748a8dd8c8f9f72ae5d37b358c91b66603b9e2691e0681f10e1b496
+  data.tar.gz: 9bdc4a5b4d05f8d7cf9c082eca9b1e7064a348a4744439c3961d0ef8f46faa17
 SHA512:
-  metadata.gz: 073f6c31cc9cf79eead24605f666a9ef26cc8e8a843eec6c39deaa2dc88b3af66c038940cd2a6965250849a2da8697bf7fdb24560bf122afbc83b918a7d3f381
-  data.tar.gz: 19f11f240651c770338b8e1fde1a3ef5da11b0923256761b1512c99b3fb87dace237950679bbec056e406a9fe1223a6a618113a3dcb85475d027f5fa45847911
+  metadata.gz: 558244e08471d58117e363d2bcd65b449692a28a7114f070d2fd1b0388f124b4b50b48d4b567ae6b1640a580f7ca19b19fdf016a687e7fa3c307b9ffc5326b65
+  data.tar.gz: ea12d233decd28eefba17be1bf82b7d7af7b9656b5c5f6b01ff932a233dbbe831103fde538f394817beb4a65599fa4035cf0a44f46523601bb4ab83d5f42acf0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simpler_navigation (0.1.2)
+    simpler_navigation (0.1.4)
       actionview
       railties
 

data/lib/simpler_navigation/renderers/base.rb

@@ -16,6 +16,11 @@ module SimplerNavigation
         @item = item
         @options = options
 
+        @request_fullpath = context.request.fullpath
+        if @options[:request_fullpath]
+          @request_fullpath = @options[:request_fullpath]
+        end
+
         if @item.nil?
           case @options[:level]
           when :all
@@ -112,14 +117,12 @@ module SimplerNavigation
         selected = false
         case item.options[:highlights_on]
         when Regexp
-          selected = item.options[:highlights_on].match?(SimplerNavigation.request_fullpath)
+          selected = item.options[:highlights_on].match?(@request_fullpath)
         when Proc
           selected = item.options[:highlights_on].call
         else
-          if SimplerNavigation.request_fullpath
-            item_url_path = url_path(item.url).downcase
-            selected = SimplerNavigation.request_fullpath.downcase.start_with?(item_url_path)
-          end
+          item_url_path = url_path(item.url).downcase
+          selected = @request_fullpath.downcase.start_with?(item_url_path)
         end
 
         selected ||= item.children.any? do |key, value|
@@ -147,23 +150,9 @@ module SimplerNavigation
 
         show = true
         if !item.options[:if].nil?
-          show = case item.options[:if]
-          when false
-            false
-          when true
-            true
-          else
-            item.options[:if].call
-          end
+          show = item.options[:if].call
         elsif !item.options[:unless].nil?
-          show = case item.options[:unless]
-          when false
-            true
-          when true
-            false
-          else
-            !item.options[:unless].call
-          end
+          show = !item.options[:unless].call
         end
 
         @show[item] = show

data/lib/simpler_navigation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimplerNavigation
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/lib/simpler_navigation.rb

@@ -12,6 +12,5 @@ module SimplerNavigation
 
   class << self
     attr_accessor :config
-    attr_accessor :request_fullpath
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simpler_navigation
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Nick Muerdter