jekyll-rdf 3.1.1.pre.develop.701 → 3.1.1.pre.develop.702

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37ec15b87ba7bc0fb5aa7a6e32ef22708d6e88ecb098a2b755a0c85108a77e19
-  data.tar.gz: f0f21d0e340c2b66dd7ae57645edfdc21c187a66267214cebbf95ba63c9a54b0
+  metadata.gz: 778b8d0b842c7ec97a201bdde42aab1ca10ef30d9d997ec3f18364a52cdd3e60
+  data.tar.gz: 355c3c76d1edf5c5ab6d79b6ee8d36f6f205b49725392e7b607972ad06e67a98
 SHA512:
-  metadata.gz: 7510df3def5f91ba7e0c03dbe0376a119ed0f625aa8d07bbec15012a4725ce4ef1b8c1259261e47bee8821123c39f5c6572152fa76f038518900eb88f69221a3
-  data.tar.gz: 0b38e389cfd959ec21e98e76f8e4a19773349a27058de8db7d9d393575b987f2de1bb290717a2067dab5db9e325acc30e407968839750d80386068e9981a691f
+  metadata.gz: 5afc53787251593f1d94d98cd2e2d2c2af716a45fe735447e4323d7c0fa4bc6fa5572091ca6954b81d469bde00ae1f3393fe70885113bd0b0c6f7c9215a248f2
+  data.tar.gz: 619e6ce00fcc8e42a6ef1afa83dd578b6d5d1b5c69920fc83d97100757b133b446a003258f5cf8f96249902fae6d1d7a28476548f91656622c1253c8c5201dff

data/lib/jekyll-rdf.rb

@@ -43,6 +43,7 @@ require 'jekyll/drops/rdf_statement'
 require 'jekyll/drops/rdf_literal'
 require 'jekyll/drops/rdf_resource'
 require 'jekyll/drops/rdf_resource_class'
+require 'jekyll/drops/rdf_graph'
 require 'jekyll/exceptions/NoPrefixMapped'
 require 'jekyll/exceptions/NoPrefixesDefined'
 require 'jekyll/exceptions/UnMarkedUri'

data/lib/jekyll/drops/rdf_graph.rb

@@ -0,0 +1,56 @@
+##
+# MIT License
+#
+# Copyright (c) 2016 Elias Saalmann, Christian Frommert, Simon Jakobi,
+# Arne Jonas Präger, Maxi Bornmann, Georg Hackel, Eric Füg
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+module Jekyll #:nodoc:
+  module JekyllRdf #:nodoc:
+    module Drops #:nodoc:
+      class RdfGraph < Liquid::Drop
+        attr_reader :graph
+
+        def initialize(graph)
+          @graph = graph
+        end
+
+        def to_s
+          to_nquads
+        end
+
+        def to_nquads
+          result = @graph.statements.map{|state|
+            state.to_nquads
+          }.join("")
+          return result
+        end
+
+        def to_ntriples
+          result = @graph.statements.map{|state|
+            state.to_ntriples
+          }.join("")
+          return result
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/filters/rdf_sparql_query.rb

@@ -38,27 +38,14 @@ module Jekyll
       # * +query+ - the SPARQL query
       #
       def sparql_query(resource = nil, query)
-        query = query.clone #sometimes liquid wont reinit static strings in for loops
-        if(rdf_substitude_nil?(resource))
-          query.gsub!('?resourceUri', "<#{Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].term}>")
-        elsif(resource.class <= Array)
-          resource.each_with_index do |uri, index|
-            return unless valid_resource?(uri)
-            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)}")
-            end
-          end
-        else
-          return unless valid_resource?(resource)
-          query.gsub!('?resourceUri', to_string_wrap(resource))
-        end if query.include? '?resourceUri'  #the only purpose of the if statement is to substitute ?resourceUri
-        unless Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefixes"].nil?
-          query = query.prepend(" ").prepend(Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefixes"])
-        end
+        query = prepare_query(resource, query)
+        return if query.nil?
         begin
-          result = Jekyll::JekyllRdf::Helper::RdfHelper::sparql.query(query).map do |solution|
+          result = Jekyll::JekyllRdf::Helper::RdfHelper::sparql.query(query)
+          if (result.class == RDF::Graph)
+            return Jekyll::JekyllRdf::Drops::RdfGraph.new(result)
+          end
+          result.map! do |solution|
             hsh = solution.to_h
             hsh.update(hsh){ |k,v| Jekyll::JekyllRdf::Drops::RdfTerm.build_term_drop(v, Jekyll::JekyllRdf::Helper::RdfHelper::site, true).add_necessities(Jekyll::JekyllRdf::Helper::RdfHelper::site, Jekyll::JekyllRdf::Helper::RdfHelper::page)}
             hsh.collect{|k,v| [k.to_s, v]}.to_h

data/lib/jekyll/helper/rdf_filter_helper.rb

@@ -55,6 +55,29 @@ module Jekyll
             return false
           end
         end
+
+        def prepare_query(resource = nil, query)
+          query = query.clone #sometimes liquid wont reinit static strings in for loops
+          if(rdf_substitude_nil?(resource))
+            query.gsub!('?resourceUri', "<#{Jekyll::JekyllRdf::Helper::RdfHelper::page.data['rdf'].term}>")
+          elsif(resource.class <= Array)
+            resource.each_with_index do |uri, index|
+              return nil unless valid_resource?(uri)
+              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)}")
+              end
+            end
+          else
+            return nil unless valid_resource?(resource)
+            query.gsub!('?resourceUri', to_string_wrap(resource))
+          end if query.include? '?resourceUri'  #the only purpose of the if statement is to substitute ?resourceUri
+          unless Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefixes"].nil?
+            query = query.prepend(" ").prepend(Jekyll::JekyllRdf::Helper::RdfHelper::prefixes["rdf_prefixes"])
+          end
+          return query
+        end
       end
 
       module PrefixSolver

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 3.1.1.pre.develop.701
+  version: 3.1.1.pre.develop.702
 platform: ruby
 authors:
 - Elias Saalmann
@@ -207,6 +207,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-rdf.rb
+- lib/jekyll/drops/rdf_graph.rb
 - lib/jekyll/drops/rdf_literal.rb
 - lib/jekyll/drops/rdf_resource.rb
 - lib/jekyll/drops/rdf_resource_class.rb