navigasmic 1.0.4 → 1.0.5

data/lib/generators/navigasmic/install/templates/initializer.rb

@@ -133,7 +133,7 @@ Navigasmic.setup do |config|
       if has_nested
         link = '#'
         label << "<b class='caret'></b>"
-        options.merge!(class: 'dropdown-toggle', data: {toggle: 'dropdown'})
+        link_options.merge!(class: 'dropdown-toggle', data: {toggle: 'dropdown'})
       end
       link_to(label, link, link_options)
     end

data/lib/navigasmic/core/item.rb

@@ -22,39 +22,40 @@ class Navigasmic::Item
   end
 
   def highlights_on?(path, params)
+    return false unless @rules.any?
     params = clean_unwanted_keys(params)
-    result = false
-
     @rules.each do |rule|
-      highlighted = true
-
       case rule
-        when String then highlighted &= path == rule
-        when Regexp then highlighted &= path.match(rule)
-        when TrueClass then highlighted &= rule
-        when FalseClass then highlighted &= rule
-        when Hash
-          clean_unwanted_keys(rule).each do |key, value|
-            value.gsub!(/^\//, '') if key == :controller
-            highlighted &= value == params[key].to_s
-          end
-        else raise 'highlighting rules should be an array containing any of/or a Boolean, String, Regexp, Hash or Proc'
+      when String
+        return false unless path == rule
+      when Regexp
+        return false unless path.match(rule)
+      when TrueClass
+        # no-op
+      when FalseClass
+        return false
+      when Hash
+        clean_unwanted_keys(rule).each do |key, value|
+          value.gsub(/^\//, '') if key == :controller
+          return false unless 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
-
-      result |= highlighted
     end
-
-    result
+    true
   end
 
   private
 
   def calculate_highlighting_rules(rules)
-    highlighting_rules = []
-    highlighting_rules << @link if link?
-
-    return [] if highlighting_rules.blank?
-    highlighting_rules += Array(rules)
+    [].tap do |highlighting_rules|
+      if rules.nil?
+        highlighting_rules << @link if link?
+      else
+        highlighting_rules.concat Array(rules)
+      end
+    end
   end
 
   def clean_unwanted_keys(hash)

data/lib/navigasmic/version.rb

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

data/spec/builders/list_builder_spec.rb

@@ -45,13 +45,13 @@ describe 'Navigasmic::Builder::ListBuilder', type: :helper do
       html = <<-HTML
         <ul class="nav nav-pills" id="primary">
           <li class="group dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Group<b class='caret'></b></a>
+            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Group<b class='caret'></b></a>
             <ul class="dropdown-menu">
               <li><a href="/path"><span>Label</span></a></li>
             </ul>
           </li>
           <li class="item dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Level 1<b class='caret'></b></a>
+            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Level 1<b class='caret'></b></a>
             <ul class="dropdown-menu">
               <li><span>Level 2</span></li>
             </ul>
@@ -71,7 +71,7 @@ describe 'Navigasmic::Builder::ListBuilder', type: :helper do
       html = <<-HTML
         <ul class="semantic-navigation" id="primary">
           <li class="item">
-            <a href="level1.html" class="dialog">
+            <a class="dialog" href="level1.html">
               <span>Level 1</span>
             </a>
           </li>

data/spec/core/item_spec.rb

@@ -5,7 +5,6 @@ describe Navigasmic::Item do
   subject { Navigasmic::Item }
 
   describe "#hidden?" do
-
     it "returns true when it's not visible" do
       item = subject.new 'Label', {controller: 'controller'}, false
       item.hidden?.should be(true)
@@ -15,11 +14,9 @@ describe Navigasmic::Item do
       item = subject.new 'Label', {controller: 'controller'}, true
       item.hidden?.should be(false)
     end
-
   end
 
   describe "#disabled?" do
-
     it "returns true when it's disabled" do
       item = subject.new 'Label', {controller: 'controller'}, true, disabled_if: true
       item.disabled?.should be(true)
@@ -29,11 +26,9 @@ describe Navigasmic::Item do
       item = subject.new 'Label', {controller: 'controller'}, true, disabled_if: false
       item.disabled?.should be(false)
     end
-
   end
 
   describe "#link?" do
-
     it "returns true when there's a link" do
       item = subject.new 'Label', 'url', true
       item.link?.should be(true)
@@ -48,11 +43,24 @@ describe Navigasmic::Item do
       item = subject.new 'Label', nil, true, disabled_if: true
       item.link?.should be(false)
     end
+  end
+
+  describe "#calculate_highlighting_rules" do
+    it "uses the item's link when no rules given" do
+      item = subject.new 'Label', 'url', true
+      item.send(:calculate_highlighting_rules, nil).should eq(['url'])
+    end
 
+    it "uses the given rules if any given" do
+      item = subject.new 'Label', 'url', true, :highlights_on => false
+      item.send(:calculate_highlighting_rules, false).should eq([false])
+
+      item = subject.new 'Label', 'url', true, :highlights_on => false
+      item.send(:calculate_highlighting_rules, ["/a", "/b"]).should eq(["/a", "/b"])
+    end
   end
 
   describe "#highlights_on?" do
-
     it "uses it's own link (as a string)" do
       item = subject.new 'Label', '/path', true
       item.highlights_on?('/path', {}).should be(true)
@@ -86,5 +94,11 @@ describe Navigasmic::Item do
       item.highlights_on?('/path', {}).should be(false)
       item.highlights_on?('/other_path', {}).should be(false)
     end
+
+    it "leaves controller paths alone (bug fix)" do
+      item = subject.new 'Label', {controller: '/foo'}, true
+      item.highlights_on?('/path', {})
+      item.link.should == {controller: '/foo'}
+    end
   end
 end

data/spec/dummy/config/application.rb

@@ -53,5 +53,7 @@ module Dummy
 
     # Version of your assets, change this if you want to expire all your assets
     #config.assets.version = '1.0'
+
+    config.secret_key_base = "ABCDEF"
   end
 end

data/spec/dummy/config/environments/development.rb

@@ -6,8 +6,7 @@ Dummy::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/spec/dummy/config/environments/test.rb

@@ -11,8 +11,7 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/spec/dummy/config/routes.rb

@@ -2,7 +2,7 @@ Dummy::Application.routes.draw do
 
   root to: 'application#welcome'
 
-  match '/my_awesome_blog' => 'blog/posts#index', as: :my_awesome_blog
+  get '/my_awesome_blog' => 'blog/posts#index', as: :my_awesome_blog
   namespace :blog do
     resources :posts
     resources :links

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navigasmic
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,39 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-10-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+dependencies: []
 description: Use semantic structures to to build beautifully simple navigation structures
   in Rails
 email:
@@ -121,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2130130245475207241
+      hash: -2345431105268640909
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2130130245475207241
+      hash: -2345431105268640909
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24