simpler_navigation 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 626e64edbed0821098ffb7e9f41ea482af4c902d6cfd1390d57c307906aaced8
-  data.tar.gz: 4c3ee2f62d975d7cc1c4d6c1de00650479e2acf0bad15f492b92f19e5f2e66df
+  metadata.gz: 9908cfb5f2b322d53eb970c3932ba640400e2c355737a2280d9bb7a30637b8ce
+  data.tar.gz: 9bb0f02a4ac18339d251823fc0e1d06f22014ea96a1f4f9269b946689395cf31
 SHA512:
-  metadata.gz: bd5187bbfa35c31aff30a0440b4f61edc3fe579cd98e791baacfada451802ed412eb781f063e8582e74686fe24155cd6dae1a59706c1361c3af6cec8244ca84c
-  data.tar.gz: 158cdb352ec4541741babcc8684106115a5915a33693af17dcf8670e65ad096adcec4f98fe329183e536cc32c97413f48c3398652c1edce997acaa8fc3496e1f
+  metadata.gz: a138ed6833abfca0ceb711e1b8d07f44bc2c922c610577c1ec0c377b7f22a992c01cf2302dc1cca764a8489e309facab2df2a507000f18c6261044722ff3e491
+  data.tar.gz: ba440cc7cc406c1ef9240e921d3fea646d6f8fa922800bc3be258b17a82c6b2d04da50f26b85eaeb979d512a16338bf30bfcb2e633cd4bb9ee957629898e2c7e

data/Gemfile.lock

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

data/lib/simpler_navigation/renderers/base.rb

@@ -16,6 +16,13 @@ module SimplerNavigation
         @item = item
         @options = options
 
+        @options[:level] ||= :all
+
+        @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 +119,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|

data/lib/simpler_navigation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimplerNavigation
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 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.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Nick Muerdter