menumatic 0.1.5 → 0.2.0

data/Gemfile

@@ -7,4 +7,4 @@ gem 'rspec'
 gem 'autotest'
 gem 'autotest-growl'
 gem 'capybara', :git => 'https://github.com/jnicklas/capybara.git'
-gem 'rails', '3.0.5'
+gem 'rails', '>= 3.0.4'

data/Gemfile.lock

@@ -15,7 +15,8 @@ GIT
 PATH
   remote: .
   specs:
-    menumatic (0.1.4)
+    menumatic (0.2.0)
+      rails (>= 3.0.4)
 
 GEM
   remote: http://rubygems.org/
@@ -120,5 +121,5 @@ DEPENDENCIES
   autotest-growl
   capybara!
   menumatic!
-  rails (= 3.0.5)
+  rails (>= 3.0.4)
   rspec

data/README.md

@@ -85,7 +85,7 @@ helper:
     <!-- snip -->
     <header>
       <nav>
-       <%= navigation :navigation => 'application' %>
+       <%= render :navigation => 'application' %>
       </nav>
     </header>
 

data/lib/menumatic.rb

@@ -13,9 +13,6 @@ module Menumatic
     end
     autoload :Base, 'menumatic/navigation'
   end
-
-  #autoload :Mapper, 'menumatic/action_dispatch/routing/mapper'
-  #autoload :SitemapController, '../app/controllers/menumatic
 end
 
 require 'rails'
@@ -23,3 +20,4 @@ require 'menumatic/rails/routes'
 require 'menumatic/rails/rendering'
 require 'menumatic/engine'
 require 'menumatic/hash'
+require 'menumatic/exceptions'

data/lib/menumatic/exceptions.rb

@@ -0,0 +1,22 @@
+module Menumatic
+  # A general Menumatic Exception
+  class Error < StandardError; end
+
+  # Raised when a navigation cannot be found, usually from load_navigation
+  class NavigationNotFound < Error
+
+
+    def initialize(navigation = nil)
+      @navigation = navigation
+      @default_message = "No navigation not specified in call to render()."
+    end
+
+    def to_s
+      if @navigation
+        "Navigation file not found: #{@navigation}"
+      else
+        @default_message
+      end
+    end
+  end
+end

data/lib/menumatic/navigation.rb

@@ -42,10 +42,14 @@ module Menumatic
         end
 
         def load_navigation(navigation_id)
-          # Eager load the requested navgation (allows for use of normal if/unless statements)
-          Menumatic::Navigation::Base.destroy_all
-          load "app/navigation/#{navigation_id}_navigation.rb"
-          Menumatic::Navigation::Base.get(navigation_id)
+          if File.exists?("app/navigation/#{navigation_id}_navigation.rb")
+            # Eager load the requested navgation (allows for use of normal if/unless statements)
+            Menumatic::Navigation::Base.destroy_all
+            load "app/navigation/#{navigation_id}_navigation.rb"
+            Menumatic::Navigation::Base.get(navigation_id)
+          else
+            raise Menumatic::NavigationNotFound, "app/navigation/#{navigation_id}_navigation.rb"
+          end
         end
       end
 

data/lib/menumatic/navigation/item/renderers.rb

@@ -20,6 +20,9 @@ module Menumatic
           options[:wrapper_tag] ||= :ul
           options[:item_tag] ||= :li
 
+          # 1.0 roadmap - rendering should be divided into these two methods
+          render_as_link(request, options) || render_as_group(request, options)
+
           # render list
           list = self.items.map { |item| item.render(request, options) }.join("")
           html_options[:class] ||= ""
@@ -95,7 +98,8 @@ module Menumatic
 
         def depth_count(request, options = {})
           return options[:levels].count if options[:levels] && !options[:levels].empty?
-          count_active_descendants(request)
+          depth = count_active_descendants(request)
+          (depth > 0) ? depth : 1
         end
 
         def paths_match?(request)
@@ -115,6 +119,19 @@ module Menumatic
         def levels_to_i(levels_in_words)
           levels_in_words.map{ |word| word.is_a?(Symbol) ? @@level_options.index(word.to_sym) + 1 : word } if levels_in_words
         end
+
+        private
+        def render_as_link(request, options = {})
+          if self.is_link?
+            #... todo
+          end
+        end
+
+        def render_as_group(request, options = {})
+          if self.is_group?
+            #... todo
+          end
+        end
       end
     end
   end

data/lib/menumatic/rails/rendering.rb

@@ -5,7 +5,7 @@ module ActionView
     # for :navigation, which will render the selected navigation from the
     # `app/navigation` directory.
     def render_with_navigation_option(options = {}, locals = {}, &block)
-      if options.has_key? :navigation
+      if options.respond_to?(:has_key?) && options.has_key?(:navigation)
         navigation_id = options[:navigation]
         options.delete(:navigation)
         menumatic(navigation_id, options)

data/lib/menumatic/version.rb

@@ -1,3 +1,3 @@
 module Menumatic
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/menumatic.gemspec

@@ -9,11 +9,16 @@ Gem::Specification.new do |s|
   s.authors     = ["Nicholas Bruning"]
   s.email       = ["nicholas@bruning.com.au"]
   s.homepage    = "http://github.com/thetron/menumatic"
-  s.summary     = %q{Menumatic is a Rails 3 gem which aims to simplify building complex website navigation}
-  s.description = %q{Menumatic is a Rails 3 exclusive gem which aims to take all the fuss and clutter out of developing semantic, usable navigation menus.}
+  s.summary     = %q{Menumatic is a Rails 3 gem which simplifies building complex website navigation}
+  s.description = %q{Menumatic is a Rails 3 gem which simplifies the development of complex website navigation, producing semantic, usable navigation menus.}
 
   s.rubyforge_project = "menumatic"
 
+  s.add_dependency 'rails', '>= 3.0.4'
+
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rails', '>= 3.0.4'
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/spec/navigation_helper_spec.rb

@@ -1,20 +1,76 @@
 require 'spec_helper'
 
-describe Menumatic::Navigation::Item::Group do
+describe Menumatic::Helpers::NavigationHelper do
   before :each do
-    # build a reasonably complex navigation and ensure that it's
-    # properly stored for retreival
-  end
-
-  it "should be reloadable from it's ID"
-  it "should reload between renders"
-  it "should have a depth of 1 if no items are active"
-  it "should have a depth of 1 if a first-level child is active"
-  it "should have a depth of 2 if a second-level child is active"
-  it "should have a depth of 3 if a third-level child is active"
-  it "should have each level labelled in sequence starting at 1"
-  it "should be able to display all links"
-  it "should be able to render a different list tag"
-  it "should be able to render a different item tag"
-  it "should render different "
+    @navigation = Menumatic::Navigation::Base::new(:application).root
+    @navigation.navigate_to "Home", "/home"
+    @navigation.navigate_to "Store", "/store" do |store|
+      store.navigate_to "Categories", "/store/categories" do |categories|
+        categories.navigate_to "Blue things", "/store/categories/blue"
+        categories.navigate_to "Red things", "/store/categories/red"
+      end
+      store.navigate_to "Specials", "/store/specials"
+    end
+    @navigation.navigate_to "Contact us", "/contact_us"
+  end
+
+  it "should have a depth of 1 if no items are active" do
+    @navigation.depth_count(@request).should == 1
+  end
+
+
+  it "should have a depth of 1 if a first-level child is active" do
+    @request.stub!(:fullpath).and_return("/contact_us")
+    @request.stub!(:url).and_return("http://test.menumatic.com/contact_us")
+    @navigation.depth_count(@request).should == 1
+  end
+
+  it "should have a depth of 2 if a second-level child is active" do
+    @request.stub!(:fullpath).and_return("/store/specials")
+    @request.stub!(:url).and_return("http://test.menumatic.com/store/specials")
+    @navigation.depth_count(@request).should == 2
+  end
+
+  it "should have a depth of 3 if a third-level child is active" do
+    @request.stub!(:fullpath).and_return("/store/categories/red")
+    @request.stub!(:url).and_return("http://test.menumatic.com/store/categories/red")
+    @navigation.depth_count(@request).should == 3
+  end
+
+  it "should have each level labelled in sequence starting at 1" do
+    @request.stub!(:fullpath).and_return("/store/categories/red")
+    @request.stub!(:url).and_return("http://test.menumatic.com/store/categories/red")
+    Capybara::string(@navigation.render(@request)).should have_selector("ul.level_1 > li > ul.level_2 > li ul.level_3")
+  end
+
+  it "should be able to display all links" do
+    html = Capybara::string(@navigation.render(@request, :show => :all))
+    html.should have_selector('a[href="/home"]')
+    html.should have_selector('a[href="/store"]')
+    html.should have_selector('a[href="/store/categories"]')
+    html.should have_selector('a[href="/store/categories/blue"]')
+    html.should have_selector('a[href="/store/categories/red"]')
+    html.should have_selector('a[href="/store/specials"]')
+    html.should have_selector('a[href="/contact_us"]')
+  end
+
+  it "should be able to render a different list tag" do
+    html = Capybara::string(@navigation.render(@request, :wrapper_tag => :nav))
+    html.should have_selector('nav.level_1')
+  end
+
+  it "should be able to render a different item tag" do
+    html = Capybara::string(@navigation.render(@request, :item_tag => :span))
+    html.should have_selector('ul.level_1 > span > a[href="/home"]')
+  end
+
+  it "should accept a custom HTML class" do
+    html = Capybara::string(@navigation.render(@request, :class => "additional_test_class"))
+    html.should have_selector('ul.additional_test_class')
+  end
+
+  it "should accept a custom HTML ID" do
+    html = Capybara::string(@navigation.render(@request, :id => "navigation_test_id"))
+    html.should have_selector('ul#navigation_test_id')
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: menumatic
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Nicholas Bruning
@@ -15,11 +15,56 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-13 00:00:00 +11:00
+date: 2011-03-15 00:00:00 +11:00
 default_executable: 
-dependencies: []
-
-description: Menumatic is a Rails 3 exclusive gem which aims to take all the fuss and clutter out of developing semantic, usable navigation menus.
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 3
+        - 0
+        - 4
+        version: 3.0.4
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 3
+        - 0
+        - 4
+        version: 3.0.4
+  type: :development
+  version_requirements: *id003
+description: Menumatic is a Rails 3 gem which simplifies the development of complex website navigation, producing semantic, usable navigation menus.
 email: 
 - nicholas@bruning.com.au
 executables: []
@@ -49,6 +94,7 @@ files:
 - lib/menumatic.rb
 - lib/menumatic/.DS_Store
 - lib/menumatic/engine.rb
+- lib/menumatic/exceptions.rb
 - lib/menumatic/hash.rb
 - lib/menumatic/helpers/navigation_helper.rb
 - lib/menumatic/navigation.rb
@@ -102,7 +148,7 @@ rubyforge_project: menumatic
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Menumatic is a Rails 3 gem which aims to simplify building complex website navigation
+summary: Menumatic is a Rails 3 gem which simplifies building complex website navigation
 test_files: 
 - spec/factories.rb
 - spec/group_spec.rb