jekyll-rdf 3.0.0.pre.develop.344 → 3.0.0.pre.develop.346

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a5089e3880e712203acf2b3deb70a59ce6dad048b965acdd54f6be284bf1442
-  data.tar.gz: be20ab2f11afdea8c8c488af094dc4ce14f45f05233726a86099b4175f5c84d7
+  metadata.gz: d9eedfe231b6b7df139d9d8fa8772516d50ff132d3c52f9b9e250d855ee1ee60
+  data.tar.gz: f985dead37964fd9db4c1d6bdf3393379316e97ec32f486c3625a7fcbc77814e
 SHA512:
-  metadata.gz: 7b35b1fc8c403310accc71e77854fb126cc68e45ffbdf068360f615a863fc61fa16d3358c29084796e130fde58fb6fc44588af26211c68f5f9b92f97bb2c5dd7
-  data.tar.gz: 25014443680f96aad9f3d7f6294272f0e020930261eaa7885658e50b5b7a44b8e978967b9d60e775ab11525bde1f49e795c2faf79bd8f24f4e6953f399d2db4e
+  metadata.gz: 8e4009cc2e5de5aa1494f6839672fafe70dbaee4eaee1c6448d14de0f5a7d135bd6933571b1cdc272ad3aada666e93b491f04553cebfd2bc67738476b5a1ad35
+  data.tar.gz: 503e1be34d489eb51ad06e3237559e2c73998c91d3082d3f8f25bd1a768f3a8ad33f1d7fe564e8c4ccc1f7d5ea9a81f5f26f02034d9843523338fbeb3b7e8255

data/lib/jekyll/filters/rdf_collection.rb

@@ -29,6 +29,7 @@ module Jekyll
     module Filter
       def rdf_collection(input, predicate = nil)
         input = rdf_page_to_resource(input)
+        return unless valid_resource?(input)
         query = "SELECT ?f WHERE{ #{input.term.to_ntriples} " <<
           (predicate.nil? ? "" : " <#{rdf_resolve_prefix(predicate)}> ?coll . ?coll ") <<
           " <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest>* ?r. ?r <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?f}"

data/lib/jekyll/filters/rdf_container.rb

@@ -28,6 +28,7 @@ module Jekyll
     module Filter
       def rdf_container(input, type = nil)
         input = rdf_page_to_resource(input)
+        return unless valid_resource?(input)
         sparql_client = Jekyll::JekyllRdf::Helper::RdfHelper::sparql
         n_triples = input.term.to_ntriples
         if(!(valid_container?(n_triples, type)))

data/lib/jekyll/filters/rdf_get.rb

@@ -34,6 +34,7 @@ module Jekyll
       def rdf_get(request_uri)
         request_uri = "<#{Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].term.to_s}>" if (rdf_page_to_resource?(request_uri))
         request_uri = rdf_resolve_prefix(request_uri)
+        return unless valid_resource?(request_uri)
         ask_exist = "ASK WHERE {{<#{request_uri}> ?p ?o}UNION{?s <#{request_uri}> ?o}UNION{?s ?p <#{request_uri}>}} "
         return unless (Jekyll::JekyllRdf::Helper::RdfHelper::sparql.query(ask_exist).true?)
         Jekyll::JekyllRdf::Drops::RdfResource.new(RDF::URI(request_uri), Jekyll::JekyllRdf::Helper::RdfHelper::site, Jekyll::JekyllRdf::Helper::RdfHelper::page)

data/lib/jekyll/filters/rdf_page_to_resource.rb

@@ -8,7 +8,11 @@ module Jekyll
       end
 
       def rdf_page_to_resource?(input)
-        return (input.nil? ||  input.class <= (Jekyll::RdfPageData) || (input.class <= Hash && input.respond_to?(:template) && input.respond_to?(:url) && input.respond_to?(:path) ))
+        return (!Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].nil?)&&(input.nil? ||  input.class <= (Jekyll::RdfPageData) || (input.class <= Hash && input.respond_to?(:template) && input.respond_to?(:url) && input.respond_to?(:path) ))
+      end
+
+      def valid_resource?(input)
+        return (input.class <= String || input.class <= Jekyll::JekyllRdf::Drops::RdfResource)
       end
     end
   end

data/lib/jekyll/filters/rdf_property.rb

@@ -48,7 +48,7 @@ module Jekyll
       private
       def map_predicate(input, predicate, lang = nil, list = false, inverse = false)
         input = rdf_page_to_resource(input)
-        return input unless input.is_a?(Jekyll::JekyllRdf::Drops::RdfResource)
+        return unless valid_resource?(input)
         predicate = rdf_resolve_prefix(predicate)
         result = filter_statements(input.term.to_ntriples, predicate, inverse, lang)
         return unless !result.empty?

data/lib/jekyll/filters/rdf_resolve_prefix.rb

@@ -33,16 +33,16 @@ module Jekyll
         end
         arr=predicate.split(":",2)  #bad regex, would also devide 'http://example....' into 'http' and '//example....',even though it is already a complete URI; if 'PREFIX http: <http://...> is defined, 'http' in 'http://example....' could be mistaken for a prefix
         if((arr[1].include? (":")) || (arr[1][0..1].eql?("//")))
-          raise UnMarkedUri.new(predicate, Jekyll::JekyllRdf::Helper::RdfHelper::page.data['template'])
+          raise UnMarkedUri.new(predicate, Jekyll::JekyllRdf::Helper::RdfHelper::page.data['template']) #TODO .data['template'] is only defined on RdfPages
         end
-        if(!Jekyll::JekyllRdf::Helper::RdfHelper::page.data["rdf_prefixes"].nil?)
-          if(!Jekyll::JekyllRdf::Helper::RdfHelper::page.data["rdf_prefix_map"][arr[0]].nil?)
-            return arr[1].prepend(Jekyll::JekyllRdf::Helper::RdfHelper::page.data["rdf_prefix_map"][arr[0]])
+        if(!Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefixes"].nil?)
+          if(!Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefix_map"][arr[0]].nil?)
+            return arr[1].prepend(Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefix_map"][arr[0]])
           else
-            raise NoPrefixMapped.new(predicate, Jekyll::JekyllRdf::Helper::RdfHelper::page.data['template'], arr[0])
+            raise NoPrefixMapped.new(predicate, Jekyll::JekyllRdf::Helper::RdfHelper::page.data['template'], arr[0]) #TODO .data['template'] is only defined on RdfPages
           end
         else
-          raise NoPrefixesDefined.new(predicate, Jekyll::JekyllRdf::Helper::RdfHelper::page.data['template'])
+          raise NoPrefixesDefined.new(predicate, Jekyll::JekyllRdf::Helper::RdfHelper::page.data['template']) #TODO .data['template'] is only defined on RdfPages
         end
       end
     end

data/lib/jekyll/filters/rdf_sparql_query.rb

@@ -42,6 +42,7 @@ module Jekyll
           query.gsub!('?resourceUri', "<#{Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].term}>")
         elsif(resource.class <= Array)
           resource.each_with_index do |uri, index|
+            return unless valid_resource?(uri)
             if(uri.class <= Jekyll::JekyllRdf::Drops::RdfResource)
               query.gsub!("?resourceUri_#{index}", uri.term.to_ntriples)
             else
@@ -49,8 +50,9 @@ module Jekyll
             end
           end
         else
+          return unless valid_resource?(resource)
           query.gsub!('?resourceUri', "<#{resource}>")
-        end
+        end if query.include? '?resourceUri'  #the only purpose of the if statement is to substitute ?resourceUri
         if(!Jekyll::JekyllRdf::Helper::RdfHelper::page.data["rdf_prefixes"].nil?)
           query = query.prepend(" ").prepend(Jekyll::JekyllRdf::Helper::RdfHelper::page.data["rdf_prefixes"])
         end

data/lib/jekyll/helper/rdf_general_helper.rb

@@ -25,10 +25,13 @@
 module Jekyll
   module JekyllRdf
     module Helper
+
       ##
       # Internal module to hold support for functionalities like submitting sparql queries
       #
       module RdfHelper
+        @@prefixes = {}
+
         def self.sparql= sparql
           @@sparql = sparql
         end
@@ -47,13 +50,45 @@ module Jekyll
 
         def self.page= page
           @@page = page
+          if(@@page.class <= Jekyll::RdfPageData && !@@page.data["rdf_prefixes"].nil?)
+            @@usePage = true
+          else
+            @@usePage = false
+          end
         end
 
         def self.page
           @@page
         end
+
+        def self.prefixes= path
+          @@prefixes = {}
+          self.load_prefixes(path, @@prefixes)
+        end
+
+        def self.load_prefixes(path, prefHolder)
+          begin
+            prefix_file = File.new(path).readlines
+            prefHolder["rdf_prefixes"] = prefix_file.join(" ")
+            prefHolder["rdf_prefix_map"] = Hash[ *(prefix_file.collect { |v|
+                  arr = v.split(":",2)
+                  [arr[0][7..-1].strip, arr[1].strip[1..-2]]
+                }.flatten)]
+          rescue Errno::ENOENT => ex
+            Jekyll.logger.error("Prefix file not found: #{path}")
+            raise
+          end
+        end
+
+        def self.prefixes
+          if(@@usePage)
+            return @@page.data
+          else
+            return @@prefixes
+          end
+        end
       end
+
     end
-    
   end
 end

data/lib/jekyll/helper/rdf_page_helper.rb

@@ -3,6 +3,7 @@ module Jekyll
     module Helper
       module RdfPageHelper
         private
+        include Jekyll::JekyllRdf::Helper::RdfPrefixHelper
         ##
         # sets @template to the path of a fitting layout
         # it will set @complete to false if no fitting template is found
@@ -37,18 +38,9 @@ module Jekyll
 
         ##
         # loads the prefix data passed in the layout yaml-frontmatter into page.data["rdf_prefixes"] and page.data["rdf_prefix_map"]
-        def load_prefixes
+        def load_prefixes_yaml
           if !self.data["rdf_prefix_path"].nil?
-            begin
-              prefix_file=File.new(File.join(@base, 'rdf-data', self.data["rdf_prefix_path"].strip)).readlines
-              self.data["rdf_prefixes"] = prefix_file.join(" ")
-              self.data["rdf_prefix_map"] = Hash[ *(prefix_file.collect { |v|
-                    arr = v.split(":",2)
-                    [arr[0][7..-1].strip, arr[1].strip[1..-2]]
-                  }.flatten)]
-            rescue Errno::ENOENT => ex
-              Jekyll.logger.error("context: #{@resource}  template: #{@template}  file not found: #{File.join(@base, 'rdf-data', self.data["rdf_prefix_path"])}")
-            end
+            load_prefixes(File.join(@base, 'rdf-data', self.data["rdf_prefix_path"].strip), self.data)
           end
         end
       end

data/lib/jekyll/helper/rdf_prefix_helper.rb

@@ -0,0 +1,43 @@
+##
+# 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
+      ##
+      # Internal module to hold support for functionalities like submitting sparql queries
+      #
+      module RdfPrefixHelper
+        ##
+        # loads the prefix data passed in the layout yaml-frontmatter or in _config.yml into page.data["rdf_prefixes"] and page.data["rdf_prefix_map"]
+        def load_prefixes(path, prefHolder)
+          Jekyll::JekyllRdf::Helper::RdfHelper.load_prefixes(path, prefHolder)
+        rescue Errno::ENOENT => ex
+          Jekyll.logger.error("--> context resource: #{@resource}  template: #{@template}") if self.class <= Jekyll::RdfPageData
+        end
+      end
+
+    end
+  end
+end

data/lib/jekyll/rdf_main_generator.rb

@@ -54,6 +54,7 @@ module Jekyll
 
       Jekyll::JekyllRdf::Helper::RdfHelper::sparql = sparql
       Jekyll::JekyllRdf::Helper::RdfHelper::site = site
+      Jekyll::JekyllRdf::Helper::RdfHelper::prefixes = File.join(site.source, 'rdf-data', @config['prefixes'].strip) unless @config['prefixes'].nil?
 
       # restrict RDF graph with restriction
       resources = extract_resources(@config['restriction'], @config['include_blank'], sparql)

data/lib/jekyll/rdf_page_data.rb

@@ -58,7 +58,7 @@ module Jekyll
         return        #return if something went wrong
       end
       load_data(site)
-      load_prefixes()
+      load_prefixes_yaml()
       resource.page = self
       resource.site = site
       site.data['resources'] << resource

data/lib/jekyll-rdf.rb

@@ -41,6 +41,7 @@ require 'jekyll/drops/rdf_resource_class'
 require 'jekyll/exceptions/NoPrefixMapped'
 require 'jekyll/exceptions/NoPrefixesDefined'
 require 'jekyll/exceptions/UnMarkedUri'
+require 'jekyll/helper/rdf_prefix_helper'
 require 'jekyll/helper/rdf_general_helper'
 require 'jekyll/helper/rdf_class_extraction'
 require 'jekyll/helper/rdf_page_helper'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.develop.344
+  version: 3.0.0.pre.develop.346
 platform: ruby
 authors:
 - Elias Saalmann
@@ -178,6 +178,7 @@ files:
 - lib/jekyll/helper/rdf_general_helper.rb
 - lib/jekyll/helper/rdf_generator_helper.rb
 - lib/jekyll/helper/rdf_page_helper.rb
+- lib/jekyll/helper/rdf_prefix_helper.rb
 - lib/jekyll/hooks/rdf_page_pointer.rb
 - lib/jekyll/rdf_main_generator.rb
 - lib/jekyll/rdf_page_data.rb