navigasmic 1.0.5 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 70153f61b5f76bfd27e5b04b8f2b3e71fd484f80
+  data.tar.gz: 8ac4854b4efbd94da58792528704e488a0152d86
+SHA512:
+  metadata.gz: cf71e215bb4f5b375908c92c54e74daca77b364efcf7237f74065823b1e410f26fb6462036b1415d52638b0997cf99abce1dbcf422f37d2890ae28e4ec8a2d3e
+  data.tar.gz: 2e78a8e92bf78900890a1d7aa20758de6ccedc9d9e23bc0aa4a914778cf53616105fa794a557bddffdb59904e360b2c37e6f7a261b0dea0f7a5b868228ee1342

data/lib/navigasmic/core/item.rb

@@ -23,27 +23,26 @@ class Navigasmic::Item
 
   def highlights_on?(path, params)
     return false unless @rules.any?
-    params = clean_unwanted_keys(params)
-    @rules.each do |rule|
+    params = params.except(*unwanted_keys)
+    !!@rules.detect do |rule|
       case rule
       when String
-        return false unless path == rule
+        path == rule
       when Regexp
-        return false unless path.match(rule)
+        path.match(rule)
       when TrueClass
-        # no-op
+        true
       when FalseClass
-        return false
+        false
       when Hash
-        clean_unwanted_keys(rule).each do |key, value|
-          value.gsub(/^\//, '') if key == :controller
-          return false unless value == params[key].to_s
+        rule.except(*unwanted_keys).detect do |key, value|
+          value = value.gsub(/^\//, '') if key == :controller
+          value == params[key].to_s
         end
       else
         raise ArgumentError, 'Highlighting rules should be an array containing any of/or a Boolean, String, Regexp, Hash or Proc'
       end
     end
-    true
   end
 
   private
@@ -58,9 +57,7 @@ class Navigasmic::Item
     end
   end
 
-  def clean_unwanted_keys(hash)
-    ignored_keys = [:only_path, :use_route]
-    hash.dup.delete_if { |key, value| ignored_keys.include?(key) }
+  def unwanted_keys
+    [:only_path, :use_routes]
   end
-
 end

data/lib/navigasmic/version.rb

@@ -1,3 +1,3 @@
 module Navigasmic
-  VERSION = '1.0.5'
+  VERSION = '1.1.0'
 end

data/spec/core/item_spec.rb

@@ -73,6 +73,13 @@ describe Navigasmic::Item do
       item.highlights_on?('/other_path', {controller: 'bar'}).should be(false)
     end
 
+    it "highlights on multiple controllers" do
+      item = subject.new 'Label', '/foo', true, highlights_on: [{controller: 'foo'}, {controller: 'bar'}]
+      item.highlights_on?('/path', {controller: 'foo'}).should be(true)
+      item.highlights_on?('/other_path', {controller: 'bar'}).should be(true)
+      item.highlights_on?('/other_path_entirely', {controller: 'baz'}).should be(false)
+    end
+
     it "handles strings" do
       item = subject.new 'Label', '/foo', true, highlights_on: '/path'
       item.highlights_on?('/path', {}).should be(true)

data/spec/dummy/app/views/layouts/_navigation.html.erb

@@ -42,13 +42,14 @@
   <% end %>
 
   <% n.group 'Highlighting under various situations' do %>
-    <% n.item 'When the highlight param is set', highlights_on: params[:highlight].present? %>
+    <% n.item 'When the highlight param is set', highlights_on: [params[:highlight].present?] %>
     <% n.item 'Always (using an array)', highlights_on: [true, false, false] %>
     <% n.item 'When the highlight param is set (using a proc)', highlights_on: proc{ params[:highlight].present? } %>
     <% n.item 'When the highlight param is set (using a proc in an array)', highlights_on: [proc{ params[:highlight].present? }] %>
     <% n.item 'When on any path beginning with "my_aw" (using regexp)', highlights_on: [/^\/my_aw/] %>
-    <% n.item 'When on "/my_awesome_blog" (using string)', highlights_on: '/my_awesome_blog' %>
-    <% n.item 'When on any action in the application controller', highlights_on: {controller: 'application'} %>
+    <% n.item 'When on "/my_awesome_blog" (using string)', highlights_on: ['/my_awesome_blog'] %>
+    <% n.item 'When on any action in the application controller', highlights_on: [{controller: 'application'}] %>
+    <% n.item 'When on any action in the blog/posts or blog/links controller', highlights_on: [{controller: '/blog/posts'}, {controller: 'blog/links'}] %>
   <% end %>
 
   <!-- Examples of disabling items -->

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navigasmic
 version: !ruby/object:Gem::Version
-  version: 1.0.5
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeremy Jackson
@@ -77,34 +76,27 @@ files:
 homepage: http://github.com/jejacks0n/navigasmic
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2345431105268640909
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2345431105268640909
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
-summary: ! 'Navigasmic: Semantic navigation for Rails'
+specification_version: 4
+summary: 'Navigasmic: Semantic navigation for Rails'
 test_files:
 - spec/builders/list_builder_spec.rb
 - spec/builders/map_builder_spec.rb