middleman-navtree 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTNlZGZmMWRhZTRhNTJjMDQxNzhlNDRkMjI5Y2Q2OTE3NTQwZWM1MQ==
+    NDQyNWI2MjdhYTkxYzFhODMxYzNlOGEyZGY2N2E3MjM3MjNkNTBjMg==
   data.tar.gz: !binary |-
-    MTQxY2VmODA1NTA0MmZhNjY5NGYwNjQ3ZjU4YzE5MWJmZmFiMjEyZg==
+    NjhlNTU4NDgzYTE0MzU4YThmOTRmNzAxNjk4ZmVlMzU5ZjVkMjk5NQ==
 SHA512:
   metadata.gz: !binary |-
-    NjFmYzk3NjBhMGE1NWUwNjdiMWZkNDZhYzQ4OTMxOGZhODdmYjJhOTdjZGU1
-    ZmUwODFlNDFlZjFhZWUxNWJkMzYxODM1MGFjNTBlY2I0NGE0Zjg3ODhhM2E1
-    ODQwNGVmMWU0MmIyOTYzMWVmMDJlMmJkNWY3MDZjMjdlNzg4MDM=
+    ZDc2NTJjNmIyYjVhMTU0NWFiZmVlODUwNmE3YzU0MjNmNDlkYWQ5ZGRmY2Uw
+    ZjM2YThjNjM2ZmVhNDAxNjNlZWY3Zjk2MWUyZDk0OGJlMGE2NzIwM2Q3OWVj
+    ZjZjMTdlNzYwMTVmMWJhZTU2YzAzODYwZTNhYzE3MGY4NGFhMWE=
   data.tar.gz: !binary |-
-    N2JjZTQwNzI3NjMxZTBiOTJlOGRhYTA0Njc3YzhmYjUwYTRmMTRlZGU1ZGZh
-    NWEwN2FiMWJmNTRlZjJlOTA3YjgxN2Q3ZTkxNTNhZWNhOWYxZmIyZTFkNjYx
-    MWI3Yzc4YTBiMzA1MjEzYTM2OGQwZDA5MTkxNmJjMWU5NmFkNmE=
+    NDI1M2JhNzk0YmI4YjcwMDk3MDE1YzFiOTU2Yjg4YWEzYWE5ZDAwYTZlM2I0
+    M2VjYjM3ZWRjMTRiMTEwMGJiNGMyZDE2MjVkODkwYjY1YjY0NWE5ZDYxZDc2
+    YmFjOTgwYjIxNTgzOThjNTllNjBiYWRhMjgyNzY2NjQ0ZjE2Y2Y=

data/lib/middleman-navtree/extension.rb

@@ -56,10 +56,8 @@ module Middleman
       end
 
 
-      # Method for storing the directory structure in a hash.
-      # @todo: the order of the data is defined by the order in the hash, and technically, ruby hashes
-      #        are unordered. This may be more robust if I defined an ordered hash type similar to
-      #        this one in Rails: http://apidock.com/rails/ActiveSupport/OrderedHash
+      # Method for storing the directory structure in an ordered hash. See more on
+      # ordered hashes at https://www.igvita.com/2009/02/04/ruby-19-internals-ordered-hash/
       def scan_directory(path, options, name=nil)
         data = {}
         Dir.foreach(path) do |filename|
@@ -98,7 +96,8 @@ module Middleman
           end
         end
 
-        return data
+        # Return this level's data as a hash sorted by keys.
+        return Hash[data.sort]
       end
 
       # Method for appending promoted files to the front of our source tree.

data/lib/middleman-navtree/helpers.rb

@@ -86,10 +86,7 @@ module Middleman
       end
 
       # Method to flatten the source tree, for use in pagination methods.
-      # Note, I could do this with a lot less code using Glob. I should refactor
-      # in the future. See http://stackoverflow.com/a/2370823/1154642.
       def flatten_source_tree(value, k = [], level = 0, flat_tree = [])
-
         if value.is_a?(String)
           # This is a child item (a file).
           flat_tree.push(sitemap.extensionless_path(value))
@@ -116,8 +113,13 @@ module Middleman
       end
 
       # Format Directory name for display in navtree.
+      # Example Name: 1%20-%20sink-or_swim
       def format_directory_name(dir_name)
-        dir_name.gsub(/-/, ' ').gsub(/_/, ' ').gsub('%20', ' ').titleize
+        dir_name.gsub!('%20', ' ') #=> 1 - sink-or_swim
+        dir_name.gsub!(/(?!\s)-(?!\s)/, ' ') #=> 1 - sink or_swim
+        dir_name.gsub!(/_/, ' ') #=> 1 - sink or swim
+        # @todo: Find a way for titleize to not blow away ' - ' formatting.
+        dir_name.titleize! #=> 1 Sink or Swim
       end
 
       # Utility helper for getting the page title for display in the navtree.
@@ -129,12 +131,12 @@ module Middleman
       def discover_title(page = current_page)
         if page.data.title
           return page.data.title # Frontmatter title
-        elsif page.url == '/'
-          return extensions[:navtree].options[:home_title]
         elsif match = page.render({:layout => false}).match(/<h.+>(.*?)<\/h1>/)
           return match[1] # H1 title
+        elsif page.url == '/'
+          return extensions[:navtree].options[:home_title]
         else
-          filename = page.url.split(/\//).last.titleize.gsub('%20', ' ')
+          filename = page.url.split(/\//).last.gsub('%20', ' ').titleize
           return filename.chomp(File.extname(filename))
         end
       end

data/lib/middleman-navtree/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module NavTree
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/middleman-navtree.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "middleman-navtree"
-  s.version     = "0.1.5"
+  s.version     = "0.1.6"
   s.licenses    = ['MIT']
   s.date        = Date.today.to_s
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-navtree
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Bryan Braun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core