jekyll-rdf 3.1.1.pre.develop.702 → 3.1.1.pre.develop.715

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 778b8d0b842c7ec97a201bdde42aab1ca10ef30d9d997ec3f18364a52cdd3e60
-  data.tar.gz: 355c3c76d1edf5c5ab6d79b6ee8d36f6f205b49725392e7b607972ad06e67a98
+  metadata.gz: 3f31e594c1f05d2400c1c8e3bee0db8e84d3fc1d1f9041f50acdcb2991be3ec8
+  data.tar.gz: 99cc0c8baf2ccfa039cf6b7fb152491687a720c428540027fda384ea760ac5da
 SHA512:
-  metadata.gz: 5afc53787251593f1d94d98cd2e2d2c2af716a45fe735447e4323d7c0fa4bc6fa5572091ca6954b81d469bde00ae1f3393fe70885113bd0b0c6f7c9215a248f2
-  data.tar.gz: 619e6ce00fcc8e42a6ef1afa83dd578b6d5d1b5c69920fc83d97100757b133b446a003258f5cf8f96249902fae6d1d7a28476548f91656622c1253c8c5201dff
+  metadata.gz: efbbec3733dc98a1bf4f5917155b03e6f54e74f00ab6f943715c32f3eccfe9a15e1efe9d956beb7e6e8163e4c3f26d1921e07e10c9b20ffe4eda7c8e4a83f543
+  data.tar.gz: b6f9da19b00f142664cf187beab9e3d69de0fa82600607dd9ece509f28a5b62531a0ac706f161eb75603a737a99122174729c5c03834d203bb520297a9c751e1

data/lib/jekyll/helper/rdf_hook_helper.rb

@@ -0,0 +1,92 @@
+##
+# MIT License
+#
+# Copyright (c) 2017 Sebastian Zänker
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+module Jekyll
+  module JekyllRdf
+    module Helper
+      module RdfHookHelper
+        def backload_prefixes page, payload
+          prefix_path = page.data["rdf_prefix_path"]
+          begin
+            if(!prefix_path.nil? && !page.data["rdf_prefix_set?"] && !page.data["layout"].nil?)
+              # rdf_prefix_path is set but not defined through the page
+              base_path = search_prefix_definition page.site.layouts[page.data["layout"]], prefix_path
+            elsif (prefix_path.nil? && !page.data["layout"].nil?)
+              # page might be a post (does not contain values from layout frontmatter)
+              # |->rdf_prefix_path can still be set in a layout
+              locations = check_prefix_definition page.site.layouts[page.data["layout"]]
+              base_path = locations[0]
+              prefix_path = locations[1]
+            elsif(!prefix_path.nil? && page.data["rdf_prefix_set?"])
+              # rdf_prefix_path is set directly in the fronmatter of the page
+              base_path = page.instance_variable_get(:@base_dir)
+              base_path ||= payload.site["source"]
+            end
+          rescue NoMethodError => ne
+            #just in case the error was caused by something different then a missing template
+            if(ne.message.eql? "undefined method `data' for nil:NilClass")
+              return
+            else
+              raise
+            end
+          end
+          if(page.data["rdf_prefixes"].nil? && !(prefix_path.nil? || base_path.nil?))
+            Jekyll::JekyllRdf::Helper::RdfHelper.load_prefixes(
+              File.join(
+                base_path,
+                prefix_path
+              ),
+              page.data
+            )
+          end
+        end
+
+        def search_prefix_definition layout, rdf_prefix_path
+          if(rdf_prefix_path.eql? layout.data["rdf_prefix_path"])
+            return layout.instance_variable_get(:@base_dir)
+          end
+          return search_prefix_definition layout.site.layouts[layout.data["layout"]], rdf_prefix_path unless layout.data["layout"].nil?
+          return nil
+        end
+
+        def check_prefix_definition layout
+          unless(layout.data["rdf_prefix_path"].nil?)
+            return [layout.instance_variable_get(:@base_dir), layout.data["rdf_prefix_path"]]
+          end
+          return check_prefix_definition layout.site.layouts[layout.data["layout"]] unless layout.data["layout"].nil?
+          return [nil, nil]
+        end
+
+        private
+        class EqualObject
+          def eql? object
+            true
+          end
+        end
+
+        @@equal_object = EqualObject.new
+      end
+    end
+  end
+end

data/lib/jekyll/helper/rdf_page_helper.rb

@@ -112,6 +112,7 @@ module Jekyll
 
         ##
         # loads the prefix data passed in the layout yaml-frontmatter into page.data["rdf_prefixes"] and page.data["rdf_prefix_map"]
+        # only covers a specific case that can not be done by hooks (rdf_prefix_path is defined in a template that serves as page object)
         def load_prefixes_yaml
           unless self.data["rdf_prefix_path"].nil?
             load_prefixes(File.join(@site.layouts[@template].instance_variable_get(:@base_dir), self.data["rdf_prefix_path"].strip), self.data)

data/lib/jekyll/hooks/rdf_page_pointer.rb

@@ -22,14 +22,37 @@
 # SOFTWARE.
 #
 
+Jekyll::Hooks.register :documents, :post_init do |page|
+  if(page.data["rdf_prefix_path"].nil?)
+    page.data["rdf_prefix_set?"] = false
+  else
+    page.data["rdf_prefix_set?"] = true
+  end
+end
+
+Jekyll::Hooks.register :pages, :post_init do |page|
+  if(page.data["rdf_prefix_path"].nil?)
+    page.data["rdf_prefix_set?"] = false
+  else
+    page.data["rdf_prefix_set?"] = true
+  end
+end
+
+Jekyll::Hooks.register :posts, :post_init do |page|
+  if(page.data["rdf_prefix_path"].nil?)
+    page.data["rdf_prefix_set?"] = false
+  else
+    page.data["rdf_prefix_set?"] = true
+  end
+end
+
 
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
   unless(page.data['rdf'].nil?)
     payload["content"] = ""
   end
-  if(page.data["rdf_prefixes"].nil? && !page.data["rdf_prefix_path"].nil?)
-    Jekyll::JekyllRdf::Helper::RdfHelper.load_prefixes(File.join(page.instance_variable_get(:@base), page.data["rdf_prefix_path"]), page.data)
-  end
+  include Jekyll::JekyllRdf::Helper::RdfHookHelper
+  backload_prefixes page, payload if page.data["rdf_prefixes"].nil?
   Jekyll::JekyllRdf::Helper::RdfHelper::page = page
 end
 
@@ -38,5 +61,7 @@ Jekyll::Hooks.register :documents, :pre_render do |page, payload|
 end
 
 Jekyll::Hooks.register :posts, :pre_render do |page, payload|
+  include Jekyll::JekyllRdf::Helper::RdfHookHelper
+  backload_prefixes page, payload
   Jekyll::JekyllRdf::Helper::RdfHelper::page = page
-end
+end

data/lib/jekyll-rdf.rb

@@ -53,6 +53,7 @@ require 'jekyll/helper/rdf_class_extraction'
 require 'jekyll/helper/rdf_page_helper'
 require 'jekyll/helper/rdf_generator_helper'
 require 'jekyll/helper/rdf_filter_helper'
+require 'jekyll/helper/rdf_hook_helper'
 require 'jekyll/hooks/rdf_page_pointer'
 require 'jekyll/filters/rdf_sparql_query'
 require 'jekyll/filters/rdf_property'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.1.1.pre.develop.702
+  version: 3.1.1.pre.develop.715
 platform: ruby
 authors:
 - Elias Saalmann
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
@@ -226,6 +226,7 @@ files:
 - lib/jekyll/helper/rdf_filter_helper.rb
 - lib/jekyll/helper/rdf_general_helper.rb
 - lib/jekyll/helper/rdf_generator_helper.rb
+- lib/jekyll/helper/rdf_hook_helper.rb
 - lib/jekyll/helper/rdf_page_helper.rb
 - lib/jekyll/helper/rdf_prefix_helper.rb
 - lib/jekyll/helper/rdf_types.rb