navigasmic 1.0.3 → 1.0.4

data/lib/navigasmic/builders/list_builder.rb

@@ -24,7 +24,7 @@ module Navigasmic::Builder
         @highlighted_class = 'active'
 
         # generator callbacks
-        @link_generator = proc{ |label, link, options, is_nested| link_to(label, link, options.delete(:link_html)) }
+        @link_generator = proc{ |label, link, options, is_nested| link_to(label, link, options) }
         @label_generator = proc{ |label, is_linked, is_nested| "<span>#{label}</span>" }
 
         super

data/lib/navigasmic/core/builder.rb

@@ -100,8 +100,12 @@ module Navigasmic::Builder
         @context.send(path_helper) if @context.respond_to?(path_helper)
       elsif link.is_a?(Proc)
         eval_in_context(&link)
-      else
+      elsif link.is_a?(String)
+        link
+      elsif link.is_a?(Hash)
         link
+      else
+        url_for(link)
       end
     end
 

data/lib/navigasmic/rails/view_helpers.rb

@@ -10,7 +10,11 @@ module Navigasmic::ViewHelpers
   #     <% end %>
   #   <% end %>
   def semantic_navigation(name, options = {}, &block)
-
+    if name.is_a?(Hash)
+      options = name
+      options[:id] ||= nil
+      name = ""
+    end
     builder = options.delete(:builder) || Navigasmic.configuration.default_builder
     builder.new(self, name, options, &block).render
   end

data/lib/navigasmic/version.rb

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

data/spec/builders/list_builder_spec.rb

@@ -62,5 +62,23 @@ describe 'Navigasmic::Builder::ListBuilder', type: :helper do
 
       builder.render.should match(clean(html))
     end
+
+    it "handles link_html of items" do
+      builder = subject.new helper, :primary, {} do |n|
+        n.item('Level 1', 'level1.html', class: 'item', link_html: {class: "dialog"})
+      end
+
+      html = <<-HTML
+        <ul class="semantic-navigation" id="primary">
+          <li class="item">
+            <a href="level1.html" class="dialog">
+              <span>Level 1</span>
+            </a>
+          </li>
+        </ul>
+      HTML
+
+      builder.render.should match(clean(html))
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navigasmic
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4331876644713175306
+      hash: -2130130245475207241
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4331876644713175306
+      hash: -2130130245475207241
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24