jekyll-rdf 3.0.1.pre.develop.603 → 3.0.1.pre.develop.609

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69e331abb5f5d77a0ff200969d3a243f6de1e7cc8bce1b7c50c631b901a75e4b
-  data.tar.gz: 90420ef9c6886f68ebb125a92db4cf45b8a61ca7af662e4665cfcd0e211f761a
+  metadata.gz: 60acf8bf7badc13104259acce8ef88567485c967035825d4ba45f610295876b6
+  data.tar.gz: '033170361298f9ea3b9c4933aff6d2c51808ef21b5cc01a352aa6d65f96ac87f'
 SHA512:
-  metadata.gz: 75b24f1cef6ef4ba1001472b20fddf541284bd50a8ff57742032c72f4df0114dbc81306214ea4bf99a1a281f36052dfda07704946219695c4939935c6e2c1a4c
-  data.tar.gz: dbfef75a4cb81f215148369bccd58a5c48f9a1628ac2eb851ed6b75b87d5720889a17788cd3939542d1c0620300da3ec2f1d311617d3819a15695fa7e79e9d90
+  metadata.gz: cf3b190598b4434f54295b1a43c2d2cedf0d5abd568f12db196e556a46140c1fc02e827daa23c2ce2c26a439de368e4594f4dcd347069de88aa3f710c8b8f7be
+  data.tar.gz: e980afbab5b7f38c7681fdca44223378fe2eadda3a2e12057e09b77d92b9a3b79701ab00629e3e76f0ca0e374bc55bd5c4bb7995443c9a4986f7de9f07f62328

data/lib/jekyll/rdf_main_generator.rb

@@ -81,6 +81,8 @@ module Jekyll
       mapper = Jekyll::RdfTemplateMapper.new(@config['instance_template_mappings'], @config['class_template_mappings'], @config['default_template'], sparql)
 
       prepare_pages(site, mapper)
+
+      mapper.print_warnings
       return true
     end
   end

data/lib/jekyll/rdf_template_mapper.rb

@@ -30,20 +30,6 @@ module Jekyll
   #
   class RdfTemplateMapper
 
-    ##
-    # A Hash mapping a resource to a template name
-    attr_accessor :resources_to_templates
-
-    ##
-    # Default template name
-    attr_accessor :default_template
-
-    ##
-    # A Hash mapping a type resource to a template name
-    attr_accessor :classes_to_templates
-
-    attr_accessor :classResources
-
     include Jekyll::JekyllRdf::Helper::RdfClassExtraction
 
     ##
@@ -56,6 +42,7 @@ module Jekyll
       @default_template = default_template
       @classes_to_templates = classes_to_templates
       @classResources = {}
+      @warnings = {}
       create_resource_class(search_for_classes(sparql), sparql)
       assign_class_templates(classes_to_templates)
     end
@@ -65,39 +52,48 @@ module Jekyll
     #
     # Returns the template name of one of the +resource+'s types, if available. Returns the default template name otherwise.
     def map(resource)
-      tmpl = resources_to_templates ? resources_to_templates[resource.term.to_s] : nil
+      tmpl = @resources_to_templates ? @resources_to_templates[resource.term.to_s] : nil
       lock = -1
       hier = -1
-      warn_mult_templ = false
       duplicate_level_templ = []
-      if(tmpl.nil?)
-        resource.direct_classes.each do |classUri|
-          classRes = classResources[classUri]
-          if((classRes.lock <= lock || lock == -1) && !classRes.template.nil?)
-            if(classRes.subClassHierarchyValue > hier)
-              Jekyll.logger.info("classMapped: #{classUri} : #{resource.term.to_s} : #{classResources[classUri].template}") if Jekyll.env.eql? "development"
-              lock = classRes.lock
-              tmpl = classRes.template
-              hier = classRes.subClassHierarchyValue
-              warn_mult_templ = false
-              duplicate_level_templ.clear.push(tmpl)
-              if(classRes.multiple_templates?)
-                warn_mult_templ = true
-                duplicate_level_templ.concat(classRes.alternativeTemplates)
-              end
-            elsif(classRes.subClassHierarchyValue == hier)
-              warn_mult_templ = true
-              duplicate_level_templ.push(classRes.template)
+      resource.direct_classes.each do |classUri|
+        classRes = @classResources[classUri]
+        if((classRes.lock <= lock || lock == -1) && !classRes.template.nil?)
+          if(classRes.subClassHierarchyValue > hier)
+            lock = classRes.lock
+            tmpl = classRes.template
+            hier = classRes.subClassHierarchyValue
+            duplicate_level_templ.clear.push(tmpl)
+            if(classRes.multiple_templates?)
+              duplicate_level_templ.concat(classRes.alternativeTemplates)
             end
-          end unless classRes.nil?
-        end
-        if(warn_mult_templ)
-          Jekyll.logger.warn("Warning: multiple possible templates for #{resource.term.to_s}: #{duplicate_level_templ.uniq.join(', ')}")
-        end
-      end
+          elsif(classRes.subClassHierarchyValue == hier)
+            duplicate_level_templ.push(classRes.template)
+          end
+        end unless classRes.nil?
+      end if(tmpl.nil?)
+      add_warning(duplicate_level_templ.uniq, resource.iri) if (duplicate_level_templ.length > 1) && (Jekyll.env.eql? "development")
       return tmpl unless tmpl.nil?
-      return default_template
+      return @default_template
+    end
+
+    ##
+    # Add a warning for a resource having multiple possible templates
+    # The warnings are then later displayed with print_warnings
+    #
+    def add_warning(keys, iri)
+      keys.sort!
+      key = keys.join(', ')
+      @warnings[key] = [] if @warnings[key].nil?  # using a hash ensures that a warning is printed only once for each combination of templates
+                                                  # and for each resource at most once
+      @warnings[key].push(iri) unless @warnings[key].include? iri
     end
-  end
 
-end
+    def print_warnings
+      @warnings.delete_if{ |key, iris|
+        Jekyll.logger.warn("Warning: multiple possible templates for resources #{iris.join(", ")}\nPossible Templates: #{key}")
+        true
+      }
+    end
+  end # RdfTemplateMapper
+end #Jekyll

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.0.1.pre.develop.603
+  version: 3.0.1.pre.develop.609
 platform: ruby
 authors:
 - Elias Saalmann
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent