tiny_navigation 0.1.1 → 0.1.3

data/.gitignore

@@ -0,0 +1,2 @@
+.DS_Store
+*.gem

data/.specification

@@ -0,0 +1,119 @@
+--- !ruby/object:Gem::Specification 
+name: tiny_navigation
+version: !ruby/object:Gem::Version 
+  hash: 31
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
+platform: ruby
+authors: 
+- Coroutine
+- Tim Lowrimore
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-07-12 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 3
+        - 4
+        version: 2.3.4
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 3
+        - 4
+        version: 2.3.4
+  type: :development
+  version_requirements: *id002
+description: TinyNavigation makes it easy to define site navigation using a small DSL.
+email: gems@coroutine.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README.rdoc
+files: 
+- .gitignore
+- .specification
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
+- VERSION
+- generators/tiny_navigation/USAGE
+- generators/tiny_navigation/templates/tiny_navigation.rb
+- generators/tiny_navigation/tiny_navigation_generator.rb
+- init.rb
+- lib/tiny_navigation.rb
+- lib/tiny_navigation/controller/base.rb
+- lib/tiny_navigation/data/config.rb
+- lib/tiny_navigation/data/item.rb
+- lib/tiny_navigation/data/navigation.rb
+- rails/init.rb
+- test/navigation_test.rb
+- test/test_helper.rb
+- tiny_navigation.gemspec
+has_rdoc: true
+homepage: http://github.com/coroutine/tiny_navigation
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+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 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.7
+signing_key: 
+specification_version: 3
+summary: TinyNavigation provides an easy-to-use DSL for defining navigation structures.
+test_files: 
+- test/navigation_test.rb
+- test/test_helper.rb
+

data/README.rdoc

@@ -111,7 +111,7 @@ The resulting structure could be used to generate the markup.  For example:
 
   *IMPORTANT* if a custom attribute is defined on an item, as mentioned earlier,
   it will take precedence over a controller attribute of the same name, thus
-  hiding access to the controller attribute.
+  hiding access to the controller attribute from within the config file.
 
 === Here are a couple things that TinyNavigation WILL NOT do:
 
@@ -119,7 +119,7 @@ The resulting structure could be used to generate the markup.  For example:
   to you.  You may want to render your nav items into <tt>div</tt> tags, while
   I may want to use an unordered list.  That's fine, go for it.
 
-* TinyNavigation does provide authorization logic for limiting access to
+* TinyNavigation does not provide authorization logic for limiting access to
   navigation items; that's a separate concern.  It's easy enough to use
   an authorization gem that does that job quite well, and by allowing for calls
   to the current controller from within config/tiny_navigation.rb, you can

data/Rakefile

@@ -25,12 +25,16 @@ end
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
-    gemspec.name        = "tiny_navigation"
-    gemspec.summary     = "TinyNavigation provides an easy-to-use DSL for defining navigation structures."
+    gemspec.authors     = ["Coroutine", "Tim Lowrimore"]
     gemspec.description = "TinyNavigation makes it easy to define site navigation using a small DSL."
     gemspec.email       = "gems@coroutine.com"
     gemspec.homepage    = "http://github.com/coroutine/tiny_navigation"
-    gemspec.authors     = ["Coroutine", "Tim Lowrimore"]
+    gemspec.name        = "tiny_navigation"
+    gemspec.summary     = "TinyNavigation provides an easy-to-use DSL for defining navigation structures."
+    
+    gemspec.add_dependency("actionpack", ">= 2.3.4")
+    gemspec.add_development_dependency("activesupport", ">= 2.3.4")
+    gemspec.files.include("lib/**/*.rb")
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/init.rb

@@ -1,2 +1 @@
-require "tiny_navigation"
-ActionController::Base.class_eval { include Coroutine::TinyNavigation::ControllerMethods }
+require File.dirname(__FILE__) + "/rails/init.rb"

data/lib/tiny_navigation/controller/base.rb

@@ -0,0 +1,36 @@
+module Coroutine              #:nodoc:
+  module TinyNavigation       #:nodoc:
+    module Controller         #:nodoc:
+      
+      # This module provides the core controller functionality implemented by 
+      # the gem.
+      #
+      module Base
+      
+        def self.included(base)   #:nodoc:
+          base.send(:include, InstanceMethods)
+          base.send(:helper_method, :navigation)
+        end
+      
+    
+        # This module contains instance methods that will be mixed into the extended
+        # controller.
+        #
+        module InstanceMethods
+          private
+      
+          # This method returns a Coroutine::TinyNavigation::Data::Navigation object for 
+          # the supplied navigation name.
+          #
+          def navigation(which_navigation)
+            config = Coroutine::TinyNavigation::Data::Config.new self
+            config.nav[which_navigation]
+          end
+        end
+    
+      end
+      
+      
+    end
+  end
+end

data/lib/tiny_navigation/data/config.rb

@@ -0,0 +1,46 @@
+module Coroutine                        #:nodoc:
+  module TinyNavigation                 #:nodoc:
+    module Data                         #:nodoc:
+      
+      # This class represents a configuration object. It is responsible for reading in the 
+      # DSL and converting it to a structured set of navigation objects.
+      #
+      class Config #:nodoc:
+      
+        attr_reader :nav
+        
+        # This method creates a new configuration object. It reads in the configuration
+        # file and saves the contents to a class variable so it only has to be loaded
+        # once.
+        #
+        # <tt>current_controller</tt> is a reference to the controller object being extended.
+        #
+        # <tt>config</tt> is the location of the config file to load. Defaults to the generated
+        # file.
+        #
+        def initialize(current_controller, conf=File.join(Rails.root, "config", "tiny_navigation.rb"))
+          @current_controller = current_controller
+          @nav = {}
+        
+          Config.class_eval { class << self; attr_reader :file end; @file ||= File.read(conf) }
+          
+          self.instance_eval(Config.file);
+        end
+      
+      
+        private
+      
+        # This method adds a navigation structure to the application.
+        #
+        # <tt>name</tt> is the key in the navigation hash.
+        #
+        def navigation(name, &block)
+          raise "Navigation names must be unique.  You specified '#{name}' twice." if @nav.has_key?(name)
+          @nav[name] = Navigation.new(name, @current_controller, &block)
+        end
+      
+      end
+      
+    end
+  end
+end

data/lib/tiny_navigation/data/item.rb

@@ -0,0 +1,78 @@
+module Coroutine                        #:nodoc:
+  module TinyNavigation                 #:nodoc:
+    module Data                         #:nodoc:
+      
+      # This class represents a navigation item. It holds all the data for item
+      # and provides a number of convenience methods related to that item.
+      #
+      class Item < Navigation
+      
+        # This method creates a new instance of a navigation item.
+        # 
+        # <tt>name</tt> is the name of the navigation item.  The name should
+        # be used for the label text when rendering the navigation item.
+        # 
+        # <tt>current_controller</tt> the currently loaded controller
+        #
+        # <tt>options</tt> provide configuration options and custom properties
+        # to the nav item.  Currently, the only configuration option is
+        # <tt>:to</tt> which is used to generate the URL of the navigation item.
+        # All other options provided to via the <tt>options</tt> hash will be
+        # treated as custom properties on the navigation item.  These custom
+        # properties can be accessed as methods on the navigation item.
+        # 
+        # The block given to the navigation item is used to define sub-navigation
+        # items of this item.
+        #
+        def initialize(name, current_controller, options={}, &block)
+          super name, current_controller, &block
+          set_controller_and_action options.delete(:to)
+          @extra_options = options
+        end
+      
+        # This method indicates whether the navigation item is currently selected.  
+        # This takes into account any sub-nav items such that a parent item is 
+        # selected if it has a selected child.
+        #
+        def selected?
+          @controller_name == @current_controller.controller_name || @items.any?(&:selected?)
+        end
+      
+        # This method returns the URL to which the navigation item points. This 
+        # should be used in a scenario where the navigation item represents a link 
+        # and the URL is the href of that link.
+        #
+        def url
+          @current_controller.url_for :controller => @controller_name, :action => @action_name
+        end
+      
+        # This method uses the extra_options hash takes precendence when looking 
+        # for the called method. Otherwise, we'll let the super-class forward
+        # the method call to the current controller.
+        #
+        def method_missing(method_name, *args) #:nodoc:
+          if @extra_options.has_key? method_name
+            @extra_options[method_name]
+          else
+            super method_name, *args
+          end
+        end
+      
+      
+        private
+      
+        # This method converts the :to option value into controller and action
+        # values.
+        #
+        def set_controller_and_action(to)
+          if to
+            controller_and_action = to.split "#"
+            @controller_name      = controller_and_action.shift
+            @action_name          = controller_and_action.shift || "index"
+          end
+        end
+      end
+      
+    end
+  end
+end

data/lib/tiny_navigation/data/navigation.rb

@@ -0,0 +1,68 @@
+module Coroutine                        #:nodoc:
+  module TinyNavigation                 #:nodoc:
+    module Data                         #:nodoc:
+      
+      # This class represents a navigation tree. It holds all the data for tree
+      # and provides a number of convenience methods related to that tree.
+      #
+      class Navigation
+        
+        attr_reader :name, :items
+      
+        # This method creates a new navigation data object.
+        # 
+        # <tt>name</tt> is the unique identifer of the navigation.
+        # 
+        # <tt>current_controller</tt> the currently loaded controller
+        # 
+        # The block given to the navigation item is used to define navigation
+        # items of this navigation object.
+        #
+        def initialize(name, current_controller, &block)
+          @items                  = []
+          @name                   = name
+          @current_controller     = current_controller
+        
+          self.instance_eval(&block) if block_given?
+        end
+      
+        # This method returns an array of selected navigation items. The array 
+        # represents a bread-crumb list in that the head of the list represents 
+        # a top-level navigation item, and the tail of the list represents selected 
+        # sub-navigation items.
+        #
+        # <tt>item</tt> is the reference point for the calculation.
+        #
+        def selected(item=self)
+          items = []
+          item.items.each do |item|
+            items << item << selected(item) if item.selected?
+          end
+          items.flatten
+        end
+      
+        # This method delegates method missing calls to the controller, in case 
+        # the navigation item has user-defined properties.
+        #
+        def method_missing(method_name, *args) #:nodoc:
+          @current_controller.send method_name, *args
+        end
+      
+      
+        private
+        
+        # This method adds a new item to the items collection.
+        #
+        # <tt>name</tt> is the friendly name for the navigation item.
+        #
+        # <tt>options</tt> is a hash containing any user-defined properties.
+        #
+        def item(name, options={}, &block)
+          @items << Item.new(name, @current_controller, options, &block)
+        end
+      
+      end
+    
+    end
+  end
+end

data/lib/tiny_navigation.rb

@@ -1,7 +1,32 @@
-require 'tiny_navigation/item'
-require 'tiny_navigation/navigation'
+#------------------------------------------------------------
+# setup
+#------------------------------------------------------------
 
-module Coroutine
+# external gems
+require "action_pack"
+require "action_controller"
+
+
+# add data files
+require File.dirname(__FILE__) + "/tiny_navigation/data/config"
+require File.dirname(__FILE__) + "/tiny_navigation/data/navigation"
+require File.dirname(__FILE__) + "/tiny_navigation/data/item"
+
+
+# add controller files
+require File.dirname(__FILE__) + "/tiny_navigation/controller/base"
+
+
+# add extensions to action controller
+::ActionController::Base.send(:include, Coroutine::TinyNavigation::Controller::Base)
+
+
+
+#------------------------------------------------------------
+# doc namespaces
+#------------------------------------------------------------
+
+module Coroutine  #:nodoc:
   
   # TinyNavigation provides an easy-to-use DSL for defining navigation structures;
   # these structures are defined in config/tiny_navigation.rb.
@@ -80,49 +105,25 @@ module Coroutine
   #     to you.  You may want to render your nav items into <tt>div</tt> tags, while
   #     I may want to use an unordered list.  That's fine, go for it.
   # 
-  #   * TinyNavigation does provide authorization logic for limiting access to
+  #   * TinyNavigation does not provide authorization logic for limiting access to
   #     navigation items; that's a separate concern.  It's easy enough to use
   #     an authorization gem that does that job quite well, and by allowing for calls
   #     to the current controller from within config/tiny_navigation.rb you can
   #     do that.
+  #
   module TinyNavigation
-    class Config #:nodoc:
-      
-      attr_reader :nav
-      
-      def initialize(current_controller, conf=File.join(Rails.root, "config", "tiny_navigation.rb"))
-        @current_controller = current_controller
-        @nav = {}
-        
-        # Make sure we only load the config file the first time the navigation is loaded
-        # and never again.
-        Config.class_eval { class << self; attr_reader :file end; @file ||= File.read(conf) }
-        self.instance_eval(Config.file);
-      end
-      
-      private
-      
-      def navigation(name, &block)
-        raise "Navigation names must be unique.  You specified '#{name}' twice." if @nav.has_key?(name)
-        @nav[name] = Navigation.new(name, @current_controller, &block)
-      end
+   
+    # This module defines all behavior and logic related to extending controller
+    # behavior.
+    #
+    module Controller
     end
     
-    # This module adds the navigation method to ActionController::Base and makes
-    # the method available as a helper.
-    module ControllerMethods
-      def self.included(base) #:nodoc:
-        base.send :helper_method, :navigation
-      end
-      
-      private
-      
-      # Returns a Coroutine::TinyNavigation::Navigation object for the supplied
-      # navigation name.
-      def navigation(which_navigation)
-        config = Coroutine::TinyNavigation::Config.new self
-        config.nav[which_navigation]
-      end
+    # This module defines all objects that primarily serve to provide data structures
+    # and access methods.
+    #
+    module Data
     end
+    
   end
 end

data/rails/init.rb

@@ -0,0 +1 @@
+require "tiny_navigation"

data/test/navigation_test.rb

@@ -1,6 +1,5 @@
 require 'test_helper'
-require 'tiny_navigation/navigation'
-require 'tiny_navigation/item'
+
 
 class NavigationTest < ActiveSupport::TestCase
   
@@ -9,23 +8,74 @@ class NavigationTest < ActiveSupport::TestCase
     @current_controller   = @controller_class.new("tests")
   end
   
-  test "can create a navigation with an item" do
+  
+  #-------------------------------------------------------------------------------
+  # Definition tests
+  #-------------------------------------------------------------------------------
+  
+  # flat structure  
+  test "can create a navigation with one level of nesting" do
+    nav = navigation do
+      item "Foos", :to => "foos#index"
+      item "Bars", :to => "bars#index"
+    end
+    
+    assert_equal 2, nav.items.length
+  end
+  
+  # nested structure
+  test "can create a navigation with multiple levels of nesting" do
     nav = navigation do
       item "Foos", :to => "foos#index"
+      item "Bars", :to => "bars#index" do
+        item "Tests", :to => "tests#index"
+      end
     end
     
-    assert_equal nav.items.length, 1
+    assert_equal 2, nav.items.length
+    assert_equal 1, nav.items.last.items.length
   end
   
+  # with conditions
+  test "can create a navigation with conditional inclusion" do
+    nav = navigation do
+      item "Foos",  :to => "foos#index"   if 1 == 1
+      item "Bars",  :to => "bars#index"   if 1 == 2
+      item "Tests", :to => "tests#index"
+    end
+    
+    assert_equal 2, nav.items.length
+  end
+  
+  # extra options
+  test "can create a navigation with user-defined properties on items" do
+    nav = navigation do
+      item "Foos",  :to => "foos#index", :align => :left
+      item "Bars",  :to => "bars#index", :align => :right
+    end
+    
+    assert_equal 2,       nav.items.length
+    assert_equal :left,   nav.items.first.align
+    assert_equal :right,  nav.items.last.align
+  end
+  
+  
+  
+  #-------------------------------------------------------------------------------
+  # Selection tests
+  #-------------------------------------------------------------------------------
+  
+  # flat structure  
   test "has correct selected item in one level of nesting" do
     nav = navigation do
       item "Tests", :to => "tests"
     end
     
-    assert_equal nav.selected.length, 1
-    assert_equal nav.selected.first.name, "Tests"
+    assert_equal 1,       nav.selected.length
+    assert_equal "Tests", nav.selected.first.name
   end
   
+  # nested structure
   test "has correct selected items in multiple levels of nesting" do
     nav = navigation do
       item "Foos", :to => "foos#index" do
@@ -33,17 +83,22 @@ class NavigationTest < ActiveSupport::TestCase
       end
     end
     
-    assert_equal nav.selected.length, 2
-    assert_equal nav.selected.map(&:name), ["Foos", "Tests"]
+    assert_equal 2,                 nav.selected.length
+    assert_equal ["Foos", "Tests"], nav.selected.map(&:name)
   end
   
-  # ------------------------------------------------------------------------------
+  
+  
+  #-------------------------------------------------------------------------------
   # Helpers
-  # ------------------------------------------------------------------------------
+  #-------------------------------------------------------------------------------
   
   private
   
+  # This method bootstraps a navigation call in lieu of loading a config file.
+  #
   def navigation(name = :main, current_controller = @current_controller, &block)
-    Coroutine::TinyNavigation::Navigation.new(name, current_controller, &block)
+    Coroutine::TinyNavigation::Data::Navigation.new(name, current_controller, &block)
   end
+  
 end

data/test/test_helper.rb

@@ -1,3 +1,9 @@
-require 'rubygems'
-require 'test/unit'
-require 'active_support'
+# require rails stuff
+require "rubygems"
+require "active_support"
+require "active_support/test_case"
+require "test/unit"
+
+
+# require gem/plugin
+require "#{File.dirname(__FILE__)}/../init"

data/tiny_navigation.gemspec

@@ -5,18 +5,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tiny_navigation}
-  s.version = "0.1.1"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Coroutine", "Tim Lowrimore"]
-  s.date = %q{2010-05-14}
+  s.date = %q{2010-07-28}
   s.description = %q{TinyNavigation makes it easy to define site navigation using a small DSL.}
   s.email = %q{gems@coroutine.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    "MIT-LICENSE",
+    ".gitignore",
+     ".specification",
+     "MIT-LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
@@ -25,19 +27,19 @@ Gem::Specification.new do |s|
      "generators/tiny_navigation/tiny_navigation_generator.rb",
      "init.rb",
      "lib/tiny_navigation.rb",
-     "lib/tiny_navigation/item.rb",
-     "lib/tiny_navigation/navigation.rb",
-     "pkg/simple_navigation-0.1.0.gem",
-     "pkg/tiny_navigation-0.1.0.gem",
+     "lib/tiny_navigation/controller/base.rb",
+     "lib/tiny_navigation/data/config.rb",
+     "lib/tiny_navigation/data/item.rb",
+     "lib/tiny_navigation/data/navigation.rb",
+     "rails/init.rb",
      "test/navigation_test.rb",
      "test/test_helper.rb",
-     "tiny_navigation.gemspec",
-     "uninstall.rb"
+     "tiny_navigation.gemspec"
   ]
   s.homepage = %q{http://github.com/coroutine/tiny_navigation}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{TinyNavigation provides an easy-to-use DSL for defining navigation structures.}
   s.test_files = [
     "test/navigation_test.rb",
@@ -48,10 +50,16 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<actionpack>, [">= 2.3.4"])
+      s.add_development_dependency(%q<activesupport>, [">= 2.3.4"])
     else
+      s.add_dependency(%q<actionpack>, [">= 2.3.4"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
     end
   else
+    s.add_dependency(%q<actionpack>, [">= 2.3.4"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
   end
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tiny_navigation
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Coroutine
@@ -15,10 +16,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 -05:00
+date: 2010-07-28 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 3
+        - 4
+        version: 2.3.4
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 3
+        - 4
+        version: 2.3.4
+  type: :development
+  version_requirements: *id002
 description: TinyNavigation makes it easy to define site navigation using a small DSL.
 email: gems@coroutine.com
 executables: []
@@ -28,6 +60,8 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
+- .specification
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -37,14 +71,14 @@ files:
 - generators/tiny_navigation/tiny_navigation_generator.rb
 - init.rb
 - lib/tiny_navigation.rb
-- lib/tiny_navigation/item.rb
-- lib/tiny_navigation/navigation.rb
-- pkg/simple_navigation-0.1.0.gem
-- pkg/tiny_navigation-0.1.0.gem
+- lib/tiny_navigation/controller/base.rb
+- lib/tiny_navigation/data/config.rb
+- lib/tiny_navigation/data/item.rb
+- lib/tiny_navigation/data/navigation.rb
+- rails/init.rb
 - test/navigation_test.rb
 - test/test_helper.rb
 - tiny_navigation.gemspec
-- uninstall.rb
 has_rdoc: true
 homepage: http://github.com/coroutine/tiny_navigation
 licenses: []
@@ -55,23 +89,27 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: TinyNavigation provides an easy-to-use DSL for defining navigation structures.

data/lib/tiny_navigation/item.rb

@@ -1,66 +0,0 @@
-require 'tiny_navigation/navigation'
-
-module Coroutine
-  module TinyNavigation
-    class Item < Navigation
-      
-      # Creates a new instance of a navigation item.
-      # 
-      # <tt>name</tt> is the name of the navigation item.  The name should
-      # be used for the label text when rendering the navigation item.
-      # 
-      # <tt>current_controller</tt> the currently loaded controller
-      #
-      # <tt>options</tt> provide configuration options and custom properties
-      # to the nav item.  Currently, the only configuration option is
-      # <tt>:to</tt> which is used to generate the URL of the navigation item.
-      # All other options provided to via the <tt>options</tt> hash will be
-      # treated as custom properties on the navigation item.  These custom
-      # properties can be accessed as methods on the navigation item.
-      # 
-      # The block given to the navigation item is used to define sub-navigation
-      # items of this item.
-      def initialize(name, current_controller, options={}, &block)
-        super name, current_controller, &block
-        set_controller_and_action options.delete(:to)
-        @extra_options = options
-      end
-      
-      # Indicates whether the navigation item is currently selected.  This
-      # takes into account any sub-nav items such that a parent item is selected
-      # if it has a selected child.
-      def selected?
-        @controller_name == @current_controller.controller_name || @items.any?(&:selected?)
-      end
-      
-      # Returns the URL to which the navigation item points.  This should be
-      # used in a scenario where the navigation item represents a link and the
-      # URL is the href of that link.
-      def url
-        @current_controller.url_for :controller => @controller_name, :action => @action_name
-      end
-      
-      def method_missing(method_name, *args) #:nodoc:
-        
-        # The extra_options hash takes precendence when looking for the
-        # called method.  Otherwise, we'll let the super-class forward
-        # the method call to the current controller.
-        if @extra_options.has_key? method_name
-          @extra_options[method_name]
-        else
-          super method_name, *args
-        end
-      end
-      
-      private
-      
-      def set_controller_and_action(to)
-        if to
-          controller_and_action = to.split "#"
-          @controller_name      = controller_and_action.shift
-          @action_name          = controller_and_action.shift || "index"
-        end
-      end
-    end
-  end
-end

data/lib/tiny_navigation/navigation.rb

@@ -1,47 +0,0 @@
-module Coroutine
-  module TinyNavigation
-    class Navigation
-      
-      attr_reader :name, :items
-      
-      # Creates a new navigation.
-      # 
-      # <tt>name</tt> is the unique identifer of the navigation.
-      # 
-      # <tt>current_controller</tt> the currently loaded controller
-      # 
-      # The block given to the navigation item is used to define navigation
-      # items of this navigation object.
-      def initialize(name, current_controller, &block)
-        @items                    = []
-        @name                     = name
-        @current_controller     = current_controller
-        
-        self.instance_eval(&block) if block_given?
-      end
-      
-      # Returns an array of selected navigation items.  The array represents a
-      # bread-crumb list in that the head of the list represents a top-level
-      # navigation item, and the tail of the list represents selected sub-navigation
-      # items.
-      def selected(item=self)
-        items = []
-        item.items.each do |item|
-          items << item << selected(item) if item.selected?
-        end
-        items.flatten
-      end
-      
-      def method_missing(method_name, *args) #:nodoc:
-        @current_controller.send method_name, *args
-      end
-      
-      private
-      
-      def item(name, options={}, &block)
-        @items << Item.new(name, @current_controller, options, &block)
-      end
-      
-    end
-  end
-end

data/uninstall.rb

@@ -1 +0,0 @@
-# Uninstall hook code here