middleman-pagegroups 1.0.5 → 1.0.10

data/features/helpers_and_resources.feature

@@ -72,7 +72,7 @@ Feature: Provide helpers and resource items to make multiple targets easy to man
     And the file "index.html" should contain 'current_resource.brethren_next:nil'
     And the file "index.html" should contain 'current_resource.brethren_previous:nil'
     And the file "index.html" should contain 'current_resource.group_count:1'
-    And the file "index.html" should contain 'current_resource.legitimate_children:[#<Middleman::Sitemap::Resource path=sub_folder_01/index.html>, #<Middleman::Sitemap::Resource path=20_sub_folder_02/index.html>]'
+    And the file "index.html" should contain 'current_resource.legitimate_children:[#<Middleman::Sitemap::Resource path=sub_folder_01/index.html>, #<Middleman::Sitemap::Resource path=20_sub_folder_02/index.html>, #<Middleman::Sitemap::Resource path=30_nested_top/index.html>]'
     And the file "index.html" should contain 'current_resource.navigator_eligible:nil'
     And the file "index.html" should contain 'current_resource.page_group:source'
     And the file "index.html" should contain 'current_resource.page_name:index'

data/features/support/env.rb

@@ -4,17 +4,3 @@ ENV['TEST'] = 'true'
 require 'middleman'
 require 'middleman-core/step_definitions'
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-pagegroups')
-
-
-require 'cucumber/formatter/pretty'
-class QuietFormatter < Cucumber::Formatter::Pretty
-  def initialize(runtime, io, options)
-     $stderr = File.new( '/dev/null', 'w' )
-    super(runtime, io, options)
-  end
-  
-  def after_features(features)
-    $stderr = STDOUT
-    super(features)
-  end
-end

data/lib/middleman-pagegroups/extension.rb

@@ -29,7 +29,7 @@ class MiddlemanPageGroups < ::Middleman::Extension
   option :nav_toc_index_class,           nil,              'Default css class for the nav_toc_index helper/partial.'
 
   # @!group Extension Configuration
-
+  
   # @!attribute [rw] options[:strip_file_prefixes]=
   # If `true` leading numbers used for sorting files will be removed for
   # presentation purposes. This makes it possible to neatly organize your
@@ -151,7 +151,7 @@ class MiddlemanPageGroups < ::Middleman::Extension
   end
 
 
-    #--------------------------------------------------------
+  #--------------------------------------------------------
   # Add our own resource methods to each resource in the
   # site map.
   # @!visibility private
@@ -261,7 +261,7 @@ class MiddlemanPageGroups < ::Middleman::Extension
           return nil
         else
           self.siblings
-            .find_all { |p| p.sort_order && p.sort_order != 0 && !p.ignored }
+            .find_all { |p| p.legitimate? }
             .push(self)
             .sort_by { |p| p.sort_order }
             .find_index(self) + 1
@@ -284,7 +284,7 @@ class MiddlemanPageGroups < ::Middleman::Extension
       #--------------------------------------------------------
       def resource.brethren
         self.siblings
-          .find_all { |p| p.sort_order && p.sort_order != 0 && !p.ignored && p != self }
+          .find_all { |p| p.legitimate? && p != self }
           .sort_by { |p| p.sort_order }
       end
 
@@ -329,7 +329,7 @@ class MiddlemanPageGroups < ::Middleman::Extension
       #    use of `:navigator => false` in its front matter.
       #  * This page has a `sort_order`.
       #
-      # @return (Boolean) Returns `true` if this pages is
+      # @return (Boolean) Returns `true` if this page is
       #   eligible for a previous/next page control.
       #--------------------------------------------------------
       def resource.navigator_eligible?
@@ -340,6 +340,21 @@ class MiddlemanPageGroups < ::Middleman::Extension
       end
 
 
+      #--------------------------------------------------------
+      # Indicates whether or not a page is "legitimate" in
+      # terms of automatic navigation, based in:
+      #
+      #  * The resource has a sort order and isn't zero.
+      #  * The resource isn't ignored.
+      #
+      # @return (Boolean) Returns `true` if this pages 
+      #   participates in automatic navigation features.
+      #--------------------------------------------------------
+      def resource.legitimate?
+        self.sort_order && self.sort_order != 0 && !self.ignored
+      end
+  
+
       #--------------------------------------------------------
       # Returns an array of all of the children of this
       # resource, taking into account their eligibility for
@@ -356,7 +371,7 @@ class MiddlemanPageGroups < ::Middleman::Extension
       #--------------------------------------------------------
       def resource.legitimate_children
         self.children
-          .find_all { |p| p.sort_order && p.sort_order != 0 && !p.ignored }
+          .find_all { |p| p.legitimate? }
           .sort_by { |p| p.sort_order }
       end
 
@@ -420,7 +435,7 @@ class MiddlemanPageGroups < ::Middleman::Extension
           # 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
+          if resource.parent && 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

data/lib/middleman-pagegroups/version.rb

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

data/middleman-pagegroups.gemspec

@@ -2,23 +2,40 @@
 $:.push File.expand_path('../lib', __FILE__)
 require 'middleman-pagegroups/version'
 
-mm_needed = ['~> 4.1', '>= 4.1.7']
+# We should work with any 4.3.x version of Middleman, but due to #2319,
+# automatic image alt attributes have been removed from Middleman, so
+# I'm adjusting the minimum requirement to the first release incorporating
+# that change.
+
+mm_needed = ['~> 4.3.0', '>= 4.3.7']
+
+# We should work with any 2.0 version of Ruby, but I'm no longer testing them
+# for regressions. Version 2.6.0 goes back to December 2018, and is a suitable
+# minimum version.
+#
+# Currently no released version of Middleman works with Ruby 3, so until that is
+# resolved, We will only support 2.6 up to and not including Ruby 3.0.
+
+rb_needed = ['~> 2.0', '>= 2.6']
+
 
 Gem::Specification.new do |s|
-  s.name        = 'middleman-pagegroups'
-  s.version     = Middleman::MiddlemanPageGroups::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Jim Derry']
-  s.email       = ['balthisar@gmail.com']
-  s.homepage    = 'https://github.com/middlemac/middleman-pagegroups'
-  s.summary     = 'Provides logical page groups and easy navigation for Middleman projects.'
-  s.description = 'Provides logical page groups and easy navigation for Middleman projects.'
-  s.license     = 'MIT'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ['lib']
+
+  s.required_ruby_version = rb_needed
+  s.name                  = 'middleman-pagegroups'
+  s.version               = Middleman::MiddlemanPageGroups::VERSION
+  s.platform              = Gem::Platform::RUBY
+  s.authors               = ['Jim Derry']
+  s.email                 = ['balthisar@gmail.com']
+  s.homepage              = 'https://github.com/middlemac/middleman-pagegroups'
+  s.summary               = 'Provides logical page groups and easy navigation for Middleman projects.'
+  s.description           = 'Provides logical page groups and easy navigation for Middleman projects.'
+  s.license               = 'MIT'
+
+  s.files                 = `git ls-files`.split("\n")
+  s.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables           = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths         = ['lib']
   
   # The version of middleman-core your extension depends on
   s.add_runtime_dependency('middleman-core', mm_needed)
@@ -32,4 +49,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake',      '>= 10.3'
   s.add_development_dependency 'git'
   s.add_development_dependency 'capybara', ['~> 2.5.0']
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-pagegroups
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.10
 platform: ruby
 authors:
 - Jim Derry
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -16,60 +16,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.3.7
 - !ruby/object:Gem::Dependency
   name: middleman-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.3.7
 - !ruby/object:Gem::Dependency
   name: middleman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.3.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -134,12 +134,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
 - README.md
+- README_doc.html
 - Rakefile
 - bin/middleman-pagegroups
 - documentation_project/.gitignore
@@ -237,27 +239,28 @@ homepage: https://github.com/middlemac/middleman-pagegroups
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
+  - - "~>"
+    - !ruby/object:Gem::Version
+      version: '2.0'
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Provides logical page groups and easy navigation for Middleman projects.
 test_files:
 - features/helpers_and_resources.feature
 - features/support/env.rb
-has_rdoc: