jekyll-rdf 3.1.1.pre.develop.697 → 3.1.1.pre.develop.701

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0df71262a3cb32f351e2cd86b821f497b0d70a6701e24012baaac776fc623523
-  data.tar.gz: cba35d82cdc9b05a65811495ad481f601279b03d00bf07cf04de77d89184c3a0
+  metadata.gz: 37ec15b87ba7bc0fb5aa7a6e32ef22708d6e88ecb098a2b755a0c85108a77e19
+  data.tar.gz: f0f21d0e340c2b66dd7ae57645edfdc21c187a66267214cebbf95ba63c9a54b0
 SHA512:
-  metadata.gz: d3e3ba14100631011af810209b08788d5962a80b8eae0defce5efd8fcb8aeb8ae580b3ddd91f5bc6079742cf1ebdaa043f28d3766b28d74fb2c8376c6fc7c2f5
-  data.tar.gz: 17c1f88406f591e4dc3f1bb6c8d3ccc1f5f3e56e0b3a455fafe34d5d99c34b69047e095acaaff8d88741f6a95a5436d785372960a8cfd53719bc23658daaa386
+  metadata.gz: 7510df3def5f91ba7e0c03dbe0376a119ed0f625aa8d07bbec15012a4725ce4ef1b8c1259261e47bee8821123c39f5c6572152fa76f038518900eb88f69221a3
+  data.tar.gz: 0b38e389cfd959ec21e98e76f8e4a19773349a27058de8db7d9d393575b987f2de1bb290717a2067dab5db9e325acc30e407968839750d80386068e9981a691f

data/lib/jekyll/drops/rdf_resource.rb

@@ -42,11 +42,6 @@ module Jekyll #:nodoc:
         #
         attr_accessor :page
 
-        ##
-        #
-        #
-        attr_reader :covered
-
         ##
         #
         #
@@ -55,7 +50,7 @@ module Jekyll #:nodoc:
         ##
         #
         #
-        def initialize(term, site = nil, page = nil, covered = false)
+        def initialize(term, site = nil, page = nil)
           super(term)
           if(site.is_a?(Jekyll::Site))
             @site = site
@@ -64,7 +59,6 @@ module Jekyll #:nodoc:
             @page = page
           end
           @subResources = {}
-          @covered = covered
           @iri = term.to_s
           @blank = false
           begin
@@ -87,6 +81,20 @@ module Jekyll #:nodoc:
           return (@site.is_a?(Jekyll::Site)||@page.is_a?(Jekyll::Page))
         end
 
+        ##
+        # Returns true if the resource base containes this resource
+        #
+        def covered
+          return @covered unless @covered.nil?
+          ask_exist = "ASK WHERE {{#{term.to_ntriples} ?p ?o}UNION{?s #{term.to_ntriples} ?o}UNION{?s ?p #{term.to_ntriples}}} "
+          @covered = Jekyll::JekyllRdf::Helper::RdfHelper::sparql.query(ask_exist)
+          if(@covered.instance_of? RDF::Literal::Boolean)
+            @covered = @covered.true?
+          else
+            @covered = false || @covered   #take care of compatibility with virtuoso
+          end
+        end
+
         ##
         # Return a list of Jekyll::JekyllRdf::Drops::RdfStatements whose subject, predicate or object is the RDF resource represented by the receiver
         #

data/lib/jekyll/drops/rdf_term.rb

@@ -90,7 +90,7 @@ module Jekyll
         def self.build_term_drop(term, site, covered)
           case term
           when RDF::URI, RDF::Node
-            return RdfResource.new(term, site, nil, covered)
+            return Jekyll::JekyllRdf::Helper::RdfHelper.resources(term)
           when RDF::Literal
             return RdfLiteral.new(term)
           else

data/lib/jekyll/filters/rdf_get.rb

@@ -36,14 +36,7 @@ module Jekyll
         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}}} "
-        exists = Jekyll::JekyllRdf::Helper::RdfHelper::sparql.query(ask_exist)
-        if(exists.instance_of? RDF::Literal::Boolean)
-          exists = exists.true?
-        else
-          exists = false || exists   #take care of compatibility with virtuoso
-        end
-        Jekyll::JekyllRdf::Drops::RdfResource.new(RDF::URI(request_uri[1..-2]), Jekyll::JekyllRdf::Helper::RdfHelper::site, Jekyll::JekyllRdf::Helper::RdfHelper::page, exists)
+        Jekyll::JekyllRdf::Helper::RdfHelper.resources(request_uri[1..-2])
       end
     end
   end

data/lib/jekyll/filters/rdf_property.rb

@@ -74,7 +74,7 @@ module Jekyll
           query = "SELECT ?s WHERE{ ?s #{predicate} #{n_triples} }"
           result = client.query(query).map do |solution|
             subject = RDF::URI(solution.s)
-            Jekyll::JekyllRdf::Drops::RdfResource.new(subject, Jekyll::JekyllRdf::Helper::RdfHelper::site, Jekyll::JekyllRdf::Helper::RdfHelper::page, true)
+            Jekyll::JekyllRdf::Helper::RdfHelper.resources(subject)
           end
         else
           query = "SELECT ?o ?dt ?lit ?lang WHERE{ #{n_triples} #{predicate} ?o BIND(datatype(?o) AS ?dt) BIND(isLiteral(?o) AS ?lit) BIND(lang(?o) AS ?lang) #{lang_query} }"
@@ -95,7 +95,7 @@ module Jekyll
           result = Jekyll::JekyllRdf::Drops::RdfLiteral.new(object)
         else
           object = RDF::URI(solution.o)
-          result = Jekyll::JekyllRdf::Drops::RdfResource.new(object, Jekyll::JekyllRdf::Helper::RdfHelper::site, Jekyll::JekyllRdf::Helper::RdfHelper::page, true)
+          result = Jekyll::JekyllRdf::Helper::RdfHelper.resources(object)
         end
         return result
       end

data/lib/jekyll/helper/rdf_general_helper.rb

@@ -32,6 +32,9 @@ module Jekyll
       module RdfHelper
         @@prefixes = {}
         @@usePage = false
+        @@resources = {}
+        @@site = nil
+        @@page = nil
 
         def self.sparql= sparql
           @@sparql = sparql
@@ -105,8 +108,32 @@ module Jekyll
         def self.pathiri
           @@baseiri
         end
-      end
 
-    end
-  end
-end
+        ##
+        # Constructs and returns a Jekyll::JekyllRdf::Drops::RdfResource. If the
+        # uri refers to an already created resource, this method wont create a
+        # new resource.
+        #
+        def self.resources uri
+          resource = @@resources[uri.to_s]
+          if resource.nil?
+            resource = Jekyll::JekyllRdf::Drops::RdfResource.new(RDF::URI(uri.to_s), @@site, @@page)
+            @@resources[uri.to_s] = resource
+          end
+          return resource
+        end
+
+        ##
+        # resets RdfHelper to its initialization values
+        #
+        def self.reinitialize
+          @@prefixes.clear
+          @@usePage = false
+          @@resources.clear
+          @@site = nil
+          @@page = nil
+        end
+      end #RdfHelper
+    end #Helper
+  end #JekyllRdf
+end #Jekyll

data/lib/jekyll/helper/rdf_generator_helper.rb

@@ -20,7 +20,7 @@ module Jekyll
           @pageResources={};
           @blanknodes=[]
           resources.each do |uri|
-            resource = Jekyll::JekyllRdf::Drops::RdfResource.new(uri, nil, nil, true)
+            resource = Jekyll::JekyllRdf::Helper::RdfHelper.resources(uri)
             if(uri.instance_of? RDF::URI)
               uriString = uri.to_s
               if((uriString.include? "#") && (uriString.index("#") < (uriString.length - 1)))   #sorting in uris with a #
@@ -41,7 +41,7 @@ module Jekyll
           end
           # give parents to orphaned resources
           @pageResources.each_key{|key|
-            @pageResources[key]['./'] = Jekyll::JekyllRdf::Drops::RdfResource.new(RDF::URI(key)) if @pageResources[key]['./'].nil?
+            @pageResources[key]['./'] = Jekyll::JekyllRdf::Helper::RdfHelper.resources(key) if @pageResources[key]['./'].nil?
           }
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.1.1.pre.develop.697
+  version: 3.1.1.pre.develop.701
 platform: ruby
 authors:
 - Elias Saalmann
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent