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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46b6d077c292a82122b10eedc538017a5107f9411c2ef500958a481e0d10ec50
-  data.tar.gz: 2916ffbf6bd55eef2ef766b788eba3d001e3b2de4aaf1e0ac1ebd9efba13f1a8
+  metadata.gz: bfa596e726fdcc001da9fe18a52cfaad90d006f77f5c24899d985a0107eb1833
+  data.tar.gz: 47aad3ab3fee69b78988214051ee331be915fff051a961a893678f45627d21e7
 SHA512:
-  metadata.gz: 7a34bd71e412bb43f62058a6c84847b2c32998ef0a409ac56896b77e2f9513315c7ca067226e23f48554e89c8cf0db3c74302bf47e2a449eb1b3116f767f587a
-  data.tar.gz: 919ee9a7ce1d622e4efd923d39252e1f50a352d9c456eb05123756f06c90e2c9f7cd0ca38f05dd37bb669b688896d651a13ffc2629fbff114eb14bfc71446ffc
+  metadata.gz: f4f6b3cfcb6942426db3780b9e3f38cd32a3ef361f4d1316ce5d5dfc2795515f665a862c427aeca324b4b546d14b56f363dad34aff4a59e240ef20584a3607ab
+  data.tar.gz: 919d6dab6c17ed897feec35608e8c73f1f12edbd51f0fb21da037d11df6262409795d282716fe229da32e54734f7478f010d2aacc62aeaa854176a9f9f199441

data/lib/jekyll/drops/rdf_resource.rb

@@ -252,8 +252,8 @@ module Jekyll #:nodoc:
         #
         def generate_file_name()
           fragment_holder = nil
-          domain_name = URI::split(Jekyll::JekyllRdf::Helper::RdfHelper::config["url"])[2].to_s
-          baseurl = Jekyll::JekyllRdf::Helper::RdfHelper::config["baseurl"].to_s
+          domain_name = URI::split(Jekyll::JekyllRdf::Helper::RdfHelper::domainiri)[2].to_s
+          baseurl = Jekyll::JekyllRdf::Helper::RdfHelper::pathiri.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

data/lib/jekyll/helper/rdf_general_helper.rb

@@ -80,14 +80,6 @@ module Jekyll
           end
         end
 
-        def self.config= config
-          @@config = config
-        end
-
-        def self.config
-          @@config
-        end
-
         def self.prefixes
           if(@@usePage)
             return @@page.data
@@ -95,6 +87,22 @@ module Jekyll
             return @@prefixes
           end
         end
+
+        def self.domainiri= domain
+          @@domainiri = domain
+        end
+
+        def self.domainiri
+          @@domainiri
+        end
+
+        def self.pathiri= path
+          @@baseiri = path
+        end
+
+        def self.pathiri
+          @@baseiri
+        end
       end
 
     end

data/lib/jekyll/helper/rdf_generator_helper.rb

@@ -53,13 +53,25 @@ module Jekyll
           end
 
           @global_config = Jekyll.configuration({})
-
           #small fix because global_config doesn't work in a test enviorment
           if(!@global_config.key? "url")
             @global_config["url"] = site.config["url"]
             @global_config["baseurl"] = site.config["baseurl"]
           end
-          Jekyll::JekyllRdf::Helper::RdfHelper::config = @global_config
+
+          if(@config["baseiri"].nil?)
+            Jekyll::JekyllRdf::Helper::RdfHelper::domainiri = @global_config["url"]
+            Jekyll::JekyllRdf::Helper::RdfHelper::pathiri = @global_config["baseurl"]
+          else
+            uri = Addressable::URI.parse(@config["baseiri"]).to_hash
+            domainuri = ""
+            domainuri << "#{uri[:scheme]}://" unless uri[:scheme].nil?
+            domainuri << "#{uri[:userinfo]}@" unless uri[:userinfo].nil?
+            domainuri << "#{uri[:host]}" unless uri[:host].nil?
+            domainuri << ":#{uri[:port]}" unless uri[:port].nil?
+            Jekyll::JekyllRdf::Helper::RdfHelper::domainiri = domainuri
+            Jekyll::JekyllRdf::Helper::RdfHelper::pathiri = uri[:path][0..-1].to_s unless uri[:path].nil?
+          end
           return true
         end
         ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.develop.401
+  version: 3.0.0.pre.develop.402
 platform: ruby
 authors:
 - Elias Saalmann