jekyll-rdf 3.0.1.pre.develop.579 → 3.0.1.pre.develop.581

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23402ccc98de331dd3e5a5adb29d4ffb21a1428adb048721c09c8b2752226d00
-  data.tar.gz: 4ab8f5d76090c16b57c4c31d955e64272273b5b63cdabc9fc6630d4b1c14cde4
+  metadata.gz: 7fe7725feec07f050150b556d62b3098bc2e1adc136fa80015c595f6b9927a97
+  data.tar.gz: 651467ec96ff9b14ec4a9880f3a94cbfb3b393d055509c4c70ec5d08e4a48173
 SHA512:
-  metadata.gz: 853671bcd727d1a3669d2ce5026a3098a2adcfe22e17c3c21528fcb55b1516ed1cd19bae36a0f22f3994e88c19a8f9b0bdbe75b5c62c5353b283a82eead046fc
-  data.tar.gz: 8d4c6529f529dad7759aa4777a18e3754815ee61f7eca12477c3922ce2be186045b71c4d5f52d8453cf29ac9848d56328d54ae7b372eefc5d6c6bfc504a0ef5c
+  metadata.gz: 970eb4cd9f3ff41167dde74eb7ee85935b5023900fe064e41214e34ca72bde98ce805733dd79f26018f418275c5ba3602ece5587203156023c4a69b04e208bd4
+  data.tar.gz: 8a82c08902a9f257a9d6ecde34fc6ce10ee77cdbd9fbf3fe6242d84eb0b0af3210ae6fad46f9f2047b7e97e75d9fe92c4cff51d2aabc4c15efd69330e377b212

data/lib/jekyll/drops/rdf_resource.rb

@@ -232,7 +232,9 @@ module Jekyll #:nodoc:
         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)
-          if(!is_lit.nil?&&is_lit.true?)
+          if((!is_lit.nil? && (is_lit.class <= RDF::Literal::Integer) ) && is_lit.nonzero?)#TODO compatibility (to Virtuoso) shouldn't be done inline but in an external file
+            object = RDF::Literal(object_string, language: lang, datatype: RDF::URI(data_type))
+          elsif((!is_lit.nil? && (is_lit.class <= RDF::Literal::Boolean)) && is_lit.true?)  #some endpoints return isLit as integer, some as boolean
             object = RDF::Literal(object_string, language: lang, datatype: RDF::URI(data_type))
           else
             object = RDF::URI(object_string)

data/lib/jekyll/filters/rdf_get.rb

@@ -37,7 +37,13 @@ module Jekyll
         return unless valid_resource?(request_uri) && (!request_uri[0..1].eql? "_:")
         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}}} "
-        Jekyll::JekyllRdf::Drops::RdfResource.new(RDF::URI(request_uri[1..-2]), Jekyll::JekyllRdf::Helper::RdfHelper::site, Jekyll::JekyllRdf::Helper::RdfHelper::page, (Jekyll::JekyllRdf::Helper::RdfHelper::sparql.query(ask_exist).true?))
+        exists = Jekyll::JekyllRdf::Helper::RdfHelper::sparql.query(ask_exist)
+        if(exists.instance_of? RDF::Literal::Boolean)
+          exists = exists.true?
+        else
+          exists = false || exists   #take care of compatibility with virtuoso
+        end
+        Jekyll::JekyllRdf::Drops::RdfResource.new(RDF::URI(request_uri[1..-2]), Jekyll::JekyllRdf::Helper::RdfHelper::site, Jekyll::JekyllRdf::Helper::RdfHelper::page, exists)
       end
     end
   end

data/lib/jekyll/filters/rdf_property.rb

@@ -89,7 +89,7 @@ module Jekyll
       # Distinguishes the solution between an Literal and a Resource
       #
       def dist_literal_resource(solution)
-        if solution.lit.true?
+        if((solution.lit.instance_of?(RDF::Literal::Boolean) && solution.lit.true? )|| (solution.lit.instance_of?(RDF::Literal::Integer) && solution.lit.nonzero?))#TODO compatibility (to Virtuoso) shouldn't be done inline but in an external file
           check = check_solution(solution)
           object = RDF::Literal(solution.o, language: check[:lang], datatype: RDF::URI(check[:dataType]))
           result = Jekyll::JekyllRdf::Drops::RdfLiteral.new(object)

data/lib/jekyll/rdf_main_generator.rb

@@ -48,8 +48,18 @@ module Jekyll
         Jekyll.logger.error("Outdated format in _config.yml:\n  'template_mapping' detected but the following keys must be used now instead:\n    instance_template_mappings -> maps single resources to single layouts\n    class_template_mappings -> maps entire classes of resources to layouts\nJekyll-RDF wont render any pages for #{site.source}")
         return false
       end
-
-      graph = RDF::Graph.load( File.join( site.config['source'], @config['path']))
+      if(!@config['remote'].nil?)
+        if (@config['remote']['endpoint'].nil?)
+          raise ArgumentError, "When the key 'remote' is specified, another subkey 'endpoint' must be specified which contains the location of your graph."
+        else
+          graph = @config['remote']['endpoint'].strip
+        end
+      elsif(!@config['path'].nil?)
+        graph = RDF::Graph.load( File.join( site.config['source'], @config['path']))
+      else
+        Jekyll.logger.error("No sparql endpoint defined. Jumping out of jekyll-rdf processing.")
+        return false
+      end
       sparql = SPARQL::Client.new(graph)
 
       Jekyll::JekyllRdf::Helper::RdfHelper::sparql = sparql
@@ -58,6 +68,11 @@ module Jekyll
 
       # restrict RDF graph with restriction
       resources = extract_resources(@config['restriction'], @config['include_blank'], sparql)
+      Jekyll.logger.info "resources:"
+      resources.each{|resource|
+        Jekyll.logger.info "#{resource}"
+      }
+      Jekyll.logger.info "resources end"
       site.data['sparql'] = sparql
       site.data['resources'] = []
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.0.1.pre.develop.579
+  version: 3.0.1.pre.develop.581
 platform: ruby
 authors:
 - Elias Saalmann
@@ -96,6 +96,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement