jekyll-rdf 3.0.0.pre.develop.322 → 3.0.0.pre.develop.326

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c802aae40cda124bc5120ab91440c1264b1417fbb494671036133e3533cc99d
-  data.tar.gz: dd631ce941d2dbf3a895770f74c70e5b9f3d53cc0051f983d6058447004954fa
+  metadata.gz: 9786b31b9d783066f30dad1fe812d98ca1b5535130aec76bab5f1c101e670678
+  data.tar.gz: 13bc65feb1a733884e48c7d257665528dd99d06b93ebc65c39f0f3eb6b4f4164
 SHA512:
-  metadata.gz: 7f178d602537055e491bc89b1b5b04522b7d83adade9231b6ac7bcf72545f54d74598dbe9bdb6dd15d397715612d806a4b8bc27ceb6d23ccacc36cf06b03902f
-  data.tar.gz: c88bf30f791997681806b6edcf1b0d8c89674c6f19f793202b228e3792ba82196bdeb77c08196d84dae686b306185e82af5d77bf7d2bb677cdb17b117d24755c
+  metadata.gz: a10bb33202de94090845272dba6c25a7b8c4a1bb826cfd75bd42fc7fafe444d72710917cada85ee9dd8efacf93d4325a2a43ffbd0691e05fd9ecc2bce1b5c0f0
+  data.tar.gz: 452825c5a9c742013311fa7319a145754238beb05d323fe5ab1b166051873fee2f47734651c251953557d4c81c4ef0704228af84d343419137759fe95ee8a98e

data/lib/jekyll/drops/rdf_resource.rb

@@ -49,7 +49,12 @@ module Jekyll #:nodoc:
       ##
       #
       #
-      def initialize(term, site = nil, page = nil)
+      attr_reader :covered
+
+      ##
+      #
+      #
+      def initialize(term, site = nil, page = nil, covered = false)
         super(term)
         if(site.is_a?(Jekyll::Site))
           @site = site
@@ -58,6 +63,7 @@ module Jekyll #:nodoc:
           @page = page
         end
         @subResources = {}
+        @covered = covered
       end
 
       def add_necessities(site, page)
@@ -129,14 +135,18 @@ module Jekyll #:nodoc:
       # Return the URL of the page representing this RdfResource
       #
       def page_url
-        @page_url ||= generate_file_name(@site.config["url"], @site.config["baseurl"]).chomp('index.html').chomp('.html')
+        return @page_url unless @page_url.nil?
+        generate_file_name(@site.config["url"], @site.config["baseurl"])
+        @page_url
       end
 
       ##
       # Return the path to the page representing this RdfResource
       #
       def render_path
-        @render_path ||= generate_file_name(@site.config["url"], @site.config["baseurl"])
+        return @render_path unless @page_url.nil?
+        generate_file_name(@site.config["url"], @site.config["baseurl"])
+        @render_path
       end
 
       ##
@@ -200,7 +210,6 @@ module Jekyll #:nodoc:
         return result
       end
 
-      private
       def create_statement(subject_string, predicate_string, object_string, is_lit = nil, lang = nil, data_type = nil)
         subject = RDF::URI(subject_string)
         predicate = RDF::URI(predicate_string)
@@ -212,62 +221,76 @@ module Jekyll #:nodoc:
         return RdfStatement.new(RDF::Statement( subject, predicate, object), @site)
       end
 
-      private
       ##
       # Generate a filename corresponding to the RDF resource represented by the receiver. The mapping between RDF resources and filenames should be bijective. If the url of the rdf is the same as of the hosting site it will be omitted.
       # * +domain_name+
       #
       def generate_file_name(domain_name, baseurl)
+        fragment_holder = nil
+        domain_name = domain_name.to_s
+        baseurl = baseurl.to_s
+        (("/".eql? baseurl[-1]) || (baseurl.empty? && ("/".eql? domain_name[-1]))) ? rdfsites="rdfsites/": rdfsites="/rdfsites/"
         if(term.to_s[0..1].eql? "_:")
-          file_name = "rdfsites/blanknode/#{term.to_s}/"
+          file_name = "#{rdfsites}blanknode/#{term.to_s.gsub('_:','blanknode_')}/" # ':' can not be used on windows
         else
           begin
             uri = Addressable::URI.parse(term.to_s).to_hash
-            file_name = "rdfsites/" # in this directory all external RDF sites are stored
+            file_name = rdfsites # in this directory all external RDF sites are stored
             if((uri[:host].eql? domain_name) || ("#{uri[:scheme]}://#{uri[:host]}".eql? domain_name))
-              file_name = ""
-              uri[:scheme] = nil
-              uri[:host] = nil
-              if(uri[:path].length > baseurl.length)
-                if(uri[:path][0..(baseurl.length)].eql? (baseurl + "/"))
-                  uri[:path] = uri[:path][(baseurl.length)..-1]
-                end
+              if((baseurl.length == 0))       #Special cases like baseurl == path or non-existent baseurl
+                uri[:scheme] = nil
+                uri[:host] = nil
+                file_name = ""
               elsif(uri[:path].eql?(baseurl))
                 uri[:path] = nil
-              end
-            end
-            key_field = [:scheme, :userinfo, :host, :port, :registry, :path, :opaque, :query, :fragment]
-            key_field.each do |index|
-              if !(uri[index].nil?)
-                case index
-                when :path
-                  file_name += "#{uri[index][1..-1]}/"
-                when :fragment
-                  file_name += "#/#{uri[index]}"
-                else
-                  file_name += "#{uri[index]}/"
+                uri[:scheme] = nil
+                uri[:host] = nil
+                file_name = ""
+              elsif(uri[:path].length > baseurl.length)                   #baseurl might be the first part of :path
+                if(uri[:path][0..(baseurl.length - 1)].eql? baseurl)
+                  uri[:path] = uri[:path][(baseurl.length)..-1]
+                  uri[:scheme] = nil
+                  uri[:host] = nil
+                  file_name = ""
                 end
               end
             end
-            unless file_name[-1] == '/'
-              file_name += '/'
-            end
-          rescue URI::InvalidURIError => x #unclean coding: blanknodes are recognized through errors
+            #An URI consists of these fields [:scheme, :userinfo, :host, :port, :registry, :path, :opaque, :query, :fragment]
+            file_name << "#{uri[:scheme]}/" unless uri[:scheme].nil?
+            file_name << "#{uri[:userinfo]}@" unless uri[:userinfo].nil?
+            file_name << "#{uri[:host]}/" unless uri[:host].nil?
+            file_name << "#{uri[:port]}/" unless uri[:port].nil?
+            # registry purpose unknown
+            file_name << "#{uri[:path][0..-1]}" unless uri[:path].nil?
+            fragment_holder = "##{uri[:fragment]}" unless uri[:fragment].nil?
+            # opaque jekyll produces static pages, so we do not dereferencing
+            # query queries do not address resources
+            # file_name << "#/#{uri[:fragment]}" unless uri[:fragment].nil? fragments are not evaluated by browsers, only by clients
+          rescue Addressable::URI::InvalidURIError => x
             file_name = "invalids/#{term.to_s}"
             Jekyll.logger.error("Invalid resource found: #{term.to_s} is not a proper uri")
             Jekyll.logger.error("URI parser exited with message: #{x.message}")
           end
         end
-        file_name = file_name.gsub('_','_u')
         file_name = file_name.gsub('//','/') # needs a better regex to include /// ////...
-        file_name = file_name.gsub(':','_D')
         file_name = file_name.strip
         if(file_name[-2..-1] == "#/")
           file_name = file_name[0..-3]
         end
-        file_name += 'index.html'
+        if(file_name[-1] == '/')
+          file_name << "index.html"
+        else
+          last_slash = file_name.rindex('/')
+          last_slash = 0 if last_slash.nil?
+          ending = ""
+          if(file_name[-5..-1].eql? ".html")
+            ending = ".html" #in case .html is already contained by the term.url
+          else
+            file_name[last_slash..-1] = "#{file_name[last_slash..-1]}.html"
+          end
+        end
         @render_path = file_name
-        @page_url = file_name.chomp('index.html').chomp('.html')
+        @page_url = "#{file_name.chomp('index.html').chomp('.html')}#{ending}#{fragment_holder}"
         file_name
       end
     end

data/lib/jekyll/drops/rdf_statement.rb

@@ -53,9 +53,9 @@ module Jekyll
       # * +sparql+ - The SPARQL::Client which contains the +statement+
       # * +site+ - The Jekyll::Site to be enriched
       def initialize(statement, site)
-        @subject ||= Jekyll::Drops::RdfTerm.build_term_drop(statement.subject, site)
-        @predicate ||= Jekyll::Drops::RdfTerm.build_term_drop(statement.predicate, site)
-        @object ||= Jekyll::Drops::RdfTerm.build_term_drop(statement.object, site)
+        @subject ||= Jekyll::Drops::RdfTerm.build_term_drop(statement.subject, site, true)
+        @predicate ||= Jekyll::Drops::RdfTerm.build_term_drop(statement.predicate, site, true)
+        @object ||= Jekyll::Drops::RdfTerm.build_term_drop(statement.object, site, true)
       end
 
       def inspect

data/lib/jekyll/drops/rdf_term.rb

@@ -86,10 +86,10 @@ module Jekyll
       # * +term+ - The term to be represented
       # * +site+ - The Jekyll::Site to be enriched
       #
-      def self.build_term_drop(term, site)
+      def self.build_term_drop(term, site, covered)
         case term
         when RDF::URI, RDF::Node
-          return RdfResource.new(term, site)
+          return RdfResource.new(term, site, nil, covered)
         when RDF::Literal
           return RdfLiteral.new(term,)
         else

data/lib/jekyll/filters/rdf_collection.rb

@@ -34,7 +34,7 @@ module Jekyll
               " <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}"
       results = []
       Jekyll::RdfHelper::sparql.query(query).each{ |solution|
-        results.push Jekyll::Drops::RdfTerm.build_term_drop(solution.f, Jekyll::RdfHelper::site).add_necessities(Jekyll::RdfHelper::site, Jekyll::RdfHelper::page)
+        results.push Jekyll::Drops::RdfTerm.build_term_drop(solution.f, Jekyll::RdfHelper::site, true).add_necessities(Jekyll::RdfHelper::site, Jekyll::RdfHelper::page)
       }
       return results
     end

data/lib/jekyll/filters/rdf_container.rb

@@ -37,7 +37,7 @@ module Jekyll
       query = "SELECT ?p ?o WHERE{ #{n_triples} ?p ?o #{query_additions()}"
       solutions = sparql_client.query(query).each_with_object([]) {|solution, array|
         if(/^http:\/\/www\.w3\.org\/1999\/02\/22-rdf-syntax-ns#_\d+$/.match(solution.p.to_s))
-          array << Jekyll::Drops::RdfTerm.build_term_drop(solution.o, Jekyll::RdfHelper::site).add_necessities(Jekyll::RdfHelper::site, Jekyll::RdfHelper::page)
+          array << Jekyll::Drops::RdfTerm.build_term_drop(solution.o, Jekyll::RdfHelper::site, true).add_necessities(Jekyll::RdfHelper::site, Jekyll::RdfHelper::page)
         end
       }
       return solutions

data/lib/jekyll/filters/rdf_property.rb

@@ -75,7 +75,7 @@ module Jekyll
         query = "SELECT ?s WHERE{ ?s <#{predicate}> #{n_triples} }"
         result = client.query(query).map do |solution|
           subject = RDF::URI(solution.s)
-          Jekyll::Drops::RdfResource.new(subject, Jekyll::RdfHelper::site, Jekyll::RdfHelper::page)
+          Jekyll::Drops::RdfResource.new(subject, Jekyll::RdfHelper::site, Jekyll::RdfHelper::page, true)
         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} }"
@@ -96,7 +96,7 @@ module Jekyll
         result = Jekyll::Drops::RdfLiteral.new(object)
       else
         object = RDF::URI(solution.o)
-        result = Jekyll::Drops::RdfResource.new(object, Jekyll::RdfHelper::site, Jekyll::RdfHelper::page)
+        result = Jekyll::Drops::RdfResource.new(object, Jekyll::RdfHelper::site, Jekyll::RdfHelper::page, true)
       end
       return result
     end

data/lib/jekyll/filters/rdf_sparql_query.rb

@@ -49,7 +49,7 @@ module Jekyll
       begin
         result = Jekyll::RdfHelper::sparql.query(query).map do |solution|
           hsh = solution.to_h
-          hsh.update(hsh){ |k,v| Jekyll::Drops::RdfTerm.build_term_drop(v, Jekyll::RdfHelper::site).add_necessities(Jekyll::RdfHelper::site, Jekyll::RdfHelper::page)}
+          hsh.update(hsh){ |k,v| Jekyll::Drops::RdfTerm.build_term_drop(v, Jekyll::RdfHelper::site, true).add_necessities(Jekyll::RdfHelper::site, Jekyll::RdfHelper::page)}
           hsh.collect{|k,v| [k.to_s, v]}.to_h
         end
         return result

data/lib/jekyll/rdf_generator_helper.rb

@@ -3,17 +3,9 @@ module Jekyll
     private
       def prepare_pages (site, mapper)
         @pageResources.each{|uri, entry|
-          if(entry['./'].nil?)
-            if(@config['render_orphaned_uris'])
-              entry.each{|name, resource|
-                create_page(site, resource, mapper, @global_config)
-              }
-            end
-          else
-            resource = entry.delete('./')
-            resource.subResources = entry
-            create_page(site, resource, mapper, @global_config)
-          end
+          resource = entry.delete('./')
+          resource.subResources = entry
+          create_page(site, resource, mapper, @global_config)
         }
 
         @blanknodes.each{|resource|
@@ -22,10 +14,10 @@ module Jekyll
       end
 
       def parse_resources (resources)
-        @pageResources={};
+        @pageResources={}
         @blanknodes=[]
         resources.each do |uri|
-          resource = Jekyll::Drops::RdfResource.new(uri)
+          resource = Jekyll::Drops::RdfResource.new(uri, nil, nil, true)
           if(uri.instance_of? RDF::URI)
             uriString = uri.to_s
             if((uriString.include? "#") && (uriString.index("#") < (uriString.length - 1)))   #sorting in uris with a #
@@ -43,6 +35,11 @@ module Jekyll
           elsif(uri.instance_of? RDF::Node)
             @blanknodes << resource
           end
+
+          # give parents to orphaned resources
+          @pageResources.each_key{|key|
+            @pageResources[key]['./'] = Jekyll::Drops::RdfResource.new(RDF::URI(key)) if @pageResources[key]['./'].nil?
+          }
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.develop.322
+  version: 3.0.0.pre.develop.326
 platform: ruby
 authors:
 - Elias Saalmann
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-06 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.7.0
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: Hypertext Publication System for Templated Resource Rendering