nav 0.7.0 → 0.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 58149015afffa5b2d9cce232ffb836775bdf9e9d
+  data.tar.gz: fc210ea775bf73be81d64aa03be9319694b0ccf6
+SHA512:
+  metadata.gz: 40597ec1fa97d6142182eda7cfc040fc0c90fbf80b3f1b35c3f3dfcacd1cdcdd24fa827c7b2aabb274560730bcc9995553883da3e618ef97cd58492dc7e9dcdc
+  data.tar.gz: 1e96cdeaa67b15632c76dcd3e6c0ac96f6498364ca3f6091df7beb2d0beb5fd2ddd6c4193c8ccc1c387544d7d57bcd75bcb56c977d235b80a997ca7ce4243bff

data/Gemfile

@@ -2,3 +2,9 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in nav.gemspec
 gemspec
+
+group :development, :test do
+  gem 'minitest'
+  gem 'rr'
+
+end

data/lib/nav/builder.rb

@@ -1,5 +1,6 @@
 module Nav
   class Builder
+
     def initialize( template, options = {} )
       @template, @options = template, options
       @actions = []
@@ -9,7 +10,7 @@ module Nav
 
     # @example A basic action
     #   action "Home", home_url
-    #   action "Tome, home_url, :current => true
+    #   action "Home, home_url, :current => true
     #
     # @example Given a block
     #   action do
@@ -19,86 +20,88 @@ module Nav
     #   action :current => true do
     #     content_tag :span, "A simple text""
     #   end
-    def action( name = nil, options = {}, html_options = {}, &block )
-      @actions << if block
-        [ @template.capture(&block), name || {}, {} ]
+    def action( name = nil, url_for_options = {}, html_options = {}, &block )
+      @actions << if block_given?
+        [@template.capture(&block), name || {}, {}]
       else
         wrapper_options = {
           :current => html_options.delete(:current),
           :disabled => html_options.delete(:disabled),
         }
 
-        [ link_to(name, options, html_options), wrapper_options, options ]
+        [link_to(name, url_for_options, html_options), wrapper_options, url_for_options]
       end
     end
 
     def to_s
-      content_tag( :ul, actions.html_safe, @options ).html_safe if actions?
+      content_tag(:ul, actions.join.html_safe, @options).html_safe
     end
 
 
     private
 
     def actions
-      @actions.collect { |a| action_wrapper(*a) }.join
+      @actions.map { |content, options, url_for_options| action_wrapper(content, options, url_for_options) }
     end
 
     def actions?
       @actions.any?
     end
 
-    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 )
+    def action_wrapper( content, options = {}, url_for_options = {} )
+      present = [content, 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
+      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 = [ *options[: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 << "last" if present == @actions.last
+      classes << "current" if current?(*present)
       classes << "disabled" if options[:disabled]
-      classes << "before_current" if after_present && current?( *after_present )
-      classes << "after_current"  if before_present && current?( *before_present )
+      classes << "before_current" if after_present && current?(*after_present)
+      classes << "after_current"  if before_present && current?(*before_present)
 
-      content_tag :li, contents.html_safe, :class => classes.join(" ")
+      content_tag(:li, content.html_safe, :class => classes.join(" "))
     end
 
-    def current?( contents, options = {}, url_for_options = {} )
-      current = options[:current]
+    def current?( content, options = {}, url_for_options = {} )
+      return false if !!options[:disabled]
 
-      is_current = case current
-        when TrueClass then true
-        when Regexp then request_uri.match(current).nil? ? false : true
-        when Proc then current.call
-        else false
-      end
+      current = options[:current] || url_for_options
 
-      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]
+      case current
+      when TrueClass, FalseClass then current
+      when Regexp then request_uri.match(current)
+      when Proc then current.call
+      when Array then current.map { |c| current?(content, options.merge(current: c), url_for_options) }.any?
+      else current_page?(current)
+      end
+    end
 
-      false
+    def current_page?( options )
+      @template.current_page?(options)
     end
 
     def content_tag( *args )
-      @template.content_tag( *args ).html_safe
+      @template.content_tag(*args).html_safe
     end
 
     def link_to( *args )
-      @template.link_to( *args ).html_safe
+      @template.link_to(*args).html_safe
     end
 
     def request_uri
-      @request_uri or @request_uri = request.respond_to?(:request_uri) ? request.request_uri : request.url
+      request.respond_to?(:request_uri) ? request.request_uri : request.url
     end
 
     def request
       @template.request
     end
+
   end
 end
 

data/lib/nav/version.rb

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

data/nav.gemspec

@@ -18,6 +18,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'actionpack', '~> 3'
-  s.add_development_dependency 'rr'
+  s.add_dependency 'actionpack', '>= 3'
 end

data/test/test_helper.rb

@@ -1,13 +1,14 @@
-require 'rubygems'
+$:.unshift File.expand_path('..', __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
+
+require 'nav'
 require 'minitest/autorun'
+require 'rr'
 
 begin
   require 'action_view'
-  require 'rr'
 rescue LoadError
   STDERR.puts "Unable to run Nav tests."
-else
-  require File.dirname(__FILE__) + "/../lib/nav"
 end
 
 

metadata

@@ -1,38 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nav
 version: !ruby/object:Gem::Version
-  version: 0.7.0
-  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors:
 - Rudolf Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70286083358500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70286083358500
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: &70286083357760 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70286083357760
+        version: '3'
 description: Simple nagivation builder
 email: 
 executables: []
@@ -52,28 +43,28 @@ files:
 - test/test_helper.rb
 homepage: http://rubygems.org/gems/nav
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: nav
-rubygems_version: 1.8.17
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple nagivation builder
 test_files:
 - test/nav_test.rb
 - test/test_helper.rb
+has_rdoc: