jekyll-rdf 2.1.0.alpha.pre.186 → 2.1.0.alpha.pre.194

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c71bb1e8c3429261cc2f0751ce88548d7c3163
-  data.tar.gz: 02fef96d8ea857b7ee5363a53bfa814c0a36ae9f
+  metadata.gz: 78d39e5cd1af8bc2a7ec53b5e048c651b061b822
+  data.tar.gz: b935903c86930ab76c5e41a96a62a4a768ed0696
 SHA512:
-  metadata.gz: deb188f104ce4f767c84c65eea1d3a6485a7785356e67cf6ca5350f4e603e9b9685ba65555e0e23e47eaf87be902698524f37dd2b1dd39eed0995670083bbf82
-  data.tar.gz: 3dbaa044e5d3a5ebaf43b194cf483e031fd467038a5e25162fa6103975a4ac8e21801f68665ba2c58f724d09b80baa653b96d03d8ca0d3b271ad48aa31b01b38
+  metadata.gz: 056948f57a367d4977e88acdef8bbcb5e54bf53f82bc2638ad7d57b6e54a26f4127cf35c4c60df79cf6c79bd4db8a28481e4bef677d6d9c067bc424e9dd87ed5
+  data.tar.gz: 28c850a074b305d25385c3beb8c7fab3c01b3ceb094449ab4334fd80421621b4c6c164c770be9fb62050e4347983a5268205e2e88dc0a38b194af853f09fe34a

data/lib/jekyll/drops/rdf_resource.rb

@@ -214,38 +214,40 @@ module Jekyll #:nodoc:
           file_name = "rdfsites/blanknode/#{term.to_s}/"
         else
           begin
-            uri = URI::split(term.to_s)
+            uri = Addressable::URI.parse(term.to_s).to_hash
             file_name = "rdfsites/" # in this directory all external RDF sites are stored
-            if (uri[2] == domain_name)
+            if (uri[:host] == domain_name)
               file_name = ""
-              uri[0] = nil
-              uri[2] = nil
-              if(uri[5].length > baseurl.length)
-                if(uri[5][0..(baseurl.length)].eql? (baseurl + "/"))
-                  uri[5] = uri[5][(baseurl.length)..-1]
+              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
-              elsif(uri[5].eql?(baseurl))
-                uri[5] = nil
+              elsif(uri[:path].eql?(baseurl))
+                uri[:path] = nil
               end
             end
-            (0..8).each do |i|
-              if !(uri[i].nil?)
-                case i
-                when 5
-                  file_name += "#{uri[i][1..-1]}/"
-                when 8
-                  file_name += "#/#{uri[i]}"
+            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[i]}/"
+                  file_name += "#{uri[index]}/"
                 end
               end
             end
             unless file_name[-1] == '/'
               file_name += '/'
             end
-          rescue URI::InvalidURIError #unclean coding: blanknodes are recognized through errors
+          rescue URI::InvalidURIError => x #unclean coding: blanknodes are recognized through errors
             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')
@@ -259,7 +261,6 @@ module Jekyll #:nodoc:
         @render_path = file_name
         file_name
       end
-
     end
   end
 end

data/lib/jekyll-rdf.rb

@@ -30,6 +30,8 @@ require 'jekyll'
 require 'linkeddata'
 require 'sparql'
 require 'set'
+require 'addressable/uri'
+require 'pp'
 
 require 'jekyll/drops/rdf_term'
 require 'jekyll/drops/rdf_statement'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 2.1.0.alpha.pre.186
+  version: 2.1.0.alpha.pre.194
 platform: ruby
 authors:
 - Elias Saalmann
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata