navigator 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47457791c37025322e53fdc0342b4135fd93be35
-  data.tar.gz: 6759a1c4b24e77c4e1facde01084c23923c91516
+  metadata.gz: 20887cf2bca68709c18f7d4925e30141e0b19815
+  data.tar.gz: dac5ba93f0eb26efc3f2e81647ce5bacc609b647
 SHA512:
-  metadata.gz: d129a5e2fa91db450379b3bb9d74d45f37d99a8c1bb5c19d31bfe118298b3515e28578a1dbf254834403aadea1813838aab340aa285a5032a9dfa0fee6a39439
-  data.tar.gz: 78fe251d5b31ab7f1a214c5347d4f5ea9e3355725cc12814c4058705b44f1f990e44088489b3a82b850994218f40a798a576625835c24bc7e1fe95514477d445
+  metadata.gz: a1d02e611878a314844739bbf646313a73b64992ad250867f3406c100e2631163c0c3c05a099b3a2d384350b4b9cba328e5df302b8a66265625c26e72406ee3d
+  data.tar.gz: 1c477bd924d09242e6b920335fd850791d3d04b4a330bd3b404b671160699ff3e66299a389107c1e47869d16188a939856e3a2805610bc8aa0a671c9e0eb22b1

data/README.md

@@ -4,38 +4,38 @@
 [![Code Climate GPA](https://codeclimate.com/github/bkuhlmann/navigator.svg)](https://codeclimate.com/github/bkuhlmann/navigator)
 [![Code Climate Coverage](https://codeclimate.com/github/bkuhlmann/navigator/coverage.svg)](https://codeclimate.com/github/bkuhlmann/navigator)
 [![Gemnasium Status](https://gemnasium.com/bkuhlmann/navigator.svg)](https://gemnasium.com/bkuhlmann/navigator)
-[![Travis CI Status](https://secure.travis-ci.org/bkuhlmann/navigator.svg)](https://travis-ci.org/bkuhlmann/navigator)
+[![Circle CI Status](https://circleci.com/gh/bkuhlmann/navigator.svg?style=svg)](https://circleci.com/gh/bkuhlmann/navigator)
 [![Patreon](https://img.shields.io/badge/patreon-donate-brightgreen.svg)](https://www.patreon.com/bkuhlmann)
 
 Enhances Rails with a DSL for menu navigation.
 
 <!-- Tocer[start]: Auto-generated, don't remove. -->
 
-# Table of Contents
-
-- [Features](#features)
-- [Requirements](#requirements)
-- [Setup](#setup)
-- [Usage](#usage)
-  - [Unordered List (simple)](#unordered-list-simple)
-  - [Unordered List (with attributes)](#unordered-list-with-attributes)
-  - [Unordered List (with multiple data attributes)](#unordered-list-with-multiple-data-attributes)
-  - [Nav (with links)](#nav-with-links)
-  - [Foundation Menu](#foundation-menu)
-  - [Bootstrap Dropdown](#bootstrap-dropdown)
-  - [Menu Helpers](#menu-helpers)
-- [Customization](#customization)
-- [Tests](#tests)
-- [Versioning](#versioning)
-- [Code of Conduct](#code-of-conduct)
-- [Contributions](#contributions)
-- [License](#license)
-- [History](#history)
-- [Credits](#credits)
+## Table of Contents
+
+  - [Features](#features)
+  - [Requirements](#requirements)
+  - [Setup](#setup)
+  - [Usage](#usage)
+    - [Unordered List (simple)](#unordered-list-simple)
+    - [Unordered List (with attributes)](#unordered-list-with-attributes)
+    - [Unordered List (with multiple data attributes)](#unordered-list-with-multiple-data-attributes)
+    - [Nav (with links)](#nav-with-links)
+    - [Foundation Menu](#foundation-menu)
+    - [Bootstrap Dropdown](#bootstrap-dropdown)
+    - [Menu Helpers](#menu-helpers)
+  - [Customization](#customization)
+  - [Tests](#tests)
+  - [Versioning](#versioning)
+  - [Code of Conduct](#code-of-conduct)
+  - [Contributions](#contributions)
+  - [License](#license)
+  - [History](#history)
+  - [Credits](#credits)
 
 <!-- Tocer[finish]: Auto-generated, don't remove. -->
 
-# Features
+## Features
 
 - Provides a DSL for building navigation menus.
 - Supports auto-detection/highlighting of active menu items based on current path (customizable for
@@ -68,12 +68,12 @@ Enhances Rails with a DSL for menu navigation.
 - Provides `link`, `image`, and `item` convenience methods for succinct ways to build commonly used
   menu elements.
 
-# Requirements
+## Requirements
 
 0. [Ruby 2.4.x](https://www.ruby-lang.org).
 0. [Ruby on Rails 5.x.x](http://rubyonrails.org).
 
-# Setup
+## Setup
 
 For a secure install, type the following from the command line (recommended):
 
@@ -92,11 +92,11 @@ Add the following to your Gemfile:
 
     gem "navigator"
 
-# Usage
+## Usage
 
 The following are examples using the navigation view helper:
 
-## Unordered List (simple)
+### Unordered List (simple)
 
 Code:
 
@@ -112,7 +112,7 @@ Result:
       <li><a href="/posts">Posts</a></li>
     </ul>
 
-## Unordered List (with attributes)
+### Unordered List (with attributes)
 
 Code:
 
@@ -128,7 +128,7 @@ Result:
       <li><a href="/posts">Posts</a></li>
     </ul>
 
-## Unordered List (with multiple data attributes)
+### Unordered List (with multiple data attributes)
 
 Code:
 
@@ -145,7 +145,7 @@ Result:
 *TIP: Nested data-- attributes can be applied to any menu item in the same manner as Rails view
 helpers.*
 
-## Nav (with links)
+### Nav (with links)
 
 Code:
 
@@ -161,7 +161,7 @@ Result:
       <a href="/posts">Posts</a>
     </nav>
 
-## Foundation Menu
+### Foundation Menu
 
 Code:
 
@@ -215,7 +215,7 @@ Result:
       </section>
     </nav>
 
-## Bootstrap Dropdown
+### Bootstrap Dropdown
 
 Code:
 
@@ -248,7 +248,7 @@ Result:
       </li>
     </ul>
 
-## Menu Helpers
+### Menu Helpers
 
 There are several convenience methods, in addition to the standard HTML tags, that can make for
 shorter lines of code. The following describes each:
@@ -294,7 +294,7 @@ When building menu items, the default is:
 These are just a few, simple, examples of what can be achieved. See the specs for additional usage
 and customization.
 
-# Customization
+## Customization
 
 The `navigation` view helper can accept an optional `Navigator::TagActivator` instance. Example:
 
@@ -382,7 +382,7 @@ Assuming either the `Addresses` or `Emails` menu item was clicked, the `Profile`
 active due to the regular expression (i.e. `/^profile.+/`) matching one of the the `profile/*`
 paths.
 
-# Tests
+## Tests
 
 To test, run:
 
@@ -393,34 +393,34 @@ To test the dummy application, run:
     cd spec/dummy
     bin/rails server
 
-# Versioning
+## Versioning
 
 Read [Semantic Versioning](http://semver.org) for details. Briefly, it means:
 
-- Patch (x.y.Z) - Incremented for small, backwards compatible, bug fixes.
-- Minor (x.Y.z) - Incremented for new, backwards compatible, public API enhancements/fixes.
 - Major (X.y.z) - Incremented for any backwards incompatible public API changes.
+- Minor (x.Y.z) - Incremented for new, backwards compatible, public API enhancements/fixes.
+- Patch (x.y.Z) - Incremented for small, backwards compatible, bug fixes.
 
-# Code of Conduct
+## Code of Conduct
 
 Please note that this project is released with a [CODE OF CONDUCT](CODE_OF_CONDUCT.md). By
 participating in this project you agree to abide by its terms.
 
-# Contributions
+## Contributions
 
 Read [CONTRIBUTING](CONTRIBUTING.md) for details.
 
-# License
+## License
 
 Copyright (c) 2012 [Alchemists](https://www.alchemists.io).
 Read [LICENSE](LICENSE.md) for details.
 
-# History
+## History
 
 Read [CHANGES](CHANGES.md) for details.
 Built with [Gemsmith](https://github.com/bkuhlmann/gemsmith).
 
-# Credits
+## Credits
 
 Developed by [Brooke Kuhlmann](https://www.alchemists.io) at
 [Alchemists](https://www.alchemists.io).

data/lib/navigator/identity.rb

@@ -12,7 +12,7 @@ module Navigator
     end
 
     def self.version
-      "2.2.0"
+      "2.3.0"
     end
 
     def self.version_label

data/lib/navigator/menu.rb

@@ -3,11 +3,17 @@
 module Navigator
   # Renders a HTML menu.
   class Menu
+    # rubocop:disable Metrics/LineLength
     def self.allowed_methods
       /^(div|section|header|h[1-6]|nav|ul|li|a|img|b|em|s|small|span|strong|sub|sup|form|label|select|option|input|button)$/
     end
 
-    def initialize template, tag: "ul", attributes: {}, activator: Navigator::TagActivator.new, &block
+    def initialize template,
+                   tag: "ul",
+                   attributes: {},
+                   activator: Navigator::TagActivator.new,
+                   &block
+
       @template = template
       @tag = Navigator::Tag.new tag, attributes: attributes, activator: activator
       @menu_activator = activator
@@ -36,12 +42,22 @@ module Navigator
       add "img", attributes: modified_attributes, activator: activator
     end
 
-    def item content = nil, url, item_attributes: {}, link_attributes: {}, activator: menu_activator, &block
+    def item content = nil,
+             url,
+             item_attributes: {},
+             link_attributes: {},
+             activator: menu_activator,
+             &block
+
       modified_item_attributes = item_attributes.clone
       activate_item_attributes! modified_item_attributes, url, activator
 
       add "li", attributes: modified_item_attributes, activator: activator do
-        link content, url, attributes: link_attributes, activator: Navigator::TagActivator.new, &block
+        link content,
+             url,
+             attributes: link_attributes,
+             activator: Navigator::TagActivator.new,
+             &block
       end
     end
 
@@ -72,7 +88,10 @@ module Navigator
 
     def activate_item_attributes! attributes, url, activator
       return unless url == activator.search_value
-      attributes[activator.target_key] = [attributes[activator.target_key], activator.target_value].compact * " "
+
+      attributes[activator.target_key] = [attributes[activator.target_key], activator.target_value]
+                                         .compact
+                                         .join " "
     end
   end
 end

data/lib/navigator/tag_activator.rb

@@ -13,6 +13,7 @@ module Navigator
       @target_value = target_value
     end
 
+    # :reek:TooManyStatements
     def activatable? attributes = {}
       return false unless search_value.present?
 
@@ -20,7 +21,8 @@ module Navigator
       current_search_value = attributes[search_key]
 
       if current_search_value.is_a?(Regexp) || search_value.is_a?(Regexp)
-        !!(current_search_value =~ search_value)
+        return false if current_search_value.blank?
+        current_search_value.match? search_value
       else
         current_search_value == search_value
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navigator
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -30,7 +30,7 @@ cert_chain:
   n/LUZ1dKhIHzfKx1B4+TEIefArObGfkLIDM8+Dq1RX7TF1k81Men7iu4MgE9bYBn
   3dE+xI3FdB5gWcdWxdtgRCmWjtXeYYyb4z6NQQ==
   -----END CERTIFICATE-----
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,28 +94,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: gemsmith
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -206,42 +206,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -256,34 +256,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: git-cop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -336,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Enhances Rails with a DSL for menu navigation.