nav 0.6.0 → 0.7.0

data/lib/nav/builder.rb

@@ -3,7 +3,7 @@ module Nav
     def initialize( template, options = {} )
       @template, @options = template, options
       @actions = []
-      
+
       yield self if block_given?
     end
 
@@ -26,11 +26,8 @@ module Nav
         wrapper_options = {
           :current => html_options.delete(:current),
           :disabled => html_options.delete(:disabled),
-          :force_current => html_options.delete(:force_current),
-          :prepend => html_options.delete(:prepend),
-          :append => html_options.delete(:append)
         }
-      
+
         [ link_to(name, options, html_options), wrapper_options, options ]
       end
     end
@@ -53,29 +50,27 @@ module Nav
     def action_wrapper( contents, options = {}, url_for_options = {} )
       present = [contents, options, url_for_options] # the one we're dealing with
       present_index  = @actions.index( present )
-      
+
       before_present = @actions.at( present_index - 1 ) if present_index > 0
       after_present  = @actions.at( present_index + 1 ) if present_index < @actions.size
 
       classes = []
+      classes << options[:class] if options.key?(:class)
       classes << "first" if present == @actions.first
       classes << "after_first" if present_index == 1
       classes << "before_last" if present == @actions[-2]
       classes << "last"  if present == @actions.last
       classes << "current"  if current?( *present )
-      classes << "disabled" if options.delete(:disabled)
+      classes << "disabled" if options[:disabled]
       classes << "before_current" if after_present && current?( *after_present )
       classes << "after_current"  if before_present && current?( *before_present )
-      # classes << classes.join("_") if classes.any?
-
-      contents = options[:prepend].to_s + contents + options[:append].to_s
 
       content_tag :li, contents.html_safe, :class => classes.join(" ")
     end
 
     def current?( contents, options = {}, url_for_options = {} )
       current = options[:current]
-      
+
       is_current = case current
         when TrueClass then true
         when Regexp then request_uri.match(current).nil? ? false : true
@@ -83,7 +78,7 @@ module Nav
         else false
       end
 
-      return true if is_current && !options[:disabled] && options[:force_current]
+      return true if is_current && !options[:disabled]
       return true if is_current || !url_for_options.is_a?(Symbol) && @template.current_page?(url_for_options) && url_for_options != {} && !options[:disabled]
 
       false

data/lib/nav/version.rb

@@ -1,5 +1,5 @@
 module Nav
 
-  VERSION = "0.6.0"
-  
+  VERSION = "0.7.0"
+
 end

data/lib/nav.rb

@@ -3,7 +3,7 @@ module Nav
   autoload :Builder, File.dirname(__FILE__) + '/nav/builder'
 
   def nav( options = {}, &block )
-    Nav::Builder.new( self, options, &block ) 
+    Nav::Builder.new( self, options, &block ).to_s
   end
 
 end

data/test/nav_test.rb

@@ -1,13 +1,7 @@
 require_relative 'test_helper'
-puts 'awesome'
 
 describe Nav do
 
-  # <ul id="nav">
-  #   <li class="">before <a href="/">test</a></li>
-  #   <li class="">before <a href="#" onclick="new Ajax.Request('/', {asynchronous:true, evalScripts:true, parameters:'authenticity_token=' + encodeURIComponent('7016ef6fd7413d836cd720a6071e22e4f14e0212')}); return false;">test</a></li>
-  # </ul>
-
   before do
     @view = ActionView::Base.new
     @view.output_buffer = ''
@@ -30,14 +24,5 @@ describe Nav do
     assert_match(/<a.*href=\"\/link\">my-link<\/a>/, m)
   end
 
-  it "should display :prepend options before the link" do
-    m = @view.nav { |m| m.action('my-link', '/link', :prepend => 'something before') }
-    assert_match(/<li.*>something before<a/, m)
-  end
-  
-  it "should display :append options after the link" do
-    m = @view.nav { |m| m.action('my-link', '/link', :append => 'something after') }
-    assert_match(/<\/a>something after<\/li>/, m)
-  end
-
+  # TODO: Add test cases for actions with blocks
 end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
+require 'rubygems'
 require 'minitest/autorun'
 
-
 begin
   require 'action_view'
   require 'rr'
@@ -13,5 +13,5 @@ end
 
 class MiniTest::Unit::TestCase
   include RR::Adapters::TestUnit
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nav
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2012-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70123352610920 !ruby/object:Gem::Requirement
+  requirement: &70286083358500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70123352610920
+  version_requirements: *70286083358500
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70123352610360 !ruby/object:Gem::Requirement
+  requirement: &70286083357760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123352610360
+  version_requirements: *70286083357760
 description: Simple nagivation builder
 email: 
 executables: []