semantic_navigation 0.1.0 → 0.1.1

data/Changelog.md

@@ -1,4 +1,8 @@
-### 0.1.0 
+### 0.1.1 / November 19, 2012
+* Added html properties for navigation tags
+* Added property to change navigation tag
+
+### 0.1.0 / October 2, 2012
 * Making register_renderer function to catch already registered renderer class by received symbol name
 * Added scoping for items definitions
 * Added renderers generators

data/lib/semantic_navigation/core/base.rb

@@ -2,7 +2,7 @@ module SemanticNavigation
   module Core
     class Base
 
-      attr_accessor :id, :level, :classes, :active
+      attr_accessor :id, :level, :classes, :active, :html
       attr_writer :render_if
 
       def render_if
@@ -11,6 +11,7 @@ module SemanticNavigation
 
       def initialize(options, level)
         @level = level
+        @html = {}
         options.keys.each do |option_name|
           instance_variable_set :"@#{option_name}", options[option_name]
         end

data/lib/semantic_navigation/core/leaf.rb

@@ -4,9 +4,10 @@ module SemanticNavigation
       include UrlMethods
       include NameMethods
 
-      attr_accessor :link_classes
+      attr_accessor :link_classes, :link_html
 
       def initialize(options, level)
+        @link_html = {}
         super options, level
       end
 

data/lib/semantic_navigation/core/node.rb

@@ -4,10 +4,13 @@ module SemanticNavigation
       include UrlMethods
       include NameMethods
 
-      attr_accessor :link_classes, :node_classes
+      attr_accessor :link_classes, :node_classes,
+                    :link_html, :node_html
 
       def initialize(options, level)
         @url = []
+        @link_html = {}
+        @node_html = {}
         super options, level
       end
 

data/lib/semantic_navigation/renderers/bread_crumb.rb

@@ -4,8 +4,8 @@ module SemanticNavigation
       include RenderHelpers
       include ActsAsBreadcrumb
 
-      style_accessor :last_as_link => false,
-                     :breadcrumb_separator => '/'
+      style_accessor last_as_link: false,
+                     breadcrumb_separator: '/'
 
       navigation_default_classes [:breadcrumb]
       show_navigation_active_class false
@@ -16,17 +16,22 @@ module SemanticNavigation
       private
 
       def navigation(object)
-        content_tag :ul, nil, :id => show_id(:navigation, object.id),
-                              :class => merge_classes(:navigation, object.active, object.classes) do
+        content_menu_tag({id: show_id(:navigation, object.id),
+                          class: merge_classes(:navigation, object.active, object.classes)
+                         }.merge(object.html)) do
           yield
         end
       end
 
       def node(object)
-        content_tag(:li, nil, :id => show_id(:leaf, object.id),
-                              :class => merge_classes(:leaf, object.active, object.classes)) do
-          link_to(object_name(object), object.url, :id => show_id(:link, object.id),
-                                           :class => merge_classes(:link, object.active, object.link_classes))
+        content_tag(:li, nil, {id: show_id(:leaf, object.id),
+                               class: merge_classes(:leaf, object.active, object.classes)
+                              }.merge(object.html)) do
+          link_to(object_name(object), 
+                  object.url, 
+                  {id: show_id(:link, object.id),
+                   class: merge_classes(:link, object.active, object.link_classes)
+                  }.merge(object.link_html))
         end +
         content_tag(:li) do
           breadcrumb_separator
@@ -35,11 +40,15 @@ module SemanticNavigation
       end
 
       def leaf(object)
-        content_tag :li, nil, :id => show_id(:leaf, object.id),
-                              :class => merge_classes(:leaf, object.active, object.classes) do
+        content_tag :li, nil, {id: show_id(:leaf, object.id),
+                               class: merge_classes(:leaf, object.active, object.classes)
+                              }.merge(object.html) do
           if last_as_link
-            link_to object_name(object), object.url, :id => show_id(:link, object.id),
-                                           :class => merge_classes(:link, object.active, object.link_classes)
+            link_to object_name(object), 
+                    object.url, 
+                    {id: show_id(:link, object.id),
+                     class: merge_classes(:link, object.active, object.link_classes)
+                    }.merge(object.link_html)
           else
             object_name(object)
           end

data/lib/semantic_navigation/renderers/list.rb

@@ -9,36 +9,45 @@ module SemanticNavigation
       private
 
       def navigation(object)
-        content_tag :ul, nil, :id => show_id(:navigation, object.id),
-                              :class => merge_classes(:navigation, object.active, object.classes) do
+        content_menu_tag({id: show_id(:navigation, object.id),
+                          class: merge_classes(:navigation, object.active, object.classes)
+                         }.merge(object.html)) do
           yield
         end
       end
 
       def node(object)
-        content_tag :li, nil, :id => show_id(:leaf, object.id),
-                              :class => merge_classes(:leaf, object.active, object.classes) do
-          link_to(object_name(object), object.url, :id => show_id(:link, object.id),
-                                           :class => merge_classes(:link, object.active, object.link_classes))+
+        content_tag :li, nil, {id: show_id(:leaf, object.id),
+                               class: merge_classes(:leaf, object.active, object.classes)
+                              }.merge(object.html) do
+          link_to(object_name(object), 
+                  object.url, 
+                  {id: show_id(:link, object.id),
+                   class: merge_classes(:link, object.active, object.link_classes)
+                  }.merge(object.link_html))+
           yield
         end
       end
 
       def node_content(object)
-        content_tag(:ul, nil, :id => show_id(:node, object.id),
-                              :class => merge_classes(:node, object.active, object.node_classes)) do
+        content_menu_tag({id: show_id(:node, object.id),
+                               class: merge_classes(:node, object.active, object.node_classes)
+                              }.merge(object.node_html)) do
           yield
         end
       end
 
       def leaf(object)
-        content_tag :li, nil, :id => show_id(:leaf, object.id),
-                              :class => merge_classes(:leaf, object.active, object.classes) do
-          link_to object_name(object), object.url, :id => show_id(:link, object.id),
-                                           :class => merge_classes(:link, object.active, object.link_classes)
+        content_tag :li, nil, {id: show_id(:leaf, object.id),
+                               class: merge_classes(:leaf, object.active, object.classes)
+                              }.merge(object.html) do
+          link_to object_name(object), 
+                  object.url, 
+                  {id: show_id(:link, object.id),
+                   class: merge_classes(:link, object.active, object.link_classes)
+                  }.merge(object.link_html)
         end
       end
-
     end
   end
 end

data/lib/semantic_navigation/renderers/render_helpers.rb

@@ -12,6 +12,7 @@ module SemanticNavigation
                            :"show_#{e}_id" => true,
                            :"#{e}_default_classes" => []
           end
+          style_accessor menu_tag: :ul
         end
       end
 
@@ -95,6 +96,12 @@ module SemanticNavigation
           object.name(self.name)
         end
 
+        def content_menu_tag(parameters)
+          content_tag menu_tag, nil, parameters do
+            yield
+          end
+        end
+
       end
 
     end

data/lib/semantic_navigation/twitter_bootstrap/breadcrumb.rb

@@ -4,8 +4,8 @@ module SemanticNavigation
       include SemanticNavigation::Renderers::RenderHelpers
       include SemanticNavigation::Renderers::ActsAsBreadcrumb
 
-      style_accessor :last_as_link => false,
-                     :breadcrumb_separator => '/'
+      style_accessor last_as_link: false,
+                     breadcrumb_separator: '/'
 
       navigation_default_classes [:breadcrumb]
 
@@ -23,30 +23,39 @@ module SemanticNavigation
       private
 
       def navigation(object)
-        content_tag :ul, nil, :id => show_id(:navigation, object.id),
-                              :class => merge_classes(:navigation, object.active, object.classes) do
+        content_tag :ul, nil, {id: show_id(:navigation, object.id),
+                               class: merge_classes(:navigation, object.active, object.classes)
+                              }.merge(object.html) do
           yield
         end
       end
 
       def node(object)
-        content_tag(:li, nil, :id => show_id(:leaf, object.id),
-                              :class => merge_classes(:leaf, object.active, object.classes)) do
-          [object.ico ? content_tag(:i,nil,:class => "icon-#{object.ico}") : ''.html_safe,
-          link_to(object_name(object), object.url, :id => show_id(:link, object.id),
-                                           :class => merge_classes(:link, object.active, object.link_classes)),
-          content_tag(:span, nil, :class=> [:divider]) {breadcrumb_separator}].sum
+        content_tag(:li, nil, {id: show_id(:leaf, object.id),
+                               class: merge_classes(:leaf, object.active, object.classes)
+                              }.merge(object.html)) do
+          [object.ico ? content_tag(:i, nil, class: "icon-#{object.ico}") : ''.html_safe,
+          link_to(object_name(object),
+                  object.url, 
+                  {id: show_id(:link, object.id),
+                   class: merge_classes(:link, object.active, object.link_classes)
+                  }.merge(object.link_html)),
+          content_tag(:span, nil, class: [:divider]) {breadcrumb_separator}].sum
         end +
         yield
       end
 
       def leaf(object)
-        content_tag :li, nil, :id => show_id(:leaf, object.id),
-                              :class => merge_classes(:leaf, object.active, object.classes) do
-          [object.ico ? content_tag(:i,nil,:class => "icon-#{object.ico}") : ''.html_safe,
+        content_tag :li, nil, {id: show_id(:leaf, object.id),
+                               class: merge_classes(:leaf, object.active, object.classes)
+                              }.merge(object.html) do
+          [object.ico ? content_tag(:i, nil, class: "icon-#{object.ico}") : ''.html_safe,
           if last_as_link
-            link_to(object_name(object), object.url, :id => show_id(:link, object.id),
-                                             :class => merge_classes(:link, object.active, object.link_classes))
+            link_to(object_name(object), 
+                    object.url, 
+                    {id: show_id(:link, object.id),
+                     class: merge_classes(:link, object.active, object.link_classes)
+                    }.merge(object.link_html))
           else
             object_name(object)
           end].sum

data/lib/semantic_navigation/twitter_bootstrap/list.rb

@@ -15,31 +15,35 @@ module SemanticNavigation
       private
 
       def navigation(object)
-        content_tag :ul, nil, :id => show_id(:navigation, object.id),
-                                :class => merge_classes(:navigation, object.active, object.classes) do
+        content_tag :ul, nil, {id: show_id(:navigation, object.id),
+                               class: merge_classes(:navigation, object.active, object.classes)
+                              }.merge(object.html) do
           yield
         end
       end
 
       def node(object)
         if object.ico
-          name = [content_tag(:i,nil,:class => "icon-#{object.ico}"),
+          name = [content_tag(:i,nil, class: "icon-#{object.ico}"),
                   object_name(object)].sum
         else
           name = object_name(object)
         end
 
-        content_tag :li, nil, :id => show_id(:leaf, object.id),
-                              :class => merge_classes(:leaf, object.active, object.classes) do
-           link_to(name, object.url, :id => show_id(:link, object.id),
-                                            :class => merge_classes(:link, object.active, object.link_classes)) +
+        content_tag :li, nil, {id: show_id(:leaf, object.id),
+                               class: merge_classes(:leaf, object.active, object.classes)
+                              }.merge(object.html) do
+           link_to(name, object.url, {id: show_id(:link, object.id),
+                                      class: merge_classes(:link, object.active, object.link_classes)
+                                     }.merge(object.link_html)) +
           yield
         end
       end
 
       def node_content(object)
-        content_tag(:ul, nil, :id => show_id(:node, object.id),
-                              :class => merge_classes(:node, object.active, object.node_classes)) do
+        content_tag(:ul, nil, {id: show_id(:node, object.id),
+                               class: merge_classes(:node, object.active, object.node_classes)
+                              }.merge(object.node_html)) do
           yield
         end
       end
@@ -54,19 +58,21 @@ module SemanticNavigation
         end
 
         if object.ico
-          name = [content_tag(:i,nil,:class => "icon-#{object.ico}"),
+          name = [content_tag(:i,nil,class: "icon-#{object.ico}"),
                   object_name(object)].sum
         else
           name = object_name(object)
         end
 
-        content_tag :li, nil, :id => show_id(:leaf, object.id),
-                              :class => classes do
+        content_tag :li, nil, {id: show_id(:leaf, object.id),
+                               class: classes
+                              }.merge(object.html) do
           if object.url.nil?
             name
           else
-            link_to name, object.url, :id => show_id(:link, object.id),
-                                      :class => merge_classes(:link, object.active, object.link_classes)
+            link_to name, object.url, {id: show_id(:link, object.id),
+                                       class: merge_classes(:link, object.active, object.link_classes)
+                                      }.merge(object.link_html)
           end
         end
       end

data/lib/semantic_navigation/twitter_bootstrap/tabs.rb

@@ -4,7 +4,7 @@ module SemanticNavigation
       include SemanticNavigation::Renderers::RenderHelpers
       include SemanticNavigation::Renderers::ActsAsList
 
-      style_accessor :direction => 'left'
+      style_accessor direction: 'left'
 
       navigation_default_classes [:nav, 'nav-tabs']
       show_navigation_id false
@@ -17,22 +17,25 @@ module SemanticNavigation
       private
 
       def navigation(object)
-        content_tag :ul, nil, :id => show_id(:navigation, object.id),
-                              :class => merge_classes(:navigation, object.active, [object.classes,"pull-#{direction}"]) do
+        content_tag :ul, nil, {id: show_id(:navigation, object.id),
+                               class: merge_classes(:navigation, object.active, [object.classes,"pull-#{direction}"])
+                              }.merge(object.html) do
           yield
         end
       end
 
       def node(object)
-        content_tag :li, nil, :id => show_id(:leaf, object.id),
-                              :class => merge_classes(:leaf, object.active, [object.classes,'dropdown'].flatten) do
-          content_tag(:a, :href => '#',
-                          :id => show_id(:link, object.id),
-                          :class => merge_classes(:link, object.active, [object.link_classes,'dropdown-toggle'].flatten),
-                          'data-toggle'=> :dropdown) do
-            [object.ico ? content_tag(:i,nil,:class => "icon-#{object.ico}") : '',
+        content_tag :li, nil, {id: show_id(:leaf, object.id),
+                               class: merge_classes(:leaf, object.active, [object.classes,'dropdown'].flatten)
+                              }.merge(object.html) do
+          content_tag(:a, {:href => '#',
+                           id: show_id(:link, object.id),
+                           class: merge_classes(:link, object.active, [object.link_classes,'dropdown-toggle'].flatten),
+                           'data-toggle'=> :dropdown
+                           }.merge(object.link_html)) do
+            [object.ico ? content_tag(:i,nil,class: "icon-#{object.ico}") : '',
              object_name(object),
-             content_tag(:b,nil,:class => :caret)
+             content_tag(:b,nil,class: :caret)
             ].sum.html_safe
           end +
           yield
@@ -40,27 +43,30 @@ module SemanticNavigation
       end
 
       def node_content(object)
-        content_tag(:ul, nil, :id => show_id(:node, object.id),
-                              :class => merge_classes(:node, false, [object.node_classes,'dropdown-menu'].flatten)) do
+        content_tag(:ul, nil, {id: show_id(:node, object.id),
+                               class: merge_classes(:node, false, [object.node_classes,'dropdown-menu'].flatten)
+                              }.merge(object.node_html)) do
           yield
         end
       end
 
       def leaf(object)
         if object.ico
-          name = [content_tag(:i,nil,:class => "icon-#{object.ico}"),
+          name = [content_tag(:i,nil,class: "icon-#{object.ico}"),
                   object_name(object)].sum
         else
           name = object_name(object)
         end
 
-        content_tag :li, nil, :id => show_id(:leaf, object.id),
-                              :class => merge_classes(:leaf, object.active, object.classes) do
+        content_tag :li, nil, {id: show_id(:leaf, object.id),
+                              class: merge_classes(:leaf, object.active, object.classes)
+                              }.merge(object.html) do
           if object.url.nil?
             name
           else
-            link_to name, object.url, :id => show_id(:link, object.id),
-                                             :class => merge_classes(:link, object.active, object.link_classes)
+            link_to name, object.url, {id: show_id(:link, object.id),
+                                      class: merge_classes(:link, object.active, object.link_classes)
+                                      }.merge(object.link_html)
           end
         end
       end

data/lib/semantic_navigation/version.rb

@@ -1,3 +1,3 @@
 module SemanticNavigation
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/lib/semantic_navigation/renderers/bread_crumb_spec.rb

@@ -42,6 +42,31 @@ describe SemanticNavigation::Renderers::BreadCrumb do
                       "</ul>"].join
   end
 
+  it 'renders breadcrumb with secific menu tag' do
+    @configuration.run do
+     
+      register_renderer :my_breadcrumb, :breadcrumb
+
+      styles_for :my_breadcrumb do
+        menu_tag :ol
+      end
+
+      navigate :menu do
+        item :url1, 'url1', :name => 'url1'
+        item :url2, 'url2', :name => 'url2'
+      end
+    end
+
+    @view_object.should_receive(:current_page?).and_return(false,true)
+
+    result = @view_object.navigation_for :menu, :as => :my_breadcrumb
+    result.should == ["<ol class=\"breadcrumb\" id=\"menu\">",
+                        "<li id=\"url2\">",
+                          "url2",
+                        "</li>",
+                      "</ol>"].join
+  end  
+
 it 'should render one multilevel navigation breadcrumb' do
     @configuration.run do
       navigate :menu do

data/spec/lib/semantic_navigation/renderers/list_spec.rb

@@ -48,6 +48,69 @@ describe SemanticNavigation::Renderers::List do
                       "</ul>"].join
   end
 
+  it 'renders one level navigation with specific menu tag' do
+    @configuration.run do
+
+      register_renderer :my_list, :list
+
+      styles_for :my_list do
+        menu_tag :ol
+      end
+
+      navigate :menu do
+        item :url1, 'url1', :name => 'url1'
+        item :url2, 'url2', :name => 'url2'
+      end
+    end
+
+    result = @view_object.navigation_for :menu, as: :my_list
+    result.should == ["<ol class=\"list\" id=\"menu\">",
+                        "<li id=\"url1\">",
+                          "<a href=\"url1\" id=\"url1\">",
+                            "url1",
+                          "</a>",
+                        "</li>",
+                        "<li id=\"url2\">",
+                          "<a href=\"url2\" id=\"url2\">",
+                            "url2",
+                          "</a>",
+                         "</li>",
+                      "</ol>"].join
+  end
+
+  it 'renders one level navigation with specific menu tag' do
+    @configuration.run do
+
+      register_renderer :my_list, :list
+
+      styles_for :my_list do
+        menu_tag :ol
+      end
+
+      navigate :menu do
+        item :url1, 'url1', :name => 'url1' do
+          item :url2, 'url2', :name => 'url2'
+        end
+      end
+    end
+
+    result = @view_object.navigation_for :menu, as: :my_list
+    result.should == ["<ol class=\"list\" id=\"menu\">",
+                        "<li id=\"url1\">",
+                          "<a href=\"url1\" id=\"url1\">",
+                            "url1",
+                          "</a>",
+                          "<ol id=\"url1\">",
+                            "<li id=\"url2\">",
+                              "<a href=\"url2\" id=\"url2\">",
+                                "url2",
+                              "</a>",
+                            "</li>",
+                          "</ol>",
+                        "</li>",
+                      "</ol>"].join
+  end
+
 it 'should render one multilevel navigation' do
     @configuration.run do
       navigate :menu do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semantic_navigation
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11355020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 2.0.1
   type: :development
   prerelease: false
-  version_requirements: *11355020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &11354580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11354580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &11353960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *11353960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: ! "Simply and customizable navigation in the Ruby on Rails 3 application.\n
   \                    Predefined bootstrap renderers"
 email:
@@ -112,16 +127,34 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -712279182362314885
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -712279182362314885
 requirements: []
 rubyforge_project: semantic_navigation
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Make the navigation in your Rails app by several lines
-test_files: []
+test_files:
+- spec/lib/semantic_navigation/configuration_spec.rb
+- spec/lib/semantic_navigation/core/leaf_spec.rb
+- spec/lib/semantic_navigation/core/navigation_spec.rb
+- spec/lib/semantic_navigation/core/node_spec.rb
+- spec/lib/semantic_navigation/helper_methods_spec.rb
+- spec/lib/semantic_navigation/renderers/bread_crumb_spec.rb
+- spec/lib/semantic_navigation/renderers/list_spec.rb
+- spec/lib/semantic_navigation/twitter_bootstrap/breadcrumb_spec.rb
+- spec/lib/semantic_navigation/twitter_bootstrap/list_spec.rb
+- spec/lib/semantic_navigation/twitter_bootstrap/tabs_spec.rb
+- spec/lib/semantic_navigation_spec.rb
+- spec/spec_helper.rb