nanoc-toolbox 0.1.2 → 0.1.3

data/Gemfile

@@ -4,4 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'simplecov', :require => false, :group => :test
-gem 'guard-rspec', :require => false, :group => :development
+gem 'guard-rspec', :require => false, :group => :development
+gem 'coveralls', :require => false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc-toolbox (0.1.2)
+    nanoc-toolbox (0.1.3)
       jsmin (~> 1.0)
       nanoc (~> 3.6)
       nokogiri (~> 1.6)
@@ -11,6 +11,13 @@ GEM
   specs:
     coderay (1.0.9)
     colored (1.2)
+    colorize (0.5.8)
+    coveralls (0.6.7)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
     cri (2.3.0)
       colored (>= 1.2)
     diff-lcs (1.2.4)
@@ -32,6 +39,7 @@ GEM
       rb-kqueue (>= 0.2)
     lumberjack (1.0.3)
     method_source (0.8.1)
+    mime-types (1.23)
     mini_portile (0.5.0)
     multi_json (1.7.7)
     nanoc (3.6.4)
@@ -42,12 +50,14 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (0.9.6)
+    rake (10.1.0)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.0)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -68,8 +78,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.3)
+  coveralls
   guard-rspec
   nanoc-toolbox!
-  rake (~> 0.9)
+  rake (~> 10.1)
   rspec (~> 2.13)
   simplecov

data/README.md

@@ -1,8 +1,10 @@
 # nanoc-toolbox
 
-[![Build Status](https://secure.travis-ci.org/aadlani/nanoc-toolbox.png)](http://travis-ci.org/aadlani/nanoc-toolbox)
+[![Build Status](https://travis-ci.org/aadlani/nanoc-toolbox.png)](http://travis-ci.org/aadlani/nanoc-toolbox)
 [![Dependency Status](https://gemnasium.com/aadlani/nanoc-toolbox.png)](https://gemnasium.com/aadlani/nanoc-toolbox)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/aadlani/nanoc-toolbox)
+[![Coverage Status](https://coveralls.io/repos/aadlani/nanoc-toolbox/badge.png)](https://coveralls.io/r/aadlani/nanoc-toolbox)
+
 
 ## Presentation
 

data/lib/nanoc/toolbox/helpers/navigation.rb

@@ -114,6 +114,7 @@ module Nanoc::Toolbox::Helpers
     # @option options [String] :item_tag ('li') tag englobing item
     # @option options [String] :title_tag ('h2') tag englobing the title
     # @option options [String] :title ('') Title of the menu, if nil will not display title
+    # @option options [String] :separator ('') Menu item separator
     #
     # @return [String] The output ready to be displayed by the caller
     def render_menu(items, options={})
@@ -123,6 +124,8 @@ module Nanoc::Toolbox::Helpers
       options[:item_tag]         ||= 'li'
       options[:title_tag]        ||= 'h2'
       options[:title]            ||= nil
+      options[:separator]        ||= ''
+
 
       # Parse the title and remove it from the options
       title =  options[:title] ? content_tag(options[:title_tag], options[:title]) : ''
@@ -139,7 +142,7 @@ module Nanoc::Toolbox::Helpers
           options[:depth] += 1 # Increase the depth level after the call of navigation_for
         end
         output ||= ""
-        content_tag(options[:item_tag], link_to_unless_current(item[:title], item[:link]) + output)
+        content_tag(options[:item_tag], link_to_unless_current(item[:title], item[:link]) + options[:separator] + output)
 
       end.join()
 
@@ -190,11 +193,14 @@ module Nanoc::Toolbox::Helpers
     end
 
     def find_breadcrumbs_trail(root)
-      sections = breadcrumbs_trail.(root).map do |child|
+      trail = ["/"]
+      root.split('/').each { |s| trail << trail.last + "#{s}/" unless s.empty? }
+      trail.map do |child_identifier|
+        child = @items[child_identifier]
         { :title        => (child[:short_title] || child[:title] || child.identifier),
           :link         => relative_path_to(child),
-          :subsections  => nil }
-      end
+          :subsections  => nil } if child
+      end.compact
     end
   end
 end

data/lib/nanoc/toolbox/version.rb

@@ -4,7 +4,7 @@ module Nanoc
     module Version
       MAJOR = 0
       MINOR = 1
-      PATCH = 2
+      PATCH = 3
       BUILD = nil
 
       STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/nanoc-toolbox.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   
   s.add_development_dependency "bundler", "~> 1.3"
   s.add_development_dependency "rspec",   "~> 2.13"
-  s.add_development_dependency "rake",    "~> 0.9"
+  s.add_development_dependency "rake",    "~> 10.1"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/spec/helpers/navigation_spec.rb

@@ -95,40 +95,34 @@ describe Nanoc::Toolbox::Helpers::Navigation do
           </body>
         </html>
       EOS
+
+      @item_rep = Nanoc::ItemRep.new(Nanoc::Item.new("", {:title => ""},  "/yetAnotherItem/"), "")
+      @item_rep.instance_variable_set :@content, {:pre => @content}
     end
 
     it "should return a toc for a page" do
-      item_rep = Nanoc::ItemRep.new(Nanoc::Item.new("", {:title => ""},  "/yetAnotherItem/"), "")
-      item_rep.instance_variable_set :@content, {:pre => @content}
-
-      subject.toc_for(item_rep).should include "#title1"
-      subject.toc_for(item_rep).should include "#title21"
-      subject.toc_for(item_rep).should include "#title22"
-      subject.toc_for(item_rep).should include "#title23"
+      subject.toc_for(@item_rep).should include "#title1"
+      subject.toc_for(@item_rep).should include "#title21"
+      subject.toc_for(@item_rep).should include "#title22"
+      subject.toc_for(@item_rep).should include "#title23"
 
-      subject.toc_for(item_rep).should include "Title 1"
-      subject.toc_for(item_rep).should include "Title 2"
+      subject.toc_for(@item_rep).should include "Title 1"
+      subject.toc_for(@item_rep).should include "Title 2"
     end
 
     it "calls find_to_sections and render_menu for the formating" do
-      item_rep = Nanoc::ItemRep.new(Nanoc::Item.new("", {:title => ""},  "/yetAnotherItem/"), "")
-      item_rep.instance_variable_set :@content, {:pre => @content}
-
       subject.should_receive(:find_toc_sections).once
       subject.should_receive(:render_menu).once
-      subject.toc_for(item_rep)
+      subject.toc_for(@item_rep)
     end
 
     it "returns an empty string when the main content is empty" do
-      item_rep = Nanoc::ItemRep.new(Nanoc::Item.new("", {:title => ""},  "/yetAnotherItem/"), "")
-      item_rep.instance_variable_set :@content, {:pre => ""}
-      subject.toc_for(item_rep).should eq ""
+      @item_rep.instance_variable_set :@content, {:pre => ""}
+      subject.toc_for(@item_rep).should eq ""
     end
 
     it "returns an empty string when the provided css path returns nothing" do
-      item_rep = Nanoc::ItemRep.new(Nanoc::Item.new("", {:title => ""},  "/yetAnotherItem/"), "")
-      item_rep.instance_variable_set :@content, {:pre => @content}
-      subject.toc_for(item_rep, {:path => "section"}).should eq ""
+      subject.toc_for(@item_rep, {:path => "section"}).should eq ""
     end
   end
 
@@ -137,6 +131,28 @@ describe Nanoc::Toolbox::Helpers::Navigation do
   end
 
   describe ".breadcrumb_for" do
-    it "should return a breadcrumb for an item"
+    before(:all) do
+      @items = {
+        "/" => Nanoc::Item.new("", {:title => "Home"},  "/"),
+        "/yetAnotherItem/" => Nanoc::Item.new("", {:title => "Sub1"},  "/yetAnotherItem/"),
+        "/yetAnotherItem/last/edit/" => Nanoc::Item.new("", {:title => "Sub2"},  "/yetAnotherItem/last/edit/")
+      }
+      subject.instance_variable_set :@items, @items
+    end
+
+    it "should return a breadcrumb for an item" do
+      subject.should_receive(:relative_path_to).exactly(2).times { "./" }
+      breadcrumb = subject.breadcrumb_for('/yetAnotherItem/')
+      breadcrumb.should include "Home"
+      breadcrumb.should_not include "Sub2"
+    end
+
+    it "should return a breadcrumb even if an empty element" do
+      subject.should_receive(:relative_path_to).exactly(3).times { "./" }
+      breadcrumb =  subject.breadcrumb_for('/yetAnotherItem/last/edit')
+      breadcrumb.should include "Home"
+      breadcrumb.should include "Sub1"
+      breadcrumb.should include "Sub2"
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require 'simplecov'
-SimpleCov.start
+require 'coveralls'
+Coveralls.wear!
 
 require "rspec/core"
 require 'rspec/mocks'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-toolbox
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nanoc
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '10.1'
 description: The nanoc-toolbox is a collection of filters and helpers for the static
   site generator tool nanoc
 email: