jekyll-tasks 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30f43274444ff755c93a38ff085384a0c924c4106eb281fb52de490f9c378e1f
-  data.tar.gz: b29c4d4abfe88a7e53b8dba06637a60b6806bb1d9b5db25388fa2e681deca9b4
+  metadata.gz: 0daec4cd29ddca6e7c68b64b0ade2f1ff018e52f2e374f5d5c6660fe7b36acb9
+  data.tar.gz: ccad93b3f4c10d3473701d88e335e6832c758b1cbd022f7a6156926b03a0e235
 SHA512:
-  metadata.gz: fcd79960a18e88fb90babb45a9ac5ab9556548602726a4953729bad456aa176ed441a88e634d721219f1475f31367836496ecf72463edf17f2828ab7eaf62fd5
-  data.tar.gz: 0e263a7d776f02b2c4667d75dc3f16b3c218a385ea7cbdd1e3a0d81f107420907ef71ef9137a56b451d716c20eb8b74bb4e0fa810c40d30d87b2a3ad95f80c89
+  metadata.gz: d7716006decd4fdd3ba6e871928fc88a9f3e488fcefb158e6209dd4bc22d469c46ff0328c448997ce92bd7e5794ecf38039045388ad0e7e9cfbacb0b318fa34f
+  data.tar.gz: 505a6f93bea6ae83acdd534790f495be7a27f88d2d9775ed84048400c74919bc26f6c9376a9e7eb92b964d2c1a903d494d2b107afd0a774c63029d3476303a2c

data/Gemfile

@@ -7,5 +7,5 @@ group :test do
   gem 'codecov', '~> 0.5', require: false
   gem 'minitest', '~> 5.14'
   gem 'rake', '~> 13.0'
-  gem 'rubocop', '~> 1.12'
+  gem 'rubocop', '~> 1.18'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-tasks (0.3.0)
+    jekyll-tasks (0.3.1)
 
 GEM
   remote: https://rubygems.org/
@@ -12,23 +12,23 @@ GEM
     docile (1.3.5)
     minitest (5.14.4)
     parallel (1.20.1)
-    parser (3.0.1.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (13.0.6)
     regexp_parser (2.1.1)
     rexml (3.2.5)
-    rubocop (1.12.1)
+    rubocop (1.18.3)
       parallel (~> 1.10)
       parser (>= 3.0.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.7.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.8.0)
+      parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     simplecov (0.18.5)
       docile (~> 1.1)
@@ -44,7 +44,7 @@ DEPENDENCIES
   jekyll-tasks!
   minitest (~> 5.14)
   rake (~> 13.0)
-  rubocop (~> 1.12)
+  rubocop (~> 1.18)
 
 BUNDLED WITH
    2.1.4

data/_collection1/collection1.md

@@ -1,3 +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-without-father.md

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

data/_collection2/collection2.md

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

data/lib/jekyll/tasks/menus.rb

@@ -6,14 +6,15 @@ module Jekyll
     module Menus
       extend self
 
-      def print_conflicts
-        conflicts = search_conflicts
-        puts conflicts
-        conflicts.empty?
+      def search_conflicts
+        conflicts = []
+        conflicts << (search_conflicts_with_properties | search_conflicts_without_properties)
+        conflicts.flatten!
       end
 
-      def search_conflicts
+      def search_conflicts_with_properties
         conflicts = []
+
         per_collection(%w[name father]).each do |el|
           properties = el['properties']
 
@@ -23,8 +24,20 @@ module Jekyll
           index = search_hash(properties, 'father')
           father = index.nil? ? '' : properties[index]['father']
 
-          analyze_conflicts el['collection'], conflicts, name, father if name != 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
 
@@ -38,8 +51,19 @@ module Jekyll
         result
       end
 
-      def search_properties(collection, properties)
-        result = []
+      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)
@@ -52,7 +76,22 @@ module Jekyll
 
       private
 
-      def analyze_conflicts(collection, conflicts, name, father)
+      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?
 
@@ -67,12 +106,9 @@ module Jekyll
       def search_property(result, data, property)
         value = data["menu-#{property}"]
         index = search_hash(result, property)
-        if index
-          result[index][property] << value unless value.nil?
-        else
-          hash = { property => value.nil? ? [] : [value] }
-          result << hash
-        end
+
+        (result[index][property] << value unless value.nil?) if index
+        (result << { property => value.nil? ? [] : [value] }) unless index
       end
 
       def order_properties(result, properties)

data/lib/jekyll/tasks/products.rb

@@ -26,6 +26,10 @@ module Jekyll
         products
       end
 
+      def product_without_father(data)
+        data['layout'].nil? && data['menu-father'].nil?
+      end
+
       private
 
       def path_list

data/lib/jekyll/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Tasks
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-tasks
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Edgar Tinajero
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -28,8 +28,11 @@ files:
 - README.md
 - Rakefile
 - _collection1/collection1.md
-- _collection1/subfolder/product-lost.md
-- _collection1/subfolder/subfolder1.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