lib/middleman-tansu/helpers.rb in middleman-tansu-0.0.4 vs lib/middleman-tansu/helpers.rb in middleman-tansu-0.1.0

@@ -1,28 +1,31 @@
 module Middleman
   module Tansu
+    # Tansu Helpers
     module Helpers
       def path_list(current_path)
-        paths = []
-        splited = current_path.split("/")
+        paths   = []
+        splited = current_path.split('/')
+
         splited.each_with_index do |val, index|
-          path = File.join("/", splited[0..index])
-          path = path + "/" unless /\.html$/ =~ path
-          val  = val.sub(".html", "") if /\.html$/ =~ val
-          paths.push({path: path, name: val}) unless /^index$/ =~ val
+          path  = File.join('/', splited[0..index])
+          path += '/' unless /\.html$/ =~ path
+          val   = val.sub('.html', '') if /\.html$/ =~ val
+          paths.push(path: path, name: val) unless /^index$/ =~ val
         end
         paths
       end
 
-      def breadcrumbs(klass = 'breadcrumbs', root = "Top")
-        li = []
-        root = page_title("/") || root
-        li.push("<li class=\"root\">#{link_to(root, "/")}</li>")
+      def breadcrumbs(klass = 'breadcrumbs', root = 'Top')
+        li   = []
+        root = page_title('/') || root
+        li.push("<li class=\"root\">#{link_to(root, '/')}</li>")
 
         paths = path_list(current_resource.path)
         paths.each do |path|
           name = page_title(path[:path]) || path[:name]
+
           if path == paths.last
             li.push("<li class=\"current\">#{h(name)}</li>")
           else
             li.push("<li>#{link_to(name, path[:path])}</li>")
           end
@@ -36,105 +39,102 @@
         end
         sitemap.find_resource_by_path(path).data.title
       end
 
       def page_title_or_path(path)
-        page_title(path) || path.gsub(/(index)?\.html$/, "")
+        page_title(path) || path.gsub(/(index)?\.html$/, '')
       end
 
       def title(splitter = ' - ')
-        base_title = base_title()
         page_title = page_title_or_path(current_resource.path)
-
         if !page_title.empty?
           "#{page_title}#{splitter}#{base_title}"
         else
           base_title
         end
       end
 
       def heading
-        base_title = base_title()
         page_title = page_title_or_path(current_resource.path)
-
         if !page_title.empty?
           page_title
         else
           base_title
         end
       end
 
       def base_title
-        config[:site_title] || "Middleman-Tansu"
+        config[:site_title] || 'Middleman-Tansu'
       end
 
       def index?
         regex = Regexp.new("#{config.tansu[:default_document]}$")
-        regex =~ current_resource.path || "/" == current_resource.path
+        regex =~ current_resource.path || '/' == current_resource.path
       end
 
       def children_pages(key = :date, order_by = :asc)
         dirs  = []
         pages = []
 
         current_resource.children.each do |page|
-          if !exclude?(page.path)
+          unless exclude?(page.path)
             if /index\.html$/ =~ page.path
               dirs.push(page)
             else
               pages.push(page)
             end
           end
+          next
         end
 
         # Sorting pages and dirs
         if order_by == :desc
-          pages = pages.sort {|a, b|
+          pages = pages.sort do |a, b|
             b.data[key] <=> a.data[key]
-          }
-          dirs = dirs.sort {|a, b|
+          end
+          dirs = dirs.sort do |a, b|
             b.path <=> a.path
-          }
+          end
         else
-          pages = pages.sort {|a, b|
+          pages = pages.sort do |a, b|
             a.data[key] <=> b.data[key]
-          }
-          dirs = dirs.sort {|a, b|
+          end
+          dirs = dirs.sort do |a, b|
             a.path <=> b.path
-          }
+          end
         end
 
         dirs | pages
       end
 
       def exclude?(path)
-        regex = Regexp.new("^(#{exclude(path).join("|")})")
+        regex = Regexp.new("^(#{exclude.join('|')})")
         regex =~ path
       end
 
-      def exclude(path)
+      def exclude
         default = [
           config.images_dir,
           config.js_dir,
           config.css_dir,
           config.layouts_dir,
           config.tansu[:templates_dir]
         ]
-        dirs = default | config.tansu[:exclude_path]
+        default | config.tansu[:exclude_path]
       end
 
       def page_name(page)
         if page.data.title
-          paths = page.path.split("/")
+          paths = page.path.split('/')
           paths.pop
-          File.join(paths, page.data.title).gsub(/^\//, "")
+          File.join(paths, page.data.title).gsub(/^\//, '')
         else
-          page.path.gsub(/(\/index)?\.html$/, "")
+          page.path.gsub(/(\/index)?\.html$/, '')
         end
       end
 
       def page_url(page)
-        File.join("/", page.path.gsub(/index\.html$/, ""))
+        File.join('/', page.path.gsub(/index\.html$/, ''))
       end
     end
   end
 end