middleman-pagegroups 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2ab967e85b659541d08e29ea91d9667788d2a12
-  data.tar.gz: 199cb402abf8b3f2b96362258fc3b8722b49bd4a
+  metadata.gz: d8ef20a07f682d8227f594c24c1d1598b7c4f477
+  data.tar.gz: 3fbd69ebf368e3e2aa887ec2923b356d9dd8e4f7
 SHA512:
-  metadata.gz: efb3153b5613167ab1c2a8a14184d7bbb987360faf9fa8f2e527e75ee35d6085a8007d08c5ca6e1558fcba90beb221720433db5fc6009c35bb3537c7b5e79b6a
-  data.tar.gz: 0d409fe0292d57adc99226082aeb2b1fe06f02b817417d5b8e215345e428ed8d1eb8dfae9393ed8526e7b7c53ac200f575549e19da4e2d2afd3c201a7dfb4145
+  metadata.gz: b930592b8cb997613561d616b3de433557c4e4fc7299b5bbd51be1bb56e9b68ecf30d777e7cc4fdf21007ea94581952f1b9e49f2e82e78f6869712c278d178eb
+  data.tar.gz: aebd3e4e8202f815ca440b956cd3e096045b8dbd402755cf5da79198081b26c05b96d6bfaa16006998c0bece84c1a6b4d9bef12317cd03f3aefd39e61257144e

data/documentation_project/Gemfile

@@ -9,7 +9,7 @@ gem 'wdm', '~> 0.1.0', platforms: [:mswin, :mingw]
 gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby]
 
 # Middleman Gems
-gem 'middleman-pagegroups', '~> 1.0.4'
+gem 'middleman-pagegroups', '~> 1.0.5'
 gem 'middleman', '~> 4.1.7'
 gem 'middleman-syntax'
 

data/documentation_project/config.rb

@@ -86,7 +86,7 @@ helpers do
   end
 
   def product_version
-    '1.0.4'
+    '1.0.5'
   end
 
 end

data/fixtures/middleman_pagegroups_app/source/30_nested_top/10_nested_sub_01/10_sibling_one.html.md.erb

@@ -0,0 +1,7 @@
+---
+title:    sibling_one
+blurb:    This is the sibling_one page.
+---
+
+#<%= current_page.data.title %>
+<%= current_page.data.blurb %>

data/fixtures/middleman_pagegroups_app/source/30_nested_top/10_nested_sub_01/20_sibling_two.html.md.erb

@@ -0,0 +1,7 @@
+---
+title:    sibling_two
+blurb:    This is the sibling_two page.
+---
+
+#<%= current_page.data.title %>
+<%= current_page.data.blurb %>

data/fixtures/middleman_pagegroups_app/source/30_nested_top/10_nested_sub_01/image.png

@@ -0,0 +1,7 @@
+---
+title:    nested_sub_02 index page
+blurb:    This is the index page for the group nested_sub_02.
+---
+
+#<%= current_page.data.title %>
+<%= current_page.data.blurb %>

data/fixtures/middleman_pagegroups_app/source/30_nested_top/10_nested_sub_01/index.html.md.erb

@@ -0,0 +1,7 @@
+---
+title:    nested_sub_01 index page
+blurb:    This is the index page for the group nested_sub_01.
+---
+
+#<%= current_page.data.title %>
+<%= current_page.data.blurb %>

data/fixtures/middleman_pagegroups_app/source/30_nested_top/20_nested_sub_02/index.html.md.erb

@@ -0,0 +1,7 @@
+---
+title:    nested_sub_02 index page
+blurb:    This is the index page for the group nested_sub_02.
+---
+
+#<%= current_page.data.title %>
+<%= current_page.data.blurb %>

data/fixtures/middleman_pagegroups_app/source/30_nested_top/20_nested_sub_02/sibling_one.html.md.erb

@@ -0,0 +1,8 @@
+---
+title:    sibling_one
+blurb:    This is the sibling_one page.
+order:    10
+---
+
+#<%= current_page.data.title %>
+<%= current_page.data.blurb %>

data/fixtures/middleman_pagegroups_app/source/30_nested_top/20_nested_sub_02/sibling_two.html.md.erb

@@ -0,0 +1,8 @@
+---
+title:    sibling_two
+blurb:    This is the sibling_two page.
+order:    20
+---
+
+#<%= current_page.data.title %>
+<%= current_page.data.blurb %>

data/fixtures/middleman_pagegroups_app/source/30_nested_top/index.html.md.erb

@@ -0,0 +1,7 @@
+---
+title:    nested_top index page
+blurb:    This is the index page for the group nested_top.
+---
+
+#<%= current_page.data.title %>
+<%= current_page.data.blurb %>

data/fixtures/middleman_pagegroups_app/source/30_nested_top/sibling_one.html.md.erb

@@ -0,0 +1,8 @@
+---
+title:    sibling_one
+blurb:    This is the sibling_one page.
+order:    30
+---
+
+#<%= current_page.data.title %>
+<%= current_page.data.blurb %>

data/fixtures/middleman_pagegroups_app/source/30_nested_top/sibling_two.html.md.erb

@@ -0,0 +1,8 @@
+---
+title:    sibling_two
+blurb:    This is the sibling_two page.
+order:    40
+---
+
+#<%= current_page.data.title %>
+<%= current_page.data.blurb %>

data/fixtures/middleman_pagegroups_app/source/image.png

@@ -0,0 +1,7 @@
+---
+title:    nested_sub_02 index page
+blurb:    This is the index page for the group nested_sub_02.
+---
+
+#<%= current_page.data.title %>
+<%= current_page.data.blurb %>

data/lib/middleman-pagegroups/extension.rb

@@ -113,25 +113,45 @@ class MiddlemanPageGroups < ::Middleman::Extension
   ############################################################
 
   #--------------------------------------------------------
-  # We must ensure that for any directory the index_file
-  # is first. This is so that we can check it for a page
-  # order and rename the containing directory in output.
+  # We want to handle shallower paths first, and ensure
+  # that for any directory the index_file is first. This
+  # gives us the ability to rename our directories if the
+  # parent directory is to be renamed.
   # @!visibility private
   #--------------------------------------------------------
   def resource_sort_comparator( x, y )
-    if File.basename(x.path) == app.config[:index_file]
-      -1
+    x_length = Pathname(x.path).each_filename.to_a.count
+    x_basename = File.basename(x.path)
+    x_dirname = File.dirname(x.path)
+    y_length = Pathname(y.path).each_filename.to_a.count
+    y_basename = File.basename(y.path)
+    y_dirname = File.dirname(y.path)
+
+    if x_length != y_length
+      return x_length <=> y_length
     else
-      if File.dirname(x.path) == File.dirname(y.path)
-        return File.basename(x.path) <=> File.basename(y.path)
+      if [x_basename, y_basename].include?(app.config[:index_file])
+        # If either is an index file, favor the index file.
+        # If both are index files, favor the path.
+        if x_basename == y_basename
+          return x_basename <=> y_basename
+        else
+          return x_basename == app.config[:index_file] ? -1 : 1
+        end
       else
-        return File.dirname(x.path) <=> File.dirname(y.path)
+        # If the dir names are the same, favor the basename,
+        # otherwise favor the entire path name.
+        if x_dirname == y_dirname
+          return x_basename <=> y_basename
+        else
+          return x_dirname <=> y_dirname
+        end
       end
     end
   end
 
 
-  #--------------------------------------------------------
+    #--------------------------------------------------------
   # Add our own resource methods to each resource in the
   # site map.
   # @!visibility private
@@ -241,7 +261,7 @@ class MiddlemanPageGroups < ::Middleman::Extension
           return nil
         else
           self.siblings
-            .find_all { |p| p.sort_order != 0 && !p.ignored }
+            .find_all { |p| p.sort_order && p.sort_order != 0 && !p.ignored }
             .push(self)
             .sort_by { |p| p.sort_order }
             .find_index(self) + 1
@@ -369,10 +389,10 @@ class MiddlemanPageGroups < ::Middleman::Extension
       strip = @app.extensions[:MiddlemanPageGroups].options[:strip_file_prefixes]
       page_name = File.basename(resource.path, '.*')
       path_part = File.dirname(resource.destination_path)
+      file_renamed = false
 
       if resource.content_type && resource.content_type.start_with?('text/html', 'application/xhtml')
 
-        file_renamed = false
         # Set the resource's sort order if provided via various means.
         if resource.data.key?('order')
           # Priority for ordering goes to the :order front matter key.
@@ -391,11 +411,24 @@ class MiddlemanPageGroups < ::Middleman::Extension
 
         # Remove the sort order indicator from the file or directory name.
         # This will only change the output path for files that have a sort
-        # order. Other files in a renamed directory that needs to have their
+        # order. Other files in a renamed directory that need to have their
         # paths changed will be changed below.
         if strip && sort_order
+
           path_parts = path_part.split('/')
+
+          # Handle preceding path parts, first, if there's a grandparent (all
+          # top level items have a parent and aren't part of this case). These
+          # will have already been set because we've done shallower paths first.
+          if resource.parent.parent
+            parent_path_parts = File.dirname(resource.parent.destination_path).split('/')
+            path_parts = parent_path_parts + path_parts[parent_path_parts.count..-1]
+          end
+
+          # Handle our immediate directory.
           path_parts.last.sub!(/^(\d*?)_/, '')
+
+          # Join up everything and write the correct path.
           path_part = path_parts.join('/')
           name_part = page_name.sub( "#{sort_order}_", '') + File.extname( resource.path )
           if path_part == '.'

data/lib/middleman-pagegroups/version.rb

@@ -1,5 +1,5 @@
 module Middleman
     module MiddlemanPageGroups
-        VERSION = '1.0.4'
+        VERSION = '1.0.5'
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-pagegroups
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Jim Derry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -201,7 +201,18 @@ files:
 - fixtures/middleman_pagegroups_app/source/20_sub_folder_02/not_legitimate.html.md.erb
 - fixtures/middleman_pagegroups_app/source/20_sub_folder_02/sibling_one.html.md.erb
 - fixtures/middleman_pagegroups_app/source/20_sub_folder_02/sibling_two.html.md.erb
+- fixtures/middleman_pagegroups_app/source/30_nested_top/10_nested_sub_01/10_sibling_one.html.md.erb
+- fixtures/middleman_pagegroups_app/source/30_nested_top/10_nested_sub_01/20_sibling_two.html.md.erb
+- fixtures/middleman_pagegroups_app/source/30_nested_top/10_nested_sub_01/image.png
+- fixtures/middleman_pagegroups_app/source/30_nested_top/10_nested_sub_01/index.html.md.erb
+- fixtures/middleman_pagegroups_app/source/30_nested_top/20_nested_sub_02/index.html.md.erb
+- fixtures/middleman_pagegroups_app/source/30_nested_top/20_nested_sub_02/sibling_one.html.md.erb
+- fixtures/middleman_pagegroups_app/source/30_nested_top/20_nested_sub_02/sibling_two.html.md.erb
+- fixtures/middleman_pagegroups_app/source/30_nested_top/index.html.md.erb
+- fixtures/middleman_pagegroups_app/source/30_nested_top/sibling_one.html.md.erb
+- fixtures/middleman_pagegroups_app/source/30_nested_top/sibling_two.html.md.erb
 - fixtures/middleman_pagegroups_app/source/_partial.md.erb
+- fixtures/middleman_pagegroups_app/source/image.png
 - fixtures/middleman_pagegroups_app/source/index.html.md.erb
 - fixtures/middleman_pagegroups_app/source/layout.erb
 - fixtures/middleman_pagegroups_app/source/sub_folder_01/10_sibling_one.html.md.erb
@@ -242,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Provides logical page groups and easy navigation for Middleman projects.