simple-navigation 3.7.0 → 3.8.0

data/CHANGELOG

@@ -1,3 +1,11 @@
+*3.8.0
+
+* Changed the way the context is fetched. Fixes incompatibility with Gretel. Thanks to Ivan Kasatenko.
+* Added :join_with option to links renderer. Thanks to Stefan Melmuk.
+* Added :prefix option to breadcrumb renderer. Credits to Rodrigo Manhães.
+* Added :ordered option for allowing list renderer to render an <ol> rather than a <ul>.
+* Sinatra adapter no longer renders attributes with nil values as attributes with empty strings in the output, instead electing not to render the attribute at all. Thanks to revdan for pointing this out.
+
 *3.7.0
 
 * Added new adapater for working with the Nanoc static site generation framework.

data/VERSION

@@ -1 +1 @@
-3.7.0
+3.8.0

data/lib/simple_navigation/adapters/rails.rb

@@ -72,11 +72,9 @@ module SimpleNavigation
       
       # Extracts a controller from the context.
       def extract_controller_from(context)
-        if context.respond_to? :controller
-          context.controller
-        else
+        context.respond_to?(:controller) ?
+          context.controller || context :
           context
-        end
       end
          
     end

data/lib/simple_navigation/adapters/sinatra.rb

@@ -43,11 +43,11 @@ module SimpleNavigation
       end
 
       def link_to(name, url, options={})
-        "<a href='#{url}' #{to_attributes(options)}>#{name}</a>"
+        "<a href='#{url}'#{to_attributes(options)}>#{name}</a>"
       end
 
       def content_tag(type, content, options={})
-        "<#{type} #{to_attributes(options)}>#{content}</#{type}>"
+        "<#{type}#{to_attributes(options)}>#{content}</#{type}>"
       end
 
       protected
@@ -61,7 +61,7 @@ module SimpleNavigation
       end
 
       def to_attributes(options)
-        options.map {|k, v| "#{k}='#{v}'"}.join(' ')
+        options.map {|k, v| v.nil? ? '' : " #{k}='#{v}'"}.join
       end
 
     end

data/lib/simple_navigation/rendering/renderer/breadcrumbs.rb

@@ -11,7 +11,10 @@ module SimpleNavigation
     class Breadcrumbs < SimpleNavigation::Renderer::Base
 
       def render(item_container)
-        content_tag(:div, a_tags(item_container).join(join_with), {:id => item_container.dom_id, :class => item_container.dom_class})
+        content = a_tags(item_container).join(join_with)
+        content_tag(:div,
+          prefix_for(content) + content,
+          {:id => item_container.dom_id, :class => item_container.dom_class})
       end
 
       protected
@@ -36,6 +39,10 @@ module SimpleNavigation
         super || (options[:static_leaf] && item.active_leaf_class)
       end
 
+      def prefix_for(content)
+        content.empty? ? '' : options[:prefix] || ''
+      end
+
       # Extracts the options relevant for the generated link
       #
       def link_options_for(item)

data/lib/simple_navigation/rendering/renderer/links.rb

@@ -14,11 +14,16 @@ module SimpleNavigation
       def render(item_container)
         div_content = item_container.items.inject([]) do |list, item|
           list << tag_for(item)
-        end.join
+        end.join(join_with)
         content_tag(:div, div_content, {:id => item_container.dom_id, :class => item_container.dom_class})
       end
 
       protected
+
+      def join_with
+        @join_with ||= options[:join_with] || ""
+      end
+
       def options_for(item)
         {:method => item.method}.merge(item.html_options)
       end

data/lib/simple_navigation/rendering/renderer/list.rb

@@ -21,7 +21,7 @@ module SimpleNavigation
         if skip_if_empty? && item_container.empty?
           ''
         else  
-          content_tag(:ul, list_content, {:id => item_container.dom_id, :class => item_container.dom_class}) 
+          content_tag((options[:ordered] ? :ol : :ul), list_content, {:id => item_container.dom_id, :class => item_container.dom_class}) 
         end
       end
     end

data/spec/lib/simple_navigation/rendering/renderer/breadcrumbs_spec.rb

@@ -23,7 +23,7 @@ describe SimpleNavigation::Renderer::Breadcrumbs do
         it "the rendered div-tag should have the specified class" do
           HTML::Selector.new('div.nav_dom_class').select(render).should have(1).entries
         end
-  
+
         context 'without current_navigation set' do
           it "should not render any a-tag in the div-tag" do
             HTML::Selector.new('div a').select(render).should have(0).entries
@@ -59,6 +59,22 @@ describe SimpleNavigation::Renderer::Breadcrumbs do
           end
         end
 
+        context 'with prefix option' do
+          it 'should render prefix before breadcrumbs' do
+            selection = HTML::Selector.new('div').select(render(:subnav1, :level => :all, :prefix => 'You are here: '))
+            raise unless selection.count == 1
+            tag = selection.first
+            tag.to_s.should =~ /^\<div.+\>You are here\: /
+          end
+
+          it 'should not render prefix if there is no available breadcrumb' do
+            allow_message_expectations_on_nil
+            selection = HTML::Selector.new('div').select(render('', :prefix => 'You are here: '))
+            tag = selection.first
+            tag.to_s.should =~ /^\<div.+\>\<\/div\>/
+          end
+        end
+
         context 'with static_leaf option' do
           before(:each) do
             @selection = HTML::Selector.new('div *').select(render(:subnav1, :level => :all, :static_leaf => true))

data/spec/lib/simple_navigation/rendering/renderer/links_spec.rb

@@ -51,6 +51,12 @@ describe SimpleNavigation::Renderer::Links do
           HTML::Selector.new('a.selected').select(render).should be_empty
         end
       end
+
+      context 'with a custom seperator specified' do
+        it "should separate the items with the separator" do
+          HTML::Selector.new('div').select_first(render(:subnav1, :join_with => " | ")).to_s.split(" | ").should have(4).entries
+        end
+      end
   
     end
     

metadata

@@ -1,93 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: simple-navigation
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 3
-  - 7
-  - 0
-  version: 3.7.0
+version: !ruby/object:Gem::Version
+  version: 3.8.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Andi Schacke
 - Mark J. Titorenko
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-20 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
+date: 2012-08-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 3
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.2
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 0
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.1
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+    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'
+- !ruby/object:Gem::Dependency
   name: rdoc
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-description: With the simple-navigation gem installed you can easily create multilevel navigations for your Rails, Sinatra or Padrino applications. The navigation is defined in a single configuration file. It supports automatic as well as explicit highlighting of the currently active navigation through regular expressions.
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: With the simple-navigation gem installed you can easily create multilevel
+  navigations for your Rails, Sinatra or Padrino applications. The navigation is defined
+  in a single configuration file. It supports automatic as well as explicit highlighting
+  of the currently active navigation through regular expressions.
 email: andreas.schacke@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - CHANGELOG
 - Gemfile
 - README
@@ -137,40 +135,31 @@ files:
 - spec/lib/simple_navigation/rendering/renderer/text_spec.rb
 - spec/lib/simple_navigation_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/andi/simple-navigation
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --inline-source
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: andi
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: simple-navigation is a ruby library for creating navigations (with multiple levels) for your Rails2, Rails3, Sinatra or Padrino application.
+summary: simple-navigation is a ruby library for creating navigations (with multiple
+  levels) for your Rails2, Rails3, Sinatra or Padrino application.
 test_files: []
-