partial_menu 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2f7cfdeda9acf5869bd136fced7856ee245acc7
-  data.tar.gz: 3f39a8d84a7ec4b7d534c95dd4f2ec9b9b2b0506
+  metadata.gz: 181659250bbe125e352f139681dbdf5855a62aed
+  data.tar.gz: da2392d9ffc6df62a0184b5a3d02ec21e8087891
 SHA512:
-  metadata.gz: ba658e35aa77abdb76429d4e3aec439fc1f5363f5c1b701597e5fed5e92d4bc34d2ce67747ced90052eaeb60e931e53cd975eda99f69cfca3e784e99d3e953d4
-  data.tar.gz: 7093377f04f556579552643905f303de8e2f1bbffffc342ce1a062bb822ffa3cd177ed70a2cb3df4b9a1aae73bc9b6391a94d4206cf7e1c60069003e6d19b013
+  metadata.gz: 6ba35a2ce2d2a94896ed3a3abd36c366e0bd2b14b3c1a9268b62ff0225bcfaf0a418fd0bc2e068c23bd0f3a6743270b6606124102d2cfaef9038590f5668081d
+  data.tar.gz: e60fdc41de3c4ba83b0ab7898b6f88f0d1305825ea3d34109510c5edd69ff24f7bd805e9868f685c346d56a942fbf906754a7a8244637167c234acbdbc82aee9

data/lib/generators/views/templates/_item.html.erb

@@ -1,4 +1,4 @@
-<li class="<%= 'active' if is_active_link?(url_for(item.uri), :inclusive) %>">
+<li class="<%= 'active' if item.active?(self) %>">
   <% if item.try(:icon).present? -%>
     <i class="<%= item.try(:icontype) || 'fa' %> <%= item.try(:icontype) || 'fa'%>-fw <%= item.icon %>"></i>
   <% end -%>

data/lib/generators/views/templates/_menu.html.erb

@@ -1,4 +1,4 @@
-<ul>
+<ul class="<%= 'active' if menu.active?(self) %>">
   <% menu.items.each do |item| -%>
     <% if item.submenu? -%>
       <%= render "#{menu.layout}_menu/submenu", menu: item.submenu -%>

data/lib/generators/views/templates/_submenu.html.erb

@@ -1,5 +1,5 @@
 <li class="nav-item" title="<%= menu.parent.title %>" data-original-title="<%= menu.parent.title %>">
-  <a class="nav-link nav-link-collapse collapsed" data-toggle="collapse"
+  <a class="nav-link nav-link-collapse collapsed" data-toggle="<%= 'collapse' unless menu.active?(self)%>"
     href="#collapse<%= menu.id %>"  data-parent="#<%= menu.layout %>">
     <% if menu.parent.try(:icon).present? %>
       <i class="<%= menu.parent.try(:icontype) || 'fa'%> <%= menu.parent.try(:icontype) || 'fa'%>-fw <%= menu.parent.icon %>"></i>

data/lib/generators/views/templates/_submenu_item.html.erb

@@ -1,4 +1,4 @@
-<li class="<%= 'active' if is_active_link?(item.uri, :inclusive) %>">
+<li class="<%= 'active' if item.active?(self) %>">
   <% if item.try(:icon).present? -%>
     <i class="fa fa-fw <%= item.icon %>"></i>
   <% end -%>

data/lib/partial_menu/menu.rb

@@ -28,6 +28,20 @@ module PartialMenu
     end
     # rubocop:enable Metrics/MethodLength
 
+    ##
+    # True if current url relates to any child menu item's uri
+    #
+    # @params [ActionView] Needs view context to get current request details
+    #
+    # @retrun [boolean]
+    #
+    def active?(view)
+      @items.each do |item|
+        return true if item.active?(view)
+      end
+      false
+    end
+
     private
 
     def add_items(items)

data/lib/partial_menu/menu_item.rb

@@ -1,9 +1,7 @@
-require 'active_link_to'
-
 module PartialMenu
   # Represents menu item in a menu
   class MenuItem
-    include ActiveLinkTo
+    include ActionView::Helpers::UrlHelper
 
     attr_reader :type
     attr_reader :parent
@@ -45,12 +43,23 @@ module PartialMenu
     ##
     # True if menu item is a separator
     #
-    # @ return [boolean]
+    # @return [boolean]
     #
     def separator?
       @type == :separator
     end
 
+    ##
+    # True if current url relates to the menu item's uri
+    #
+    # @params [ActionView] Needs view context to get current request details
+    #
+    # @retrun [boolean]
+    #
+    def active?(view)
+      view.current_page? @uri
+    end
+
     private
 
     ##

data/lib/partial_menu/version.rb

@@ -1,3 +1,3 @@
 module PartialMenu
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: partial_menu
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Peter Nagy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: active_link_to
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement