jekyll-rdf 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 110cb3800452fb5622a7f01dd39c367ed6d4a181
-  data.tar.gz: d7bd153e3055b51569e85fcaae039db8b44e60ad
+  metadata.gz: d437bb55ab5b1de0a9ab46821413726b54f999cd
+  data.tar.gz: 06cacb32344903476f740d2e2c94417128bbf4ac
 SHA512:
-  metadata.gz: 8ace2caa161e8103fdb6d2de6f60fb570a0103fba2c9e6a16e571e68fbab0ba67d7a6d865d97aa5fa470d851998edaa60853015278824b74660c60dc7596c2ee
-  data.tar.gz: eeef2100f84e9d3b2272ed15e41f95f8386d8319e87068102ea29d50dd529c1ab35cbea5c48e0a4761511b0aef64fa98e6f082389a48bf8ac67deca61cdbb08c
+  metadata.gz: ac26c4881a6e16baf237ddca55ccddd118277c206350b848f11ba4224b10fb03f878049d60d770c81f362a465149aae46e967e5634d323133a73dc4d196e509d
+  data.tar.gz: 339fd31d9dd6345d0f7a422f1d4af3ae00b6eda2e51c168867818bd69be29a3ec53748eca3e4bb0daaec08867be15ba5266abe0207127d52983e23df0cf389ec

data/lib/jekyll/drops/rdf_resource.rb

@@ -1,19 +1,23 @@
-module Jekyll
-  module Drops
+module Jekyll #:nodoc:
+  module Drops #:nodoc:
+
+    ##
+    # Represents an RDF resource to the Liquid template engine
+    #
     class RdfResource < RdfTerm
-      
+
       ##
       # The Jekyll::Site of this Jekyll::Drops::RdfResource
       #
       attr_accessor :site
-      
+
       ##
       # The Jekyll::RdfPageData of this Jekyll::Drops::RdfResource
       #
       attr_accessor :page
 
       ##
-      # Return a list of Jekyll::Drops::RdfStatements whose subject, predicate or object is the RDF resource represented by the receiver 
+      # Return a list of Jekyll::Drops::RdfStatements whose subject, predicate or object is the RDF resource represented by the receiver
       #
       def statements
         @statements ||= statements_as_subject + statements_as_predicate + statements_as_object
@@ -53,14 +57,18 @@ module Jekyll
       def types
         @types ||= begin
           types = [ term.to_s ]
-          t = statements_as(:subject).find{ |s| s.predicate.term.to_s=="http://www.w3.org/1999/02/22-rdf-syntax-ns#type" }
-          if t
+          selection = statements_as(:subject).select{ |s| s.predicate.term.to_s=="http://www.w3.org/1999/02/22-rdf-syntax-ns#type" }
+          unless selection.empty?
+            t = selection.first
+            if selection.count > 1
+              Jekyll.logger.warn "Resource #{name} has multiple RDFS types. Will use #{t.object.term.to_s} for template mapping.  "
+            end
             types << t.object.term.to_s
             t = t.object
-            while t.super_class
-              s = t.super_class
+            s = t.super_class
+            while s
               types << s.term.to_s
-              t = s
+              s = s.super_class
             end
           end
           types
@@ -71,9 +79,13 @@ module Jekyll
       # Return the first super class resource of the receiver or nil, if no super class resource can be found
       #
       def super_class
-        s = statements_as(:subject).find{ |s| s.predicate.term.to_s=="http://www.w3.org/2000/01/rdf-schema#subClassOf" }
-        if s
-          s.object
+        selection = statements_as(:subject).select{ |s| s.predicate.term.to_s=="http://www.w3.org/2000/01/rdf-schema#subClassOf" }
+        unless selection.empty?
+          super_class = selection.first
+          if selection.count > 1
+            Jekyll.logger.warn "Type #{name} has multiple RDFS super classes. Will use #{super_class.object.term.to_s} for template mapping.  "
+          end
+          super_class.object
         end
       end
 
@@ -86,14 +98,14 @@ module Jekyll
           n ? n.object.name : term.to_s
         end
       end
-      
+
       ##
       # Return the URL of the page representing this RdfResource
       #
       def page_url
         page ? page.url.chomp('index.html') : term.to_s
       end
-      
+
       ##
       # Return a list of RDF statements where the represented RDF resource plays a role
       # * +role+ - which role the represented RDF resource should play:

data/lib/jekyll/filters/rdf_property.rb

@@ -1,14 +1,24 @@
 module Jekyll
+
+  ##
+  # Internal module to hold the medthod #rdf_property
+  #
   module RdfProperty
 
-    def rdf_property(input, params)
+    ##
+    # Computes all objects for which statements exist containing the given subject and predicate and returns any of them
+    #
+    # * +input+ - is the subject of the statements to be matched
+    # * +predicate+ - is the predicate of the statements to be matched
+    # * +lang+ - (optional) preferred language of a the returned object. The precise implementation of choosing which object to returned (both in case a language is supplied and in case is not supplied) is undefined
+    #
+    def rdf_property(input, predicate, lang = nil)
       return input unless input.is_a?(Jekyll::Drops::RdfResource)
       begin
-        params = params.split(",")
-        results = input.page.data['rdf'].statements_as_subject.select{ |s| s.predicate.term.to_s == params[0] }
-        lang = params[1] || input.site.config['language']
-        if results.count > 1 && results.first.object.term.is_a?(RDF::Term)
-          p = results.find{ |s| s.object.term.language == lang }
+        results = input.page.data['rdf'].statements_as_subject.select{ |s| s.predicate.term.to_s == predicate }
+        lang ||= input.site.config['jekyll_rdf']['language']
+        if results.count > 1 && results.first.object.term.is_a?(RDF::Term) && lang != nil
+          p = results.find{ |s| s.object.term.language == lang.to_sym }
         end
         p = results.first unless p
         return unless p

data/lib/jekyll/filters/rdf_property_list.rb

@@ -1,12 +1,29 @@
 module Jekyll
+
+  ##
+  # Internal module to hold the method #rdf_property
+  #
   module RdfPropertyList
 
-    def rdf_property_list(input, property)
+    ##
+    # Computes all objects for which statements exist containing the given subject and predicate and returns an Array of them
+    #
+    # * +input+ - is the subject of the statements to be matched
+    # * +predicate+ - is the predicate of the statements to be matched
+    # * +lang+ - (optional) preferred language of the returned objects. If 'cfg' is specified the preferred language is provides by the site configuration _config.yml
+    #
+    def rdf_property_list(input, predicate, lang = nil)
       return input unless input.is_a?(Jekyll::Drops::RdfResource)
       begin
-        result = input.page.data['rdf'].statements_as_subject.select{ |s| s.predicate.term.to_s == property }.map{|p| p.object.name}
+        result = input.page.data['rdf'].statements_as_subject.select{ |s| s.predicate.term.to_s == predicate } # select all matching statements with given predicate
+        if lang != nil
+          if lang == 'cfg'
+            lang = input.site.config['jekyll_rdf']['language']
+          end
+          result = result.select{ |s| s.object.term.language == lang.to_sym } # select all statements with matching language
+        end
         return unless result
-        result
+        result.map{|p| p.object.name}
       end
     end
 

data/lib/jekyll/filters/rdf_sparql_query.rb

@@ -1,6 +1,17 @@
 module Jekyll
+    
+  ##
+  # Internal module to hold the medthod #sparql_query
+  #
   module RdfSparqlQuery
 
+    ##
+    # Executes a SPARQL query. The supplied query is augmented by replacing each occurence of '?resourceUri' by the URI of the context RDF resource.
+    # Returns an Array of bindings. Each binding is a Hash mapping variables to their values.
+    #
+    # * +input+ - the context RDF resource
+    # * +query+ - the SPARQL query
+    #
     def sparql_query(input, query)
       return input unless input.is_a?(Jekyll::Drops::RdfResource)
       query.gsub!('?resourceUri', "<#{input.term.to_s}>")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rdf
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Elias Saalmann