jekyll-rdf 3.0.0.pre.develop.421 → 3.0.0.pre.develop.433

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04ea089fe923f4437d07fcff823e2c440a5e8ed02d080ab434b028f4629f7995
-  data.tar.gz: 3b835587386212c582e1b21c7949a843729b5e8f148af23af15d0b90cbabcc70
+  metadata.gz: 770ccad202a7e8c4e16d933924ed00c2de474d938304a25700ecde66b9dc802b
+  data.tar.gz: 115369307c8e9574d96baeea0298ec19710e40434e3087410c13e543a7e9980c
 SHA512:
-  metadata.gz: 1a6a24b17b9711e9b2303f0992a7b06acca674d784ef082c86d8cc3af18d49cf4b91835c728e95ad4f0421fcbd4ec47a21ad77251904283838cd062fc928646d
-  data.tar.gz: d16621d86e5ddab1b160e0000957448db6dd81d6b3aebd2edd1e73b1b8d38ff68a808587e4a6dc235bc592b9e17e35bc1c0a043a5c74ac2725620bad85ee1bf3
+  metadata.gz: 59057ad11dcb44813f98497c08ee2c531f674e562d8cd1d17ebcacdf069e80be8108020fe67f8ebc262426b470118888b8d09c015cacd556310873c4f6886865
+  data.tar.gz: 19d36b268980e09a31a425673b6f9e2ded10a5b842765c9601c1de7d026ec4b17d49639f8a68f883e07f4e333ac0ad71abbb3836a649a3d3b6be3bb435da3498

data/lib/jekyll/filters/rdf_get.rb

@@ -28,7 +28,7 @@ module Jekyll
   module JekyllRdf
 
     ##
-    # Internal module to hold the medthod #rdf_get
+    # Internal module to hold the method #rdf_get
     #
     module Filter
       def rdf_get(request_uri)
@@ -39,8 +39,8 @@ module Jekyll
             return
           end
         end
-        request_uri = "<#{Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].term.to_s}>" if (rdf_page_to_resource?(request_uri))
-        return unless valid_resource?(request_uri)
+        request_uri = to_string_wrap(rdf_page_to_resource(request_uri))
+        return unless valid_resource?(request_uri) && (!request_uri[0..1].eql? "_:")
         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::JekyllRdf::Helper::RdfHelper::sparql.query(ask_exist).true?)

data/lib/jekyll/filters/rdf_page_to_resource.rb

@@ -3,12 +3,17 @@ module Jekyll
     module Filter
       private
       def rdf_page_to_resource(input)
-        return Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'] if(rdf_page_to_resource?(input))
+        return Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'] if rdf_substitude_nil?(input)
+        return input['rdf'] if rdf_page_to_resource?(input)
         return input
       end
 
       def rdf_page_to_resource?(input)
-        return (!Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].nil?)&&(input.nil? ||  input.class <= (Jekyll::RdfPageData) || (input.class <= Hash && input.key?("template") && input.key?("url") && input.key?("path") ))
+        return input.class <= Hash && input.key?("template") && input.key?("url") && input.key?("path") &&!input["rdf"].nil?
+      end
+
+      def rdf_substitude_nil?(input)
+        return (!Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].nil?)&&input.nil?
       end
 
       def valid_resource?(input)

data/lib/jekyll/filters/rdf_sparql_query.rb

@@ -38,7 +38,7 @@ module Jekyll
       # * +query+ - the SPARQL query
       #
       def sparql_query(resource = nil, query)
-        if(rdf_page_to_resource?(resource))
+        if(rdf_substitude_nil?(resource))
           query.gsub!('?resourceUri', "<#{Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].term}>")
         elsif(resource.class <= Array)
           resource.each_with_index do |uri, index|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.develop.421
+  version: 3.0.0.pre.develop.433
 platform: ruby
 authors:
 - Elias Saalmann
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Hypertext Publication System for Templated Resource Rendering