middleman-navtree 0.1.10 → 0.1.11

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjY4ZjAzZDIyMGM1MzNmODJhZGQ2ZGM1NWVlMzNjZGRkODdiYzBhNg==
-  data.tar.gz: !binary |-
-    NWIzNDFlYzBlOTAzOGY3N2FmZWJkODZhYWU2YTE0ZDIxODBhODI5Ng==
+SHA1:
+  metadata.gz: dba692e974c7d73f972a915a964ceccb9b3b2174
+  data.tar.gz: 19e0ebc01af1c4d6ab6d654d9c2f048ebb437250
 SHA512:
-  metadata.gz: !binary |-
-    YTZhOWU5Yzg3ZTAxOTc2MWJhMWEyNDFhZmQ4MjkwYjI2YzgxYWY0NTcxODE5
-    YTk4NjUyN2U5OTJkZTQ0YjlkNmMwNmVhNzZhMTIzNjk5YWFiZjBiNGFhZDJm
-    YmZmZjE3ZDdjOWUxYjY4MmVhYTAyZDYzYmU0YzJiNjM3M2EzMjg=
-  data.tar.gz: !binary |-
-    NjVkNTM0MDQ2YzAyM2Q5YWRlM2RmNjI1MTk2YzBhZjdmYWIzMWU3ZGVjMThi
-    YjhkZGQwNTYwN2UyYzE1Y2ExMjhiODg5ZjdkMDNmMDUxNzkxOTNlNjk5NTk5
-    MTdkMGEyMzE0OTYxMjg4M2U3NGZkODJjMWY1N2ZmNzc5MWJhNDM=
+  metadata.gz: d560d43755c236300896110543f38a962a40e07237ed52ad577ecc7bf2e0768068d3aabcd3104703756c05242de04e6fc99d5738ece35843773b60c937f69bac
+  data.tar.gz: cf94a511845d61d8a2ed2140e05a10a546990c4daa6496c16e75c6a0ffc9de05c8d93b178c331dbc3d6cfca61b6ae89f97c904cf31b722c4d3ef723b48234c24

data/README.md

@@ -77,6 +77,9 @@ You can likewise limit pagination to a specific subtree:
 
     <%= previous_link(data.tree['chapter-2']) %><%= next_link(data.tree['chapter-2']) %>
 
+## Known Issues
+
+Middleman Navtree does not currently support links to files using [Directory Indexes](https://middlemanapp.com/advanced/pretty_urls/). For details and the status of this feature, see [#12 Support Directory Indexes](https://github.com/bryanbraun/middleman-navtree/issues/12).
 
 ## Contributing
 

data/lib/middleman-navtree/extension.rb

@@ -35,16 +35,16 @@ module Middleman
       def after_configuration
         # Add the user's config directories to the "ignore_dir" option because
         # these are all things we won't need printed in a NavTree.
-        options.ignore_dir << app.settings.js_dir
-        options.ignore_dir << app.settings.css_dir
-        options.ignore_dir << app.settings.fonts_dir
-        options.ignore_dir << app.settings.images_dir
-        options.ignore_dir << app.settings.helpers_dir
-        options.ignore_dir << app.settings.layouts_dir
-        options.ignore_dir << app.settings.partials_dir
+        options.ignore_dir << app.config[:js_dir]
+        options.ignore_dir << app.config[:css_dir]
+        options.ignore_dir << app.config[:fonts_dir]
+        options.ignore_dir << app.config[:images_dir]
+        options.ignore_dir << app.config[:helpers_dir]
+        options.ignore_dir << app.config[:layouts_dir]
+        options.ignore_dir << app.config[:partials_dir]
 
         # Build a hash out of our directory information
-        tree_hash = scan_directory(app.settings.source, options)
+        tree_hash = scan_directory(app.config[:source], options)
 
         # Promote any promoted files to the beginning of our hash.
         tree_hash = promote_files(tree_hash, options)
@@ -53,9 +53,9 @@ module Middleman
         # @todo: This step doesn't rebuild during live-reload, which causes errors if you move files
         #        around during development. It may not be that hard to set up. Low priority though.
         if options.automatic_tree_updates
-          FileUtils.mkdir_p(app.settings.data_dir)
+          FileUtils.mkdir_p(app.config[:data_dir])
 
-          data_path = app.settings.data_dir + '/' + options.data_file
+          data_path = app.config[:data_dir] + '/' + options.data_file
           IO.write(data_path, YAML::dump(tree_hash))
         end
       end
@@ -75,7 +75,7 @@ module Middleman
           next if options.ignore_files.include? filename
 
           if options.promote_files.include? filename
-            original_path = path.sub(/^#{app.settings.source}/, '') + '/' + filename
+            original_path = path.sub(/^#{app.config[:source]}/, '') + '/' + filename
             @existing_promotes << original_path
             next
           end
@@ -96,7 +96,7 @@ module Middleman
               next unless options.ext_whitelist.include? File.extname(filename)
             end
 
-            original_path = path.sub(/^#{app.settings.source}/, '') + '/' + filename
+            original_path = path.sub(/^#{app.config[:source]}/, '') + '/' + filename
             data.store(filename.gsub(' ', '%20'), original_path.gsub(' ', '%20'))
           end
         end

data/lib/middleman-navtree/helpers.rb

@@ -11,12 +11,21 @@ module Middleman
           # This is a file.
           # Get the Sitemap resource for this file.
           # note: sitemap.extensionless_path converts the path to its 'post-build' extension.
-          this_resource = sitemap.find_resource_by_path(sitemap.extensionless_path(value))
-          # Define string for active states.
-          active = this_resource == current_page ? 'active' : ''
-          title = discover_title(this_resource)
-          link = link_to(title, this_resource)
-          html << "<li class='child #{active}'>#{link}</li>"
+          
+          # Make sure the extension path ends with .html (in case we're parsing someting like .adoc)
+          extensionlessPath = sitemap.extensionless_path(value)
+          unless extensionlessPath.end_with? ".html"
+           extensionlessPath << ".html"
+          end
+          
+          this_resource = sitemap.find_resource_by_path(extensionlessPath)
+          if this_resource
+            # Define string for active states.
+            active = this_resource == current_page ? 'active' : ''
+            title = discover_title(this_resource)
+            link = link_to(title, this_resource)
+            html << "<li class='child #{active}'>#{link}</li>"
+          end
         else
           # This is the first level source directory. We treat it special because
           # it has no key and needs no list item.

data/middleman-navtree.gemspec

@@ -1,9 +1,11 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 
+require 'date'
+
 Gem::Specification.new do |s|
   s.name        = "middleman-navtree"
-  s.version     = "0.1.10"
+  s.version     = "0.1.11"
   s.licenses    = ['MIT']
   s.date        = Date.today.to_s
 
@@ -21,6 +23,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # The version of middleman-core this extension depends on.
-  s.add_runtime_dependency("middleman-core", ["~> 3.3"])
+  s.add_runtime_dependency("middleman-core", [">= 3.3"])
   s.add_runtime_dependency("titleize", ["~> 1.3"])
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: middleman-navtree
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Bryan Braun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
@@ -75,17 +75,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: For building navigation trees with Middleman