jekyll-rdf 3.0.0.pre.develop.389 → 3.0.0.pre.develop.401

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a65a5c0bd5a73ec9f0b7b2af55ea15aeb7434e0aefd2ceffadb26235c523eefa
-  data.tar.gz: 5c2959bf87cd91911d73ab85e852a0a2a4755cd24ba78e97b9c999cee7a838ae
+  metadata.gz: 46b6d077c292a82122b10eedc538017a5107f9411c2ef500958a481e0d10ec50
+  data.tar.gz: 2916ffbf6bd55eef2ef766b788eba3d001e3b2de4aaf1e0ac1ebd9efba13f1a8
 SHA512:
-  metadata.gz: b848e2857f944f851c1a4b27f8ccd483285c0491ccd01169eb07b672b02777a6f6222ae4daeac25089a340735defe76245750183f8d2f749dcce1c432c7bc69c
-  data.tar.gz: 6be29bd4a7709c84e6a52375c22d99017912448f6313a67c50f3af36a19f2862cf386af5ac19af7ee62cc79eacb3b4b9dfba19d9e7a0f1cce96797bf572034c7
+  metadata.gz: 7a34bd71e412bb43f62058a6c84847b2c32998ef0a409ac56896b77e2f9513315c7ca067226e23f48554e89c8cf0db3c74302bf47e2a449eb1b3116f767f587a
+  data.tar.gz: 919ee9a7ce1d622e4efd923d39252e1f50a352d9c456eb05123756f06c90e2c9f7cd0ca38f05dd37bb669b688896d651a13ffc2629fbff114eb14bfc71446ffc

data/lib/jekyll/drops/rdf_resource.rb

@@ -112,8 +112,16 @@ module Jekyll #:nodoc:
         ##
         # Return a filename corresponding to the RDF resource represented by the receiver. The mapping between RDF resources and filenames should be bijective.
         #
-        def filename(domain_name, baseurl)
-          @filename ||= generate_file_name(domain_name, baseurl)
+        def filename
+          return @filename unless @filename.nil?
+          generate_file_name()
+          @filename
+        end
+
+        def filedir
+          return @filedir unless @filedir.nil?
+          generate_file_name()
+          @filedir
         end
 
         def direct_classes
@@ -133,7 +141,7 @@ module Jekyll #:nodoc:
         #
         def page_url
           return @page_url unless @page_url.nil?
-          generate_file_name(@site.config["url"], @site.config["baseurl"])
+          generate_file_name()
           @page_url
         end
 
@@ -142,7 +150,7 @@ module Jekyll #:nodoc:
         #
         def render_path
           return @render_path unless @page_url.nil?
-          generate_file_name(@site.config["url"], @site.config["baseurl"])
+          generate_file_name()
           @render_path
         end
 
@@ -222,14 +230,30 @@ module Jekyll #:nodoc:
           return RdfStatement.new(RDF::Statement( subject, predicate, object), @site)
         end
 
+        def identify_name_from_path(path)
+          begin
+            @filedir = ""
+            @filename = ""
+            return
+          end if((path.nil?)||(path.length <= 0)) # no path supplied
+          last_slash = path.rindex('/')
+          if(last_slash.nil?)
+            @filedir = ""
+            @filename = path
+          else
+            @filedir = path[0..last_slash]
+            @filename = path[(last_slash +1)..-1]
+          end
+        end
+
         ##
         # 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)
+        def generate_file_name()
           fragment_holder = nil
-          domain_name = domain_name.to_s
-          baseurl = baseurl.to_s
+          domain_name = URI::split(Jekyll::JekyllRdf::Helper::RdfHelper::config["url"])[2].to_s
+          baseurl = Jekyll::JekyllRdf::Helper::RdfHelper::config["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.gsub('_:','blanknode_')}/" # ':' can not be used on windows
@@ -292,7 +316,8 @@ module Jekyll #:nodoc:
           end
           @render_path = file_name
           @page_url = "#{file_name.chomp('index.html').chomp('.html')}#{ending}#{fragment_holder}"
-          file_name
+          identify_name_from_path(file_name)
+          @filename
         end
       end
 

data/lib/jekyll/helper/rdf_general_helper.rb

@@ -80,6 +80,14 @@ module Jekyll
           end
         end
 
+        def self.config= config
+          @@config = config
+        end
+
+        def self.config
+          @@config
+        end
+
         def self.prefixes
           if(@@usePage)
             return @@page.data

data/lib/jekyll/helper/rdf_generator_helper.rb

@@ -59,6 +59,7 @@ module Jekyll
             @global_config["url"] = site.config["url"]
             @global_config["baseurl"] = site.config["baseurl"]
           end
+          Jekyll::JekyllRdf::Helper::RdfHelper::config = @global_config
           return true
         end
         ##

data/lib/jekyll/rdf_page_data.rb

@@ -42,8 +42,8 @@ module Jekyll
     def initialize(site, base, resource, mapper, config)
       @site = site
       @base = base
-      @dir = ""
-      @name = resource.filename(URI::split(config['url'])[2], config['baseurl'])
+      @name = resource.filename
+      @dir = resource.filedir
       @resource = resource
       if(base.nil?)
         Jekyll.logger.warn "Resource #{resource} not rendered: no base url found."
@@ -58,7 +58,7 @@ module Jekyll
       end
       load_data(site)
       load_prefixes_yaml()
-      self.data['permalink'] = @name    #overwrite permalinks to stop them from interfering with JekyllRdfs rendersystem
+      self.data['permalink'] = File.join(@dir, @name)    #overwrite permalinks to stop them from interfering with JekyllRdfs rendersystem
       resource.page = self
       resource.site = site
       site.data['resources'] << resource

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.develop.389
+  version: 3.0.0.pre.develop.401
 platform: ruby
 authors:
 - Elias Saalmann
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata