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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91cd64fba0c06af37f3a8fbb559eb197053b8a2e47b49af4607325a9d08f12a0
-  data.tar.gz: 1750593ef6c2bf4696d2c2dae109dc5d0a96871236821d33a3eef9ff011b8017
+  metadata.gz: 69e331abb5f5d77a0ff200969d3a243f6de1e7cc8bce1b7c50c631b901a75e4b
+  data.tar.gz: 90420ef9c6886f68ebb125a92db4cf45b8a61ca7af662e4665cfcd0e211f761a
 SHA512:
-  metadata.gz: f4193c72f8019d48953625d20793092c6ca781a807e25ae94e5a1d8bb073f59e4a6b9026fb3171ab64b2916bca0f35fe924ade56ae8e78245b73bb343a3ef4a4
-  data.tar.gz: c3b27eb9c373e407316828e80007c1f008a5cdb539a97009dd0d982d54ca7b5cb2eafd684b6bc6ce8eb22e4eb6d12c5026e68732c42fe8181a81b28aaf6b6264
+  metadata.gz: 75b24f1cef6ef4ba1001472b20fddf541284bd50a8ff57742032c72f4df0114dbc81306214ea4bf99a1a281f36052dfda07704946219695c4939935c6e2c1a4c
+  data.tar.gz: dbfef75a4cb81f215148369bccd58a5c48f9a1628ac2eb851ed6b75b87d5720889a17788cd3939542d1c0620300da3ec2f1d311617d3819a15695fa7e79e9d90

data/lib/jekyll/filters/rdf_resolve_prefix.rb

@@ -25,7 +25,7 @@
 
 module Jekyll
   module JekyllRdf
-    module Filter
+    module ResolvePrefixes
       private
       def rdf_resolve_prefix(predicate)
         if(predicate[0] == "<" && predicate[-1] == ">")
@@ -50,3 +50,11 @@ module Jekyll
     end
   end
 end
+
+module Jekyll
+  module JekyllRdf
+    module Filter
+      include Jekyll::JekyllRdf::ResolvePrefixes
+    end
+  end
+end

data/lib/jekyll/helper/rdf_generator_helper.rb

@@ -121,6 +121,17 @@ module Jekyll
           end.uniq
         end
 
+        def extract_list_resources path
+          file = File.open(path, "r")
+          result = []
+          file.each_line {|line|
+            line = line.strip
+            result.push(RDF::URI(line[1..-2])) if (line[0].eql? "<" )&& (line[-1].eql? ">")
+          }
+          file.close
+          result
+        end
+
         def create_page(site, resource, mapper)
           Jekyll::JekyllRdf::Helper::RdfPageHelper.prepare_resource resource, mapper
           page = Jekyll::Page.new(site, site.source, resource.filedir, resource.filename)

data/lib/jekyll/rdf_main_generator.rb

@@ -33,6 +33,7 @@ module Jekyll
     safe true
     priority :highest
     include Jekyll::JekyllRdf::Helper::RdfGeneratorHelper
+    include Jekyll::JekyllRdf::ResolvePrefixes
 
     ##
     # #generate performs the enrichment of a Jekyll::Site with rdf triples
@@ -67,7 +68,11 @@ module Jekyll
       Jekyll::JekyllRdf::Helper::RdfHelper::prefixes = File.join(site.source, @config['prefixes'].strip) unless @config['prefixes'].nil?
 
       # restrict RDF graph with restriction
-      resources = extract_resources(@config['restriction'], @config['include_blank'], sparql)
+      resources = []
+      resources = resources + extract_resources(@config['restriction'], @config['include_blank'], sparql) unless @config['restriction'].nil?
+      resources = resources + extract_list_resources(File.join(site.config['source'], @config['restriction_file'])) unless @config['restriction_file'].nil?
+      resources = resources + extract_resources(nil, @config['include_blank'], sparql) if resources.length == 0  # subject + predicate + object should only be extracted if there is neither a restriction or restriction_file
+      resources.uniq! unless @config['restriction'].nil? || @config['restriction_file'].nil?
       site.data['sparql'] = sparql
       site.data['resources'] = []
 

metadata

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