jekyll-rdf 3.0.0.pre.develop.303 → 3.0.0.pre.develop.319

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8f346de2c6991c2ec71e1592c5d25930d1687248
-  data.tar.gz: f2d2d7e7df296643875ed1e60bc96379f2ae90f6
+SHA256:
+  metadata.gz: d3dc451cb7b1f81e9f9563acb874b8a5eda3e519cccbbdf851831dd7971fdea6
+  data.tar.gz: f68ac51b1c7f183987a40d7acf60dac7fbd9cd8626daad8343ebf0d52e433e4b
 SHA512:
-  metadata.gz: 2bb9da378c60da2e41c1569a9a7df198538f33c450f53e68883a6b9dda3b6d18e827a603363243407600c556b3734fc98ada7e78cf456cb4043e535a3f346ced
-  data.tar.gz: 006da3873315523c57ef25bce40203888755a90a56d433cd3fb3cb307587b5964ca4fdcf4f1e9a78d531a5d2efa8d88886c7b3459332db909004ec61cac81d59
+  metadata.gz: 2a1b11b325f3350ab62eefddee4ac875ae01f92bd2909fae491c386b6bea36fc0c9c9255912b39c8dde31fd2ef7a1d88697de9bbd5ea2747e6933196d829c7b0
+  data.tar.gz: a399c06949172657bbe8bc567560e90680f529f77dbe8d1f014e868eef039bf76771a287e93eacc7e8d723bf53091068ea0bda49710385aaa887ad6aa1871209

data/lib/jekyll/filters/rdf_collection.rb

@@ -27,6 +27,7 @@
 module Jekyll
   module RdfCollection
     def rdf_collection(input, predicate = nil)
+      input = Jekyll::RdfHelper::page.data['rdf'] if(input.nil? || input.class <= (Jekyll::RdfPageData))
       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

@@ -27,6 +27,7 @@ module Jekyll
   module RdfContainer
     include Jekyll::RdfPrefixResolver
     def rdf_container(input, type = nil)
+      input = Jekyll::RdfHelper::page.data['rdf'] if(input.nil? ||  input.class <= (Jekyll::RdfPageData))
       sparql_client = Jekyll::RdfHelper::sparql
       n_triples = input.term.to_ntriples
       if(!(valid_container?(n_triples, type)))

data/lib/jekyll/filters/rdf_get.rb

@@ -31,6 +31,7 @@ module Jekyll
   module RdfGet
     include Jekyll::RdfPrefixResolver
     def rdf_get(request_uri)
+      request_uri = "<#{Jekyll::RdfHelper::page.data['rdf'].term.to_s}>" if (request_uri.nil? || request_uri.class <= (Jekyll::RdfPageData))
       request_uri = rdf_resolve_prefix(request_uri)
       ask_exist = "ASK WHERE {{<#{request_uri}> ?p ?o}UNION{?s <#{request_uri}> ?o}UNION{?s ?p <#{request_uri}>}} "
       return unless (Jekyll::RdfHelper::sparql.query(ask_exist).true?)

data/lib/jekyll/filters/rdf_property.rb

@@ -48,6 +48,7 @@ module Jekyll
 
     private
     def map_predicate(input, predicate, lang = nil, list = false, inverse = false)
+      input = Jekyll::RdfHelper::page.data['rdf'] if(input.nil? ||  input.class <= (Jekyll::RdfPageData))
       return input unless input.is_a?(Jekyll::Drops::RdfResource)
       predicate = rdf_resolve_prefix(predicate)
       result = filter_statements(input.term.to_ntriples, predicate, inverse, lang)

data/lib/jekyll/filters/rdf_sparql_query.rb

@@ -37,8 +37,12 @@ module Jekyll
     # * +input+ - the context RDF resource
     # * +query+ - the SPARQL query
     #
-    def sparql_query(query)
-      query.gsub!('?resourceUri', "<#{Jekyll::RdfHelper::page.data['rdf'].term}>") #maybe use this part as optional parameter
+    def sparql_query(resource = nil, query)
+      if(resource.nil? || resource.class <= (Jekyll::RdfPageData))
+        query.gsub!('?resourceUri', "<#{Jekyll::RdfHelper::page.data['rdf'].term}>")
+      else
+        query.gsub!('?resourceUri', "<#{resource}>")
+      end
       if(!Jekyll::RdfHelper::page.data["rdf_prefixes"].nil?)
         query = query.prepend(" ").prepend(Jekyll::RdfHelper::page.data["rdf_prefixes"])
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.develop.303
+  version: 3.0.0.pre.develop.319
 platform: ruby
 authors:
 - Elias Saalmann
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
 summary: Hypertext Publication System for Templated Resource Rendering