jekyll-rdf 3.0.0.pre.develop.370 → 3.0.0.pre.develop.371

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 775e989fcd812cc52e1d3b838661d3c54d777fbc2c01d0336a2b32b5ddea8ca7
-  data.tar.gz: df46278f14cb1079d0e5ee327d6afbf33e619ade2175cd30092b5522b80ad20c
+  metadata.gz: fcc48f965bf0e896c8abda64247b1223abc6610f4ef6f49ff76b5a320c4c8438
+  data.tar.gz: ef1208cc1c74fc71d64431b88bb1dfdfdeaae56063ca0ced51dc60d4f0766ec0
 SHA512:
-  metadata.gz: f3eaf50c77d60e0376160001bf06029b83c7aa6984f51c534f46af86da299f7ef7638240f8b61e893ddac6e9bdc1e9441a6d568ab8bcd309954f3ad7f3df109f
-  data.tar.gz: adcf92c3cdfaf50c173182524af45bc4ddbbd1ac7456245c81abae316de6a0115383e18d311c0c37262d09b3ce052200f781664cf94b4aaa39e741f95e00e2bb
+  metadata.gz: 37c031d26d90a4113a8dad61b796af8a1b564b586349473272f33b0583f2dbc7f17af67f0cd1b04fb9884787cd704b48882c69546cfb71b2f43f5c9c595363c4
+  data.tar.gz: cd8bb9352fa2c8cd4fe282bb85b390f228258bc0aee043de9a90f67a7adfb6e12edea73eeebb64577a56b6f44f52ac58101d06fb187237573c9e7e5d8bcccd69

data/lib/jekyll/filters/rdf_collection.rb

@@ -30,8 +30,9 @@ module Jekyll
       def rdf_collection(input, predicate = nil)
         input = rdf_page_to_resource(input)
         return unless valid_resource?(input)
-        query = "SELECT ?f WHERE{ #{input.term.to_ntriples} " <<
-          (predicate.nil? ? "" : " <#{rdf_resolve_prefix(predicate)}> ?coll . ?coll ") <<
+        input = to_string_wrap(input)
+        query = "SELECT ?f WHERE{ #{input} " <<
+          (predicate.nil? ? "" : " #{rdf_resolve_prefix(predicate)} ?coll . ?coll ") <<
           " <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::JekyllRdf::Helper::RdfHelper::sparql.query(query).each{ |solution|

data/lib/jekyll/filters/rdf_container.rb

@@ -30,7 +30,7 @@ module Jekyll
         input = rdf_page_to_resource(input)
         return unless valid_resource?(input)
         sparql_client = Jekyll::JekyllRdf::Helper::RdfHelper::sparql
-        n_triples = input.term.to_ntriples
+        n_triples = to_string_wrap(input)
         if(!(valid_container?(n_triples, type)))
           Jekyll.logger.error "#{n_triples} is not recognized as a container"
           return []

data/lib/jekyll/filters/rdf_get.rb

@@ -33,11 +33,11 @@ module Jekyll
     module Filter
       def rdf_get(request_uri)
         request_uri = "<#{Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].term.to_s}>" if (rdf_page_to_resource?(request_uri))
-        request_uri = rdf_resolve_prefix(request_uri)
         return unless valid_resource?(request_uri)
-        ask_exist = "ASK WHERE {{<#{request_uri}> ?p ?o}UNION{?s <#{request_uri}> ?o}UNION{?s ?p <#{request_uri}>}} "
+        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}}} "
         return unless (Jekyll::JekyllRdf::Helper::RdfHelper::sparql.query(ask_exist).true?)
-        Jekyll::JekyllRdf::Drops::RdfResource.new(RDF::URI(request_uri), Jekyll::JekyllRdf::Helper::RdfHelper::site, Jekyll::JekyllRdf::Helper::RdfHelper::page)
+        Jekyll::JekyllRdf::Drops::RdfResource.new(RDF::URI(request_uri[1..-2]), Jekyll::JekyllRdf::Helper::RdfHelper::site, Jekyll::JekyllRdf::Helper::RdfHelper::page)
       end
     end
   end

data/lib/jekyll/filters/rdf_page_to_resource.rb

@@ -14,6 +14,16 @@ module Jekyll
       def valid_resource?(input)
         return (input.class <= String || input.class <= Jekyll::JekyllRdf::Drops::RdfResource)
       end
+
+      def to_string_wrap(input)
+        if(input.class <= Jekyll::JekyllRdf::Drops::RdfResource)
+          return input.term.to_ntriples
+        elsif(input.class <= String)
+          return rdf_resolve_prefix(input)
+        else
+          return false
+        end
+      end
     end
   end
 end

data/lib/jekyll/filters/rdf_property.rb

@@ -50,7 +50,7 @@ module Jekyll
         input = rdf_page_to_resource(input)
         return unless valid_resource?(input)
         predicate = rdf_resolve_prefix(predicate)
-        result = filter_statements(input.term.to_ntriples, predicate, inverse, lang)
+        result = filter_statements(to_string_wrap(input), predicate, inverse, lang)
         return unless !result.empty?
         if(list)
           return result
@@ -71,13 +71,13 @@ module Jekyll
         end
 
         if(inverse)
-          query = "SELECT ?s WHERE{ ?s <#{predicate}> #{n_triples} }"
+          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)
           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} }"
+          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} }"
           result = client.query(query).map do |solution|
             dist_literal_resource(solution)
           end

data/lib/jekyll/filters/rdf_resolve_prefix.rb

@@ -29,7 +29,7 @@ module Jekyll
       private
       def rdf_resolve_prefix(predicate)
         if(predicate[0] == "<" && predicate[-1] == ">")
-          return predicate[1..-2]
+          return predicate
         end
         arr=predicate.split(":",2)  #bad regex, would also devide 'http://example....' into 'http' and '//example....',even though it is already a complete URI; if 'PREFIX http: <http://...> is defined, 'http' in 'http://example....' could be mistaken for a prefix
         if((arr[1].include? (":")) || (arr[1][0..1].eql?("//")))
@@ -37,7 +37,7 @@ module Jekyll
         end
         if(!Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefixes"].nil?)
           if(!Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefix_map"][arr[0]].nil?)
-            return arr[1].prepend(Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefix_map"][arr[0]])
+            return "<#{arr[1].prepend(Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefix_map"][arr[0]])}>"
           else
             raise NoPrefixMapped.new(predicate, Jekyll::JekyllRdf::Helper::RdfHelper::page.data['template'], arr[0]) #TODO .data['template'] is only defined on RdfPages
           end

data/lib/jekyll/filters/rdf_sparql_query.rb

@@ -46,12 +46,12 @@ module Jekyll
             if(uri.class <= Jekyll::JekyllRdf::Drops::RdfResource)
               query.gsub!("?resourceUri_#{index}", uri.term.to_ntriples)
             else
-              query.gsub!("?resourceUri_#{index}", "<#{rdf_resolve_prefix(uri.to_s)}>")
+              query.gsub!("?resourceUri_#{index}", "#{rdf_resolve_prefix(uri.to_s)}")
             end
           end
         else
           return unless valid_resource?(resource)
-          query.gsub!('?resourceUri', "<#{resource}>")
+          query.gsub!('?resourceUri', to_string_wrap(resource))
         end if query.include? '?resourceUri'  #the only purpose of the if statement is to substitute ?resourceUri
         if(!Jekyll::JekyllRdf::Helper::RdfHelper::page.data["rdf_prefixes"].nil?)
           query = query.prepend(" ").prepend(Jekyll::JekyllRdf::Helper::RdfHelper::page.data["rdf_prefixes"])

metadata

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