jekyll-tasks 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb2bd9522e96a7b8fafa4905183266847f438dba39e3377f8ed424f101c29dff
-  data.tar.gz: 26756a715081ca1b56c6ad360f88719830a6d1fe40e714341526152159db852b
+  metadata.gz: 6de70aa2433ec78c596c2d1c0dfec0816f1f271ea62a6fc3506bfe6297d30db7
+  data.tar.gz: dcb2d5a1d25e49887861b0a47f1f2d4b102356c68548065943f6b5b2dd8fbe98
 SHA512:
-  metadata.gz: 95c5de860f3ae0a6fe2aec83eef0283208579ec4344999329fc95765479ef60617ea3390b1d2620df82706aba582e5640f18c6131717293557d16ac1f4fb822c
-  data.tar.gz: 0af10c8ca07e5d81697b14f58e6f16512fbe59e7a4b1b88b4a919bb84b2c26e47c7cef05ed2b4b29b0e90252d05875ea6c01681375476088a22008a39a34b046
+  metadata.gz: 4479af3e618eae169ee36fdc6da20e86a29da11de438d0dc1d3a3d1fa539c33ad6607ef6830be46c5ba0f08b59e336dd69b5cf6252ffee7db4c6d91016938266
+  data.tar.gz: cf42960599dc7f86a320a857452c8d0af222b450f075abadb64a761943ae64b9e1d84408fba8d2e0f3194a46337b60f316208fa7de6d9bda4a2252144c4eec2e

data/.rubocop.yml

@@ -0,0 +1,4 @@
+AllCops:
+  TargetRubyVersion: 2.7
+  NewCops: enable
+  SuggestExtensions: false

data/Gemfile

@@ -4,8 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'codecov', '~> 0.5', require: false
-  gem 'minitest', '~> 5.14'
+  gem 'codecov', '~> 0.6', require: false
+  gem 'minitest', '~> 5.15'
   gem 'rake', '~> 13.0'
-  gem 'rubocop', '~> 1.12'
+  gem 'rubocop', '~> 1.27'
 end

data/Gemfile.lock

@@ -1,50 +1,52 @@
 PATH
   remote: .
   specs:
-    jekyll-tasks (0.2.0)
+    jekyll-tasks (0.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    codecov (0.5.2)
+    codecov (0.6.0)
       simplecov (>= 0.15, < 0.22)
-    docile (1.3.5)
-    minitest (5.14.4)
-    parallel (1.20.1)
-    parser (3.0.1.0)
+    docile (1.4.0)
+    minitest (5.15.0)
+    parallel (1.22.1)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.3.0)
     rexml (3.2.5)
-    rubocop (1.12.1)
+    rubocop (1.27.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    simplecov (0.18.5)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    unicode-display_width (2.0.0)
+    simplecov_json_formatter (0.1.3)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  codecov (~> 0.5)
+  codecov (~> 0.6)
   jekyll-tasks!
-  minitest (~> 5.14)
+  minitest (~> 5.15)
   rake (~> 13.0)
-  rubocop (~> 1.12)
+  rubocop (~> 1.27)
 
 BUNDLED WITH
    2.1.4

data/_collection1/collection1.md

@@ -0,0 +1,5 @@
+---
+layout: grid
+menu-name: menu-1
+permalink: /collection1/ 
+---

data/_collection1/subfolder-without-father/menu-without-father.md

@@ -0,0 +1,5 @@
+---
+layout: grid
+title: Menu without father
+menu-name: submenu-1
+---

data/_collection1/subfolder-without-name/menu-without-name.md

@@ -0,0 +1,5 @@
+---
+title: Menu without name
+layout: grid
+menu-father: menu-1
+---

data/_collection1/subfolder1/product-lost.md

@@ -0,0 +1,3 @@
+---
+menu-father: submenu-lost
+---

data/_collection1/subfolder1/product-without-father.md

@@ -0,0 +1,3 @@
+---
+title: model1
+---

data/_collection1/subfolder1/subfolder1.md

@@ -0,0 +1,4 @@
+---
+menu-name: submenu-1
+menu-father: menu-1
+---

data/_collection2/collection2.md

@@ -0,0 +1,5 @@
+---
+layout: grid
+menu-name: menu-2
+permalink: /collection2/ 
+---

data/_collection2/subfolder/subfolder2.md

@@ -0,0 +1,4 @@
+---
+menu-name: submenu-2
+menu-father: menu-2
+---

data/jekyll-tasks.gemspec

@@ -11,11 +11,12 @@ Gem::Specification.new do |spec|
   spec.summary       = 'A set of rake tasks to help you on your Jekyll sites.'
   spec.homepage      = 'https://github.com/grupopv/jekyll-tasks/'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/grupopv/jekyll-tasks/'
   spec.metadata['changelog_uri'] = 'https://github.com/grupopv/jekyll-tasks/blob/master/CHANGELOG.md'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -24,7 +25,7 @@ Gem::Specification.new do |spec|
   all_files          = `git ls-files -z`.split("\x0")
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     all_files.reject do |f|
-      excluded_files = %r{^(bin|dependabot|test|spec|features|.gitignore|.travis.yml)/}
+      excluded_files = %r{^(_data|.github|bin|test|spec|features)/}
       f.match(excluded_files)
     end
   end

data/lib/jekyll/tasks/collections.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Tasks
+    # Obtain collections information
+    module Collections
+      extend self
+
+      def get
+        collections = []
+        folders_starting_with_underscore.each do |collection|
+          collections << collection[3..]
+        end
+        collections
+      end
+
+      private
+
+      def folders_starting_with_underscore
+        Dir.glob('./_*').to_a.sort
+      end
+    end
+  end
+end

data/lib/jekyll/tasks/menus.rb

@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Tasks
+    # Obtain menus information
+    module Menus
+      extend self
+
+      def search_conflicts
+        conflicts = []
+        conflicts << (search_conflicts_with_properties | search_conflicts_without_properties)
+        conflicts.flatten!
+      end
+
+      def search_conflicts_with_properties
+        conflicts = []
+
+        per_collection(%w[name father]).each do |el|
+          properties = el['properties']
+
+          index = search_hash(properties, 'name')
+          name = index.nil? ? '' : properties[index]['name']
+
+          index = search_hash(properties, 'father')
+          father = index.nil? ? '' : properties[index]['father']
+
+          conflicts << analyze_conflicts(el['collection'], name, father) if name != father
+        end
+
+        conflicts
+      end
+
+      def search_conflicts_without_properties
+        conflicts = []
+
+        Collections.get.each do |collection|
+          data = search_without_properties(collection) unless collection == 'pages'
+          conflicts << data unless data.nil?
+        end
+
+        conflicts
+      end
+
+      def per_collection(properties = ['name'])
+        result = []
+        Collections.get.each do |collection|
+          data = search_properties(collection, properties)
+          hash = { 'collection' => collection, 'properties' => data }
+          result << hash unless data.empty?
+        end
+        result
+      end
+
+      def search_without_properties(collection)
+        conflicts = []
+
+        files = markdown_files collection
+        files.each do |file|
+          data = YAML.load_file(file)
+          conflicts << analyze_conflicts_without_properties(data)
+        end
+
+        conflicts
+      end
+
+      def search_properties(collection, properties, result = [])
+        files = markdown_files collection
+        files.each do |file|
+          data = YAML.load_file(file)
+          properties.each do |property|
+            search_property result, data, property
+          end
+        end
+        order_properties(result, properties)
+      end
+
+      private
+
+      def analyze_conflicts_without_properties(data, conflicts = [])
+        conflicts << "Product without father: '#{data['title']}'" if Products.product_without_father data
+        conflicts << "Menu without name: '#{data['title']}'" if menu_without_name data
+        conflicts << "Menu without father: '#{data['title']}'" if menu_without_father data
+        conflicts
+      end
+
+      def menu_without_name(data)
+        data['layout'] == 'grid' && data['menu-name'].nil?
+      end
+
+      def menu_without_father(data)
+        data['layout'] == 'grid' && data['menu-father'].nil? && data['permalink'].nil?
+      end
+
+      def analyze_conflicts(collection, name, father, conflicts = [])
+        array = name - father
+        conflicts << "There are some unused menus at #{collection} collection: #{array}" unless array.empty?
+
+        array = father - name
+        unless array.empty?
+          conflicts << "There are some products pointed to non-existent menus at #{collection} collection: #{array}"
+        end
+
+        conflicts
+      end
+
+      def search_property(result, data, property)
+        value = data["menu-#{property}"]
+        index = search_hash(result, property)
+
+        (result[index][property] << value unless value.nil?) if index
+        (result << { property => value.nil? ? [] : [value] }) unless index
+      end
+
+      def order_properties(result, properties)
+        properties.each do |property|
+          index = search_hash(result, property)
+          result[index][property] = result[index][property].sort.uniq unless index.nil?
+        end
+        result
+      end
+
+      def search_hash(list, property)
+        list.each_with_index do |hash, index|
+          return index if hash[property]
+        end
+        nil
+      end
+
+      def markdown_files(colecction)
+        Dir.glob("./_#{colecction}/**/*.md").to_a.sort
+      end
+    end
+  end
+end

data/lib/jekyll/tasks/products.rb

@@ -6,9 +6,9 @@ module Jekyll
     module Products
       extend self
 
-      def products_filename_list
+      def filename_list
         products = []
-        products_path_list.each do |product|
+        path_list.each do |product|
           product = product
                     .gsub('./_data/api/hana/products/', '')
                     .gsub('.yml', '')
@@ -17,18 +17,22 @@ module Jekyll
         products
       end
 
-      def products_model_list
+      def model_list
         products = []
-        products_path_list.each do |product|
+        path_list.each do |product|
           data = YAML.load_file(product)
           products << data['title']
         end
         products
       end
 
+      def product_without_father(data)
+        data['layout'].nil? && data['menu-father'].nil?
+      end
+
       private
 
-      def products_path_list
+      def path_list
         Dir.glob('./_data/api/hana/products/*.yml').to_a.sort
       end
     end

data/lib/jekyll/tasks/related.rb

@@ -8,14 +8,25 @@ module Jekyll
 
       MINIMUM_RELATED_PRODUCTS = 5
 
-      def all_products_with_related
+      def all_products_with_related(api = api_data)
         errors = []
-        api = related_api_data
-        Products.products_model_list.each do |product|
+        Products.model_list.each do |product|
           if api[product]
             count = api[product].count
             errors << "Only has #{count} related products: #{product}" if count < MINIMUM_RELATED_PRODUCTS
-          else errors << "Doesn't have related products: #{product}"
+          else
+            errors << "Doesn't have related products: #{product}"
+          end
+        end
+        errors.empty? ? 'OK' : errors
+      end
+
+      def all_related_exist
+        errors = []
+        products = Products.filename_list
+        api_data.each do |key, related|
+          related.each do |product|
+            errors << "Related '#{product}' (declared @ '#{key}') doesn't exist" unless products.include? product
           end
         end
         errors.empty? ? 'OK' : errors
@@ -23,7 +34,7 @@ module Jekyll
 
       private
 
-      def related_api_data
+      def api_data
         YAML.load_file('./_data/api/yaml/related/products.yml')
       end
     end

data/lib/jekyll/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Tasks
-    VERSION = '0.2.0'
+    VERSION = '0.4.0'
   end
 end

data/lib/jekyll/tasks.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
+require 'yaml'
+require 'jekyll/tasks/collections'
 require 'jekyll/tasks/dates'
+require 'jekyll/tasks/menus'
 require 'jekyll/tasks/products'
 require 'jekyll/tasks/related'
 require 'jekyll/tasks/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-tasks
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Edgar Tinajero
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-21 00:00:00.000000000 Z
+date: 2022-04-11 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -17,8 +17,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/dependabot.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODEOWNERS
 - CODE_OF_CONDUCT.md
@@ -27,13 +27,19 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- _data/api/hana/products/product-1.yml
-- _data/api/hana/products/product-2.yml
-- _data/api/hana/products/product-3.yml
-- _data/api/yaml/related/products.yml
+- _collection1/collection1.md
+- _collection1/subfolder-without-father/menu-without-father.md
+- _collection1/subfolder-without-name/menu-without-name.md
+- _collection1/subfolder1/product-lost.md
+- _collection1/subfolder1/product-without-father.md
+- _collection1/subfolder1/subfolder1.md
+- _collection2/collection2.md
+- _collection2/subfolder/subfolder2.md
 - jekyll-tasks.gemspec
 - lib/jekyll/tasks.rb
+- lib/jekyll/tasks/collections.rb
 - lib/jekyll/tasks/dates.rb
+- lib/jekyll/tasks/menus.rb
 - lib/jekyll/tasks/products.rb
 - lib/jekyll/tasks/related.rb
 - lib/jekyll/tasks/version.rb
@@ -44,6 +50,7 @@ metadata:
   homepage_uri: https://github.com/grupopv/jekyll-tasks/
   source_code_uri: https://github.com/grupopv/jekyll-tasks/
   changelog_uri: https://github.com/grupopv/jekyll-tasks/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -52,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.github/dependabot.yml

@@ -1,15 +0,0 @@
-version: 2
-
-updates:
-  - package-ecosystem: bundler
-    directory: "/"
-    schedule:
-      interval: weekly
-      day: thursday
-      time: "09:00"
-      timezone: "America/Chihuahua"
-    open-pull-requests-limit: 10
-    reviewers: ["mlopez-grupopv"]
-    labels:
-      - dependencies
-      - ruby

data/_data/api/hana/products/product-1.yml

@@ -1 +0,0 @@
-title: PRODUCT/1

data/_data/api/hana/products/product-2.yml

@@ -1 +0,0 @@
-title: PRODUCT/2

data/_data/api/hana/products/product-3.yml

@@ -1 +0,0 @@
-title: PRODUCT/3

data/_data/api/yaml/related/products.yml

@@ -1,2 +0,0 @@
-PRODUCT/1: ["product-2", "product-3", "product-4", "product-5", "product-6"]
-PRODUCT/2: ["product-1", "product-3", "product-4", "product-5"]