menumatic 0.1.4 → 0.1.5

data/Gemfile

@@ -6,5 +6,5 @@ gemspec
 gem 'rspec'
 gem 'autotest'
 gem 'autotest-growl'
-gem 'factory_girl'
+gem 'capybara', :git => 'https://github.com/jnicklas/capybara.git'
 gem 'rails', '3.0.5'

data/Gemfile.lock

@@ -1,7 +1,21 @@
+GIT
+  remote: https://github.com/jnicklas/capybara.git
+  revision: 47dbcdfdf0ae5896586f0131250a64b2553115a0
+  specs:
+    capybara (0.4.1.1)
+      celerity (>= 0.7.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.27)
+      xpath (~> 0.1.3)
+
 PATH
   remote: .
   specs:
-    menumatic (0.0.1)
+    menumatic (0.1.4)
 
 GEM
   remote: http://rubygems.org/
@@ -39,17 +53,24 @@ GEM
       ZenTest (>= 4.4.1)
     autotest-growl (0.2.9)
     builder (2.1.2)
+    celerity (0.8.8)
+    childprocess (0.1.7)
+      ffi (~> 0.6.3)
+    culerity (0.2.15)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    factory_girl (1.3.2)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
     i18n (0.5.0)
+    json_pure (1.5.1)
     mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    nokogiri (1.4.4)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -78,10 +99,18 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.1.3)
+      childprocess (~> 0.1.5)
+      ffi (~> 0.6.3)
+      json_pure
+      rubyzip
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.24)
+    xpath (0.1.3)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
@@ -89,7 +118,7 @@ PLATFORMS
 DEPENDENCIES
   autotest
   autotest-growl
-  factory_girl
+  capybara!
   menumatic!
-  rails (~> 3.0.4)
+  rails (= 3.0.5)
   rspec

data/README.md

@@ -55,7 +55,7 @@ Inside your navigation file, you can then define the structure of your
 navigation, here is an example taken from the [Menumatic example
 application](http://github.com/thetron/menumatic-sample-application):
 
-    navigate_to "Home", home_path, :active_on => [:home_path, :root_path]
+    navigate_to "Home", home_path, :active_on => [home_path, root_path]
     navigate_to "About", about_path
     navigate_to "Store", store_on_special_path do |store|
       store.navigate_to "On special", store_on_special_path
@@ -135,11 +135,8 @@ some feedback!
 
 This is what I have planned for some future releases:
 
-* __Tests__ I know I should've been doing this properly from the start,
-  but i'm still trying to get my head around TDD. However, this is definitely a
-  big priority for Menumatic.
-
-* __More configuration options__
+* Better test coverage
+* More configuration options
 
 
 # Credits

data/lib/menumatic/helpers/navigation_helper.rb

@@ -16,7 +16,7 @@ module Menumatic
       end
 
       def sitemap(document, navigation_id = "application", options = {})
-        navigation = load_navigation(navigation_id)
+        navigation = Menumatic::Navigation::Base.load_navigation(navigation_id)
         navigation.root.render_sitemap(document, request, options)
       end
     end

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

@@ -39,9 +39,8 @@ module Menumatic
           # render link
           link = ""
           link = link_to(self.label, self.destination, self.html_options).html_safe if self.is_link? && !options[:group]
-
           if on_valid_level?(options[:levels], options[:current_level])
-            if options[:current_level] == 1 || (self.is_group? && options[:group] == self.group_id)
+            if (options[:current_level] == 1 && self.is_group?) || (self.is_group? && options[:group] == self.group_id)
               list.html_safe
             elsif options[:show] == :all || self.is_active?(request)
               content_tag(options[:item_tag], link.to_s + list.to_s, html_options.merge_with_join(self.wrapper_options)).to_s.html_safe
@@ -95,26 +94,26 @@ module Menumatic
         end
 
         def depth_count(request, options = {})
-          return options[:levels].count unless options[:levels].empty?
+          return options[:levels].count if options[:levels] && !options[:levels].empty?
           count_active_descendants(request)
         end
 
         def paths_match?(request)
           if self.is_link?
             self.active_paths.each do |path|
-              return true if path.is_a?(Regexp) && (request.fullpath =~ path || request.url =~ path)
-              return true if path.is_a?(String) && (request.fullpath == path || request.url == path)
+              return true if path.is_a?(Regexp) && (request.fullpath.split('?').first =~ path || request.url.split('?').first =~ path)
+              return true if path.is_a?(String) && (request.fullpath.split('?').first == path || request.url.split('?').first == path)
             end
-            return request.fullpath == self.destination || request.url == self.destination if self.active_paths.empty?
+            return request.fullpath.split('?').first == self.destination || request.url.split('?').first == self.destination if self.active_paths.empty?
           end
         end
 
         def on_valid_level?(levels, current_level)
-          levels_to_i(levels).include?(current_level-1) || levels.empty?
+          levels.nil? || levels.empty? || levels_to_i(levels).include?(current_level-1)
         end
 
         def levels_to_i(levels_in_words)
-          levels_in_words.map{ |word| word.is_a?(Symbol) ? @@level_options.index(word.to_sym) + 1 : word }
+          levels_in_words.map{ |word| word.is_a?(Symbol) ? @@level_options.index(word.to_sym) + 1 : word } if levels_in_words
         end
       end
     end

data/lib/menumatic/navigation.rb

@@ -6,6 +6,8 @@ module Menumatic
       attr_accessor :id, :root
 
       class << self
+        include Rails.application.routes.url_helpers if Rails && Rails.application
+
         def navigate_to(label, destination, options = {})
           if block_given?
             item = self.get_instance.root.navigate_to(label, destination, options, &Proc.new)

data/lib/menumatic/version.rb

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

data/lib/menumatic.rb

@@ -18,6 +18,7 @@ module Menumatic
   #autoload :SitemapController, '../app/controllers/menumatic
 end
 
+require 'rails'
 require 'menumatic/rails/routes'
 require 'menumatic/rails/rendering'
 require 'menumatic/engine'

data/spec/factories.rb

@@ -1,6 +0,0 @@
-Factory.define :request do |f|
-  f.full_path '/'
-  f.host 'lvh.me'
-  f.port '3000'
-  f.url 'http://lvh.me:3000/'
-end

data/spec/group_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Menumatic::Navigation::Item::Group do
+  before :each do
+    @group = Menumatic::Navigation::Item::Group.new(:test_group, {})
+    @group.navigate_to("Home", "/home")
+    @group.navigate_to("About", "/about")
+    @group.navigate_to("Contact us", "/contact_us")
+  end
+
+  it "should have a group ID" do
+    @group.respond_to?(:group_id).should == true
+  end
+
+  it "should render a list containing its child items" do
+    html = Capybara.string @group.render(@request)
+    html.should have_selector('ul.level_1')
+    html.should have_selector('ul.level_1 > li > a[href="/home"]')
+    html.should have_selector('ul.level_1 > li > a[href="/about"]')
+    html.should have_selector('ul.level_1 > li > a[href="/contact_us"]')
+  end
+end

data/spec/link_spec.rb

@@ -1,17 +1,12 @@
 require 'spec_helper'
-require 'active_resource/http_mock'
 
 describe Menumatic::Navigation::Item::Link do
 
   before :each do
     @label = "Search"
-    @destination = "/search"
+    @destination = @request.fullpath
     @options = {}
     @link = Menumatic::Navigation::Item::Link.new(@label, @destination, @options)
-
-    ActiveResource::HttpMock.respond_to do |mock|
-      mock.get '/search', {}, ''
-    end
   end
 
   it "should have a label" do
@@ -33,20 +28,29 @@ describe Menumatic::Navigation::Item::Link do
   end
 
   it "should be active when destination is the same as the request path" do
-    request = ActiveResource::Request.new(:get, @link.destination)
-    @link.is_active?(request).should == true
+    @link.is_active?(@request).should == true
+  end
+
+  it "should be active when destination is the same as the request path and the request path includes a get param" do
+    @request.stub!(:fullpath).and_return("/search?text=a%20search&page=1")
+    @link.is_active?(@request).should == true
   end
 
   it "should not be active when destination is not the same as the request path" do
-    @link.is_active?(request).should == false
+    @link.destination = "/home"
+    @link.is_active?(@request).should == false
   end
 
-  it "should be able to parent links"
-  it "should be able to parent groups"
+  it "should be able to parent links" do
+    @link.navigate_to("Contact us", "/contact_us")
+    @link.items.first.is_link?.should == true
+    @link.items.first.label.should == "Contact us"
+    @link.items.first.destination.should == "/contact_us"
+  end
 
-  it "should render a list item containing only a link when it has no children"
-  it "should render a list item containing only a link when it has no active descendants"
-  it "should render a list item containing an active link when active"
-  it "should render a list item containing a list of its children when active"
-  it "should render a list item containing an active link and a list of its children when it has an active descendant"
+  it "should be able to parent groups" do
+    @link.group(:sidebar)
+    @link.items.first.is_group?.should == true
+    @link.items.first.group_id.should == :sidebar
+  end
 end

data/spec/navigation_helper_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Menumatic::Navigation::Item::Group 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 "
+end

data/spec/navigation_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Menumatic::Navigation::Item::Base do
+  before :each do
+    @item = Menumatic::Navigation::Item::Base.new()
+  end
+
+  it "should have items" do 
+    @item.respond_to?(:items).should == true
+    @item.items.is_a?(Array).should == true
+  end
+
+  it "should have html options" do
+    @item.respond_to?(:html_options).should == true
+    @item.html_options.is_a?(Hash).should == true
+  end
+
+  it "should have wrapper options" do
+    @item.respond_to?(:wrapper_options).should == true
+    @item.wrapper_options.is_a?(Hash).should == true
+  end
+
+  it "should test if it is a link" do
+    @item.respond_to?(:is_link?).should == true
+  end
+
+  it "should test if it is a group" do
+    @item.respond_to?(:is_group?).should == true
+  end
+end

data/spec/renderer_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe Menumatic::Navigation::Item::Renderers do
+  before :each do
+    @label = "Search"
+    @destination = @request.fullpath
+    @options = {}
+    @link = Menumatic::Navigation::Item::Link.new(@label, @destination, @options)
+  end
+
+  it "should render a list item containing only a link when it has no children" do
+    html = Capybara.string @link.render(@request)
+    html.should have_selector('li a')
+    html.should_not have_selector('li ul')
+  end
+
+  it "should render a list item containing only a link when it has no active descendants" do
+    @link.navigate_to("Child link", "/page/something_unrelated")
+    @link.destination = "/page"
+    html = Capybara.string @link.render(@request)
+    html.should have_selector('li a')
+    html.should_not have_selector('li ul')
+  end
+
+  it "should render a list item containing an active link when active" do
+    html = Capybara.string @link.render(@request)
+    html.should have_selector('li.active a')
+  end
+
+  it "should render a list item containing a list of its children when active" do
+    @link.navigate_to("Child link 1", "/page/child_1")
+    @link.navigate_to("Child link 2", "/page/child_2")
+    html = Capybara.string @link.render(@request)
+    html.should have_selector('li ul li a[href="/page/child_1"]')
+    html.should have_selector('li ul li a[href="/page/child_2"]')
+  end
+
+  it "should render a list item containing an active link and a list of its children when it has an active descendant" do
+    @link.destination = "/home"
+
+    @link.navigate_to "Child link 1", "/page/child_1" do |child|
+      child.navigate_to "Search", @request.fullpath
+    end
+    @link.navigate_to "Child link 2", "/page/child_2"
+
+    html = Capybara.string @link.render(@request)
+    html.should have_selector('li > ul.active')
+    html.should have_selector("li > ul.active > li.active > ul.active > li.active > a[href='#{@request.fullpath}']")
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,14 @@
 require 'rubygems'
 require 'bundler/setup'
 
+require 'capybara'
 require 'action_controller'
 require 'menumatic'
 
 RSpec.configure do |config|
-
+  config.before :each do
+    @request = mock(:request)
+    @request.stub!(:fullpath).and_return("/search")
+    @request.stub!(:url).and_return("http://test.menumatic.com/search")
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: menumatic
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Nicholas Bruning
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 +11:00
+date: 2011-03-13 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -63,7 +63,11 @@ files:
 - lib/menumatic/version.rb
 - menumatic.gemspec
 - spec/factories.rb
+- spec/group_spec.rb
 - spec/link_spec.rb
+- spec/navigation_helper_spec.rb
+- spec/navigation_spec.rb
+- spec/renderer_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/thetron/menumatic
@@ -101,5 +105,9 @@ specification_version: 3
 summary: Menumatic is a Rails 3 gem which aims to simplify building complex website navigation
 test_files: 
 - spec/factories.rb
+- spec/group_spec.rb
 - spec/link_spec.rb
+- spec/navigation_helper_spec.rb
+- spec/navigation_spec.rb
+- spec/renderer_spec.rb
 - spec/spec_helper.rb