rdf-rdfa 1.1.6.1 → 1.99.0

data/lib/rdf/rdfa/reader/nokogiri.rb

@@ -280,7 +280,7 @@ module RDF::RDFa
       # Document errors
       def doc_errors
         # FIXME: Nokogiri version 1.5.5 thinks many HTML5 elements are invalid
-        @doc.errors.reject {|e| e.to_s =~ /(Tag (?:article|aside|audio|canvas|command|datalist|details|embed|figure|footer|header|hgroup|keygen|mark|meter|nav|output|progress|ruby|section|time|video|wbr) invalid|Missing attribute name)/}
+        @doc.errors.reject {|e| e.to_s =~ /(Tag (?:article|aside|audio|canvas|command|datalist|details|embed|figure|footer|header|hgroup|keygen|main|mark|meter|nav|output|progress|ruby|section|time|video|wbr) invalid|Missing attribute name)/}
       end
       
       ##

data/lib/rdf/rdfa/vocab.rb

@@ -1,192 +1,5 @@
 # -*- encoding: utf-8 -*-
 module RDF
-  class PTR < Vocabulary("http://www.w3.org/2009/pointers#")
-    # Class definitions
-    term :ByteOffsetCompoundPointer,
-      comment: %(Pointer to a byte range with a defined start and a byte offset from there.).freeze,
-      label: "Byte Offset Compound Pointer".freeze,
-      subClassOf: "ptr:CompoundPointer".freeze,
-      type: "rdfs:Class".freeze
-    term :ByteOffsetPointer,
-      comment: %(Single pointer using a byte offset from the start of the reference.).freeze,
-      label: "Byte Offset Pointer".freeze,
-      subClassOf: "ptr:OffsetPointer".freeze,
-      type: "rdfs:Class".freeze
-    term :ByteSnippetCompoundPointer,
-      comment: %(Pointer to a range with a defined start and a byte snippet from there.).freeze,
-      label: "Byte Snippet Compound Pointer".freeze,
-      subClassOf: "ptr:CompoundPointer".freeze,
-      type: "rdfs:Class".freeze
-    term :CSSSelectorPointer,
-      comment: %(Single pointer using a CSS selector.).freeze,
-      label: "CSS selector Pointer".freeze,
-      subClassOf: "ptr:ExpressionPointer".freeze,
-      type: "rdfs:Class".freeze
-    term :CharOffsetCompoundPointer,
-      comment: %(Pointer to a char range with a defined start and a char offset from there.).freeze,
-      label: "Char Offset Compound Pointer".freeze,
-      subClassOf: "ptr:CompoundPointer".freeze,
-      type: "rdfs:Class".freeze
-    term :CharOffsetPointer,
-      comment: %(Single pointer using a character offset from the start of the reference.).freeze,
-      label: "Char Offset Pointer".freeze,
-      subClassOf: "ptr:OffsetPointer".freeze,
-      type: "rdfs:Class".freeze
-    term :CharSnippetCompoundPointer,
-      comment: %(Pointer to a range with a defined start and a character snippet from there.).freeze,
-      label: "Char Snippet Compound Pointer".freeze,
-      subClassOf: "ptr:CompoundPointer".freeze,
-      type: "rdfs:Class".freeze
-    term :CompoundPointer,
-      comment: %(An abstract method made of a pair of pointers to a defined section to be subclassed for extensibility.).freeze,
-      label: "Compound Pointer".freeze,
-      subClassOf: "ptr:Pointer".freeze,
-      type: "rdfs:Class".freeze
-    term :EquivalentPointers,
-      comment: %(Group of equivalent pointers that point to the same places.).freeze,
-      label: "Equivalent Pointers".freeze,
-      subClassOf: "ptr:PointersGroup".freeze,
-      type: "rdfs:Class".freeze
-    term :ExpressionPointer,
-      comment: %(Generic single pointer that make use of an expression language such as xPath, CSS selectors, etc.).freeze,
-      label: "Expression Pointer".freeze,
-      subClassOf: "ptr:SinglePointer".freeze,
-      type: "rdfs:Class".freeze
-    term :LineCharPointer,
-      comment: %(Single pointer using line and char numbers.).freeze,
-      label: "Line-Char Pointer".freeze,
-      subClassOf: "ptr:SinglePointer".freeze,
-      type: "rdfs:Class".freeze
-    term :OffsetPointer,
-      comment: %(Generic single pointer based on an offset.).freeze,
-      label: "Offset Pointer".freeze,
-      subClassOf: "ptr:SinglePointer".freeze,
-      type: "rdfs:Class".freeze
-    term :Pointer,
-      comment: %(Abstract Pointer to be subclassed for extensibility.).freeze,
-      label: "Pointer".freeze,
-      type: "rdfs:Class".freeze
-    term :PointersGroup,
-      comment: %(Generic container for a group of Pointers).freeze,
-      label: "Pointers Group".freeze,
-      subClassOf: "ptr:Pointer".freeze,
-      type: "rdfs:Class".freeze
-    term :RelatedPointers,
-      comment: %(Group of related pointers you use together for some purpose.).freeze,
-      label: "Related Pointers".freeze,
-      subClassOf: "ptr:PointersGroup".freeze,
-      type: "rdfs:Class".freeze
-    term :SinglePointer,
-      comment: %(Abstract pointer to a single point to be subclassed for extensibility.).freeze,
-      label: "Single Pointer".freeze,
-      subClassOf: "ptr:Pointer".freeze,
-      type: "rdfs:Class".freeze
-    term :StartEndPointer,
-      comment: %(Compound pointer to a range with a start and an end point.).freeze,
-      label: "Start-End Pointer".freeze,
-      subClassOf: "ptr:CompoundPointer".freeze,
-      type: "rdfs:Class".freeze
-    term :XMLNamespace,
-      comment: %(An XML Namespace.).freeze,
-      label: "XMLNamespace".freeze,
-      type: "rdfs:Class".freeze
-    term :XPathPointer,
-      comment: %(Single pointer using an XPath expression.).freeze,
-      label: "XPath Pointer".freeze,
-      subClassOf: "ptr:ExpressionPointer".freeze,
-      type: "rdfs:Class".freeze
-    term :XPointerPointer,
-      comment: %(Single pointer using an XPointer expression.).freeze,
-      label: "XPointer Pointer".freeze,
-      subClassOf: "ptr:XPathPointer".freeze,
-      type: "rdfs:Class".freeze
-
-    # Property definitions
-    property :byteOffset,
-      comment: %(Number of bytes counting from the start point.).freeze,
-      domain: "ptr:ByteOffsetCompoundPointer".freeze,
-      label: "byte offset".freeze,
-      range: "xsd:positiveInteger".freeze,
-      type: "rdf:Property".freeze
-    property :charNumber,
-      comment: %(Char number within a line starting at one.
-		).freeze,
-      domain: "ptr:LineCharPointer".freeze,
-      label: "char number".freeze,
-      range: "xsd:positiveInteger".freeze,
-      type: "rdf:Property".freeze
-    property :charOffset,
-      comment: %(Number of characters counting from the start point.).freeze,
-      domain: "ptr:CharOffsetCompoundPointer".freeze,
-      label: "char offset".freeze,
-      range: "xsd:positiveInteger".freeze,
-      type: "rdf:Property".freeze
-    property :endPointer,
-      comment: %(Pointer to the end point of the range.).freeze,
-      domain: "ptr:StartEndPointer".freeze,
-      label: "end pointer".freeze,
-      range: "ptr:SinglePointer".freeze,
-      type: "rdf:Property".freeze
-    property :expression,
-      comment: %(Expressions, such as xPath or CSS selectors, that identify points.).freeze,
-      domain: "ptr:ExpressionPointer".freeze,
-      label: "expression".freeze,
-      range: "rdfs:Literal".freeze,
-      type: "rdf:Property".freeze
-    property :groupPointer,
-      comment: %(A Pointer that is part of a Group).freeze,
-      domain: "ptr:PointersGroup".freeze,
-      label: "groupPointer".freeze,
-      range: "ptr:Pointer".freeze,
-      type: "rdf:Property".freeze
-    property :lineNumber,
-      comment: %(Line number within the reference starting at one.
-		).freeze,
-      domain: "ptr:LineCharPointer".freeze,
-      label: "line number".freeze,
-      range: "xsd:positiveInteger".freeze,
-      type: "rdf:Property".freeze
-    property :namespace,
-      comment: %(The namespace being used for the XPath expression.).freeze,
-      domain: "ptr:XPathPointer".freeze,
-      label: "namespace".freeze,
-      range: "ptr:XMLNamespace".freeze,
-      type: "rdf:Property".freeze
-    property :namespaceName,
-      comment: %(The namespace name being used for an XML Namespace.).freeze,
-      domain: "ptr:XMLNamespace".freeze,
-      label: "namespace name".freeze,
-      type: "rdf:Property".freeze
-    property :offset,
-      comment: %(Offset from the start of the reference.).freeze,
-      domain: "ptr:OffsetPointer".freeze,
-      label: "offset".freeze,
-      range: "xsd:positiveInteger".freeze,
-      type: "rdf:Property".freeze
-    property :prefix,
-      comment: %(The namespace prefix being used for an XML Namespace.).freeze,
-      domain: "ptr:XMLNamespace".freeze,
-      label: "prefix".freeze,
-      type: "rdf:Property".freeze
-    property :reference,
-      comment: %(Scope within which a single pointer operates.).freeze,
-      domain: "ptr:SinglePointer".freeze,
-      label: "reference".freeze,
-      type: "rdf:Property".freeze
-    property :startPointer,
-      comment: %(Pointer to the start point of the range in a compound pointer.).freeze,
-      domain: "ptr:CompoundPointer".freeze,
-      label: "start pointer".freeze,
-      range: "ptr:SinglePointer".freeze,
-      type: "rdf:Property".freeze
-    property :version,
-      comment: %(Version for the expression language being used.).freeze,
-      domain: "ptr:ExpressionPointer".freeze,
-      label: "version".freeze,
-      range: "rdfs:Literal".freeze,
-      type: "rdf:Property".freeze
-  end
-
   class RDFA < Vocabulary("http://www.w3.org/ns/rdfa#")
     # Class definitions
     __property__ :DocumentError,

data/lib/rdf/rdfa/writer.rb

@@ -13,10 +13,10 @@ module RDF::RDFa
   # @example Obtaining a RDFa writer class
   #     RDF::Writer.for(:html)          => RDF::RDFa::Writer
   #     RDF::Writer.for("etc/test.html")
-  #     RDF::Writer.for(:file_name      => "etc/test.html")
-  #     RDF::Writer.for(:file_extension => "html")
-  #     RDF::Writer.for(:content_type   => "application/xhtml+xml")
-  #     RDF::Writer.for(:content_type   => "text/html")
+  #     RDF::Writer.for(file_name:      "etc/test.html")
+  #     RDF::Writer.for(file_extension: "html")
+  #     RDF::Writer.for(content_type:   "application/xhtml+xml")
+  #     RDF::Writer.for(content_type:   "text/html")
   #
   # @example Serializing RDF graph into an XHTML+RDFa file
   #     RDF::RDFa::Write.open("etc/test.html") do |writer|
@@ -38,8 +38,8 @@ module RDF::RDFa
   #     end
   #
   # @example Creating @base and @prefix definitions in output
-  #     RDF::RDFa::Writer.buffer(:base_uri => "http://example.com/", :prefixes => {
-  #         :foaf => "http://xmlns.com/foaf/0.1/"}
+  #     RDF::RDFa::Writer.buffer(base_uri: "http://example.com/", prefixes: {
+  #         foaf: "http://xmlns.com/foaf/0.1/"}
   #     ) do |writer|
   #       graph.each_statement do |statement|
   #         writer << statement
@@ -63,7 +63,7 @@ module RDF::RDFa
     attr :heading_predicates
 
     HAML_OPTIONS = {
-      :ugly => false, # to preserve whitespace without using entities
+      ugly: false, # to preserve whitespace without using entities
     }
 
     # @return [Graph] Graph of statements serialized
@@ -93,13 +93,13 @@ module RDF::RDFa
     #   Add standard prefixes to _prefixes_, if necessary.
     # @option options [Array<RDF::URI>] :top_classes ([RDF::RDFS.Class])
     #   Defines rdf:type of subjects to be emitted at the beginning of the document.
-    # @option options [Array<RDF::URI>] :predicate_order ([RDF.type, RDF::RDFS.label, RDF::DC.title])
+    # @option options [Array<RDF::URI>] :predicate_order ([RDF.type, RDF::RDFS.label, RDF::Vocab::DC.title])
     #   Defines order of predicates to to emit at begninning of a resource description..
-    # @option options [Array<RDF::URI>] :heading_predicates ([RDF::RDFS.label, RDF::DC.title])
+    # @option options [Array<RDF::URI>] :heading_predicates ([RDF::RDFS.label, RDF::Vocab::DC.title])
     #   Defines order of predicates to use in heading.
     # @option options [String, Symbol, Hash{Symbol => String}] :haml (DEFAULT_HAML) HAML templates used for generating code
     # @option options [Hash] :haml_options (HAML_OPTIONS)
-    #   Options to pass to Haml::Engine.new. Default options set `:ugly => false` to ensure that whitespace in literals with newlines is properly preserved.
+    #   Options to pass to Haml::Engine.new. Default options set `ugly: false` to ensure that whitespace in literals with newlines is properly preserved.
     # @yield  [writer]
     # @yieldparam [RDF::Writer] writer
     def initialize(output = $stdout, options = {}, &block)
@@ -107,8 +107,8 @@ module RDF::RDFa
         @uri_to_term_or_curie = {}
         @uri_to_prefix = {}
         @top_classes = options[:top_classes] || [RDF::RDFS.Class]
-        @predicate_order = options[:predicate_order] || [RDF.type, RDF::RDFS.label, RDF::DC.title]
-        @heading_predicates = options[:heading_predicates] || [RDF::RDFS.label, RDF::DC.title]
+        @predicate_order = options[:predicate_order] || [RDF.type, RDF::RDFS.label, RDF::URI("http://purl.org/dc/terms/title")]
+        @heading_predicates = options[:heading_predicates] || [RDF::RDFS.label, RDF::URI("http://purl.org/dc/terms/title")]
         @graph = RDF::Graph.new
 
         block.call(self) if block_given?
@@ -181,7 +181,7 @@ module RDF::RDFa
       doc_title = nil
       titles = {}
       heading_predicates.each do |pred|
-        @graph.query(:predicate => pred) do |statement|
+        @graph.query(predicate: pred) do |statement|
           titles[statement.subject] ||= statement.object
         end
       end
@@ -190,10 +190,10 @@ module RDF::RDFa
 
       # Generate document
       doc = render_document(subjects,
-        :lang     => @lang,
-        :base     => base_uri,
-        :title    => doc_title,
-        :prefix   => prefix) do |s|
+        lang:     @lang,
+        base:     base_uri,
+        title:    doc_title,
+        prefix:   prefix) do |s|
         subject(s)
       end
       @output.write(doc)
@@ -227,9 +227,9 @@ module RDF::RDFa
     def render_document(subjects, options = {})
       template = options[:haml] || :doc
       options = {
-        :prefix => nil,
-        :subjects => subjects,
-        :title => nil,
+        prefix: nil,
+        subjects: subjects,
+        title: nil,
       }.merge(options)
       hamlify(template, options) do |subject|
         yield(subject) if block_given?
@@ -272,15 +272,15 @@ module RDF::RDFa
     def render_subject(subject, predicates, options = {})
       template = options[:haml] || :subject
       options = {
-        :about      => (get_curie(subject) unless options[:rel]),
-        :base       => base_uri,
-        :element    => nil,
-        :predicates => predicates,
-        :rel        => nil,
-        :inlist     => nil,
-        :resource   => (get_curie(subject) if options[:rel]),
-        :subject    => subject,
-        :typeof     => nil,
+        about:      (get_curie(subject) unless options[:rel]),
+        base:       base_uri,
+        element:    nil,
+        predicates: predicates,
+        rel:        nil,
+        inlist:     nil,
+        resource:   (get_curie(subject) if options[:rel]),
+        subject:    subject,
+        typeof:     nil,
       }.merge(options)
       hamlify(template, options) do |predicate|
         yield(predicate) if block_given?
@@ -331,7 +331,7 @@ module RDF::RDFa
 
           add_debug {"list: #{list.inspect} #{list.to_a}"}
           depth do
-            render_property(predicate, list.to_a, options.merge(:inlist => "true")) do |object|
+            render_property(predicate, list.to_a, options.merge(inlist: "true")) do |object|
               yield(object, true) if block_given?
             end
           end
@@ -352,12 +352,12 @@ module RDF::RDFa
             :property_values :
             :property_value)
         options = {
-          :objects    => objects,
-          :object     => objects.first,
-          :predicate  => predicate,
-          :property   => get_curie(predicate),
-          :rel        => get_curie(predicate),
-          :inlist     => nil,
+          objects:    objects,
+          object:     objects.first,
+          predicate:  predicate,
+          property:   get_curie(predicate),
+          rel:        get_curie(predicate),
+          inlist:     nil,
         }.merge(options)
         hamlify(template, options, &block)
       end
@@ -410,7 +410,7 @@ module RDF::RDFa
       top_classes.
       select {|s| !seen.include?(s)}.
       each do |class_uri|
-        graph.query(:predicate => RDF.type, :object => class_uri).map {|st| st.subject}.sort.uniq.each do |subject|
+        graph.query(predicate: RDF.type, object: class_uri).map {|st| st.subject}.sort.uniq.each do |subject|
           #add_debug {"order_subjects: #{subject.inspect}"}
           subjects << subject
           seen[subject] = true
@@ -505,7 +505,7 @@ module RDF::RDFa
 
       add_debug {"props: #{prop_list.inspect}"}
 
-      render_opts = {:typeof => typeof, :property_values => properties}.merge(options)
+      render_opts = {typeof: typeof, property_values: properties}.merge(options)
 
       render_subject_template(subject, prop_list, render_opts)
     end
@@ -514,7 +514,7 @@ module RDF::RDFa
     # @return [Hash{String => Object}]
     def properties_for_subject(subject)
       properties = {}
-      @graph.query(:subject => subject) do |st|
+      @graph.query(subject: subject) do |st|
         key = st.predicate.to_s.freeze
         properties[key] ||= []
         properties[key] << st.object
@@ -587,7 +587,7 @@ module RDF::RDFa
       render_property(predicate, objects) do |o, inlist=nil|
         # Yields each object, for potential recursive definition.
         # If nil is returned, a leaf is produced
-        depth {subject(o, :rel => get_curie(predicate), :inlist => inlist, :element => (:li if objects.length > 1 || inlist))} if !is_done?(o) && @subjects.include?(o)
+        depth {subject(o, rel: get_curie(predicate), inlist: inlist, element: (:li if objects.length > 1 || inlist))} if !is_done?(o) && @subjects.include?(o)
       end
     end
 

data/lib/rdf/rdfa/writer/haml_templates.rb

@@ -3,18 +3,18 @@ module RDF::RDFa
   class Writer
     # The default set of HAML templates used for RDFa code generation
    BASE_HAML = {
-     :identifier => "base", 
+     identifier: "base", 
       # Document
       # Locals: language, title, prefix, base, subjects
       # Yield: subjects.each
-      :doc => %q(
+      doc: %q(
         !!! XML
         !!! 5
-        %html{:xmlns => "http://www.w3.org/1999/xhtml", :lang => lang, :prefix => prefix}
+        %html{xmlns: "http://www.w3.org/1999/xhtml", lang: lang, prefix: prefix}
           - if base || title
             %head
               - if base
-                %base{:href => base}
+                %base{href: base}
               - if title
                 %title= title
           %body
@@ -31,15 +31,15 @@ module RDF::RDFa
       #
       # Locals: subject, typeof, predicates, rel, element, inlist
       # Yield: predicates.each
-      :subject => %q(
+      subject: %q(
         - if element == :li
-          %li{:rel => rel, :resource => (about || resource), :typeof => typeof, :inlist => inlist}
+          %li{rel: rel, resource: (about || resource), typeof: typeof, inlist: inlist}
             - if typeof
               %span.type!= typeof
             - predicates.each do |predicate|
               != yield(predicate)
         - else
-          %div{:rel => rel, :resource => (about || resource), :typeof => typeof, :inlist => inlist}
+          %div{rel: rel, resource: (about || resource), typeof: typeof, inlist: inlist}
             - if typeof
               %span.type!= typeof
             - predicates.each do |predicate|
@@ -51,9 +51,9 @@ module RDF::RDFa
       # Yields: object
       # If nil is returned, render as a leaf
       # Otherwise, render result
-      :property_value => %q(
+      property_value: %q(
         - if heading_predicates.include?(predicate) && object.literal?
-          %h1{:property => get_curie(predicate), :content => get_content(object), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(get_value(object))
+          %h1{property: get_curie(predicate), content: get_content(object), lang: get_lang(object), datatype: get_dt_curie(object), inlist: inlist}= escape_entities(get_value(object))
         - else
           %div.property
             %span.label
@@ -61,21 +61,21 @@ module RDF::RDFa
             - if res = yield(object)
               != res
             - elsif get_curie(object) == 'rdf:nil'
-              %span{:rel => get_curie(predicate), :inlist => ''}
+              %span{rel: get_curie(predicate), inlist: ''}
             - elsif object.node?
-              %span{:property => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
+              %span{property: get_curie(predicate), resource: get_curie(object), inlist: inlist}= get_curie(object)
             - elsif object.uri?
-              %a{:property => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
+              %a{property: get_curie(predicate), href: object.to_s, inlist: inlist}= object.to_s
             - elsif object.datatype == RDF.XMLLiteral
-              %span{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}<!= get_value(object)
+              %span{property: get_curie(predicate), lang: get_lang(object), datatype: get_dt_curie(object), inlist: inlist}<!= get_value(object)
             - else
-              %span{:property => get_curie(predicate), :content => get_content(object), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(get_value(object))
+              %span{property: get_curie(predicate), content: get_content(object), lang: get_lang(object), datatype: get_dt_curie(object), inlist: inlist}= escape_entities(get_value(object))
       ),
 
       # Output for multi-valued properties
       # Locals: predicate, :objects, :inlist
       # Yields: object for leaf resource rendering
-      :property_values =>  %q(
+      property_values:  %q(
         %div.property
           %span.label
             = get_predicate_name(predicate)
@@ -84,14 +84,14 @@ module RDF::RDFa
               - if res = yield(object)
                 != res
               - elsif object.node?
-                %li{:property => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
+                %li{property: get_curie(predicate), resource: get_curie(object), inlist: inlist}= get_curie(object)
               - elsif object.uri?
                 %li
-                  %a{:property => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
+                  %a{property: get_curie(predicate), href: object.to_s, inlist: inlist}= object.to_s
               - elsif object.datatype == RDF.XMLLiteral
-                %li{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_curie(object.datatype), :inlist => inlist}<!= get_value(object)
+                %li{property: get_curie(predicate), lang: get_lang(object), datatype: get_curie(object.datatype), inlist: inlist}<!= get_value(object)
               - else
-                %li{:property => get_curie(predicate), :content => get_content(object), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(get_value(object))
+                %li{property: get_curie(predicate), content: get_content(object), lang: get_lang(object), datatype: get_dt_curie(object), inlist: inlist}= escape_entities(get_value(object))
       ),
     }
 
@@ -99,17 +99,17 @@ module RDF::RDFa
     # This version does not perform recursive object generation and does not attempt
     # to create human readable output.
     MIN_HAML = {
-      :identifier => "min", 
+      identifier: "min", 
       # Document
       # Locals: language, title, prefix, base, subjects
       # Yield: subjects.each
-      :doc => %q(
+      doc: %q(
         !!! XML
         !!! 5
-        %html{:xmlns => "http://www.w3.org/1999/xhtml", :lang => lang, :prefix => prefix}
+        %html{xmlns: "http://www.w3.org/1999/xhtml", lang: lang, prefix: prefix}
           - if base
             %head
-              %base{:href => base}
+              %base{href: base}
           %body
             - subjects.each do |subject|
               != yield(subject)
@@ -120,8 +120,8 @@ module RDF::RDFa
       #
       # Locals: about, typeof, predicates, :inlist
       # Yield: predicates.each
-      :subject => %q(
-        %div{:rel => rel, :resource => (about || resource), :typeof => typeof}
+      subject: %q(
+        %div{rel: rel, resource: (about || resource), typeof: typeof}
           - predicates.each do |predicate|
             != yield(predicate)
       ),
@@ -132,40 +132,40 @@ module RDF::RDFa
       # Yields: object
       # If nil is returned, render as a leaf
       # Otherwise, render result
-      :property_value => %q(
+      property_value: %q(
       - if res = yield(object)
         != res
       - elsif get_curie(object) == 'rdf:nil'
-        %span{:rel => get_curie(predicate), :inlist => ''}
+        %span{rel: get_curie(predicate), inlist: ''}
       - elsif object.node?
-        %span{:property => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
+        %span{property: get_curie(predicate), resource: get_curie(object), inlist: inlist}= get_curie(object)
       - elsif object.uri?
-        %a{:property => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
+        %a{property: get_curie(predicate), href: object.to_s, inlist: inlist}= object.to_s
       - elsif object.datatype == RDF.XMLLiteral
-        %span{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}<!= get_value(object)
+        %span{property: get_curie(predicate), lang: get_lang(object), datatype: get_dt_curie(object), inlist: inlist}<!= get_value(object)
       - else
-        %span{:property => get_curie(predicate), :content => get_content(object), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(get_value(object))
+        %span{property: get_curie(predicate), content: get_content(object), lang: get_lang(object), datatype: get_dt_curie(object), inlist: inlist}= escape_entities(get_value(object))
       )
     }
 
     DISTILLER_HAML = {
-      :identifier => "distiller", 
+      identifier: "distiller", 
       # Document
       # Locals: language, title, prefix, base, subjects
       # Yield: subjects.each
-      :doc => %q(
+      doc: %q(
         !!! XML
         !!! 5
-        %html{:xmlns => "http://www.w3.org/1999/xhtml", :lang => lang, :prefix => prefix}
+        %html{xmlns: "http://www.w3.org/1999/xhtml", lang: lang, prefix: prefix}
           - if base || title
             %head
               - if base
-                %base{:href => base}
+                %base{href: base}
               - if title
                 %title= title
-              %link{:rel => "stylesheet", :href => "http://rdf.kellogg-assoc.com/css/distiller.css", :type => "text/css"}
-              %script{:src => "https://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js", :type => "text/javascript"}
-              %script{:src => "http://rdf.kellogg-assoc.com/js/distiller.js", :type => "text/javascript"}
+              %link{rel: "stylesheet", href: "http://rdf.kellogg-assoc.com/css/distiller.css", type: "text/css"}
+              %script{src: "https://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js", type: "text/javascript"}
+              %script{src: "http://rdf.kellogg-assoc.com/js/distiller.js", type: "text/javascript"}
           %body
             - if base
               %p= "RDFa serialization URI base: &lt;#{base}&gt;"
@@ -187,16 +187,16 @@ module RDF::RDFa
       #
       # Locals: subject, typeof, predicates, rel, element, inlist
       # Yield: predicates.each
-      :subject => %q(
+      subject: %q(
         - if element == :li
-          %li{:rel => rel, :resource => (about || resource), :typeof => typeof, :inlist => inlist}
+          %li{rel: rel, resource: (about || resource), typeof: typeof, inlist: inlist}
             - if typeof
               %span.type!= typeof
             %table.properties
               - predicates.each do |predicate|
                 != yield(predicate)
         - else
-          %td{:rel => rel, :resource => (about || resource), :typeof => typeof, :inlist => inlist}
+          %td{rel: rel, resource: (about || resource), typeof: typeof, inlist: inlist}
             - if typeof
               %span.type!= typeof
             %table.properties
@@ -209,9 +209,9 @@ module RDF::RDFa
       # Yields: object
       # If nil is returned, render as a leaf
       # Otherwise, render result
-      :property_value => %q(
+      property_value: %q(
         - if heading_predicates.include?(predicate) && object.literal?
-          %h1{:property => get_curie(predicate), :content => get_content(object), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(get_value(object))
+          %h1{property: get_curie(predicate), content: get_content(object), lang: get_lang(object), datatype: get_dt_curie(object), inlist: inlist}= escape_entities(get_value(object))
         - else
           %tr.property
             %td.label
@@ -219,22 +219,22 @@ module RDF::RDFa
             - if res = yield(object)
               != res
             - elsif get_curie(object) == 'rdf:nil'
-              %td{:rel => get_curie(predicate), :inlist => ''}= "Empty"
+              %td{rel: get_curie(predicate), inlist: ''}= "Empty"
             - elsif object.node?
-              %td{:property => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
+              %td{property: get_curie(predicate), resource: get_curie(object), inlist: inlist}= get_curie(object)
             - elsif object.uri?
               %td
-                %a{:property => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
+                %a{property: get_curie(predicate), href: object.to_s, inlist: inlist}= object.to_s
             - elsif object.datatype == RDF.XMLLiteral
-              %td{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}<!= get_value(object)
+              %td{property: get_curie(predicate), lang: get_lang(object), datatype: get_dt_curie(object), inlist: inlist}<!= get_value(object)
             - else
-              %td{:property => get_curie(predicate), :content => get_content(object), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(get_value(object))
+              %td{property: get_curie(predicate), content: get_content(object), lang: get_lang(object), datatype: get_dt_curie(object), inlist: inlist}= escape_entities(get_value(object))
       ),
 
       # Output for multi-valued properties
       # Locals: predicate, objects, inliste
       # Yields: object for leaf resource rendering
-      :property_values =>  %q(
+      property_values:  %q(
         %tr.property
           %td.label
             = get_predicate_name(predicate)
@@ -244,17 +244,17 @@ module RDF::RDFa
                 - if res = yield(object)
                   != res
                 - elsif object.node?
-                  %li{:property => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
+                  %li{property: get_curie(predicate), resource: get_curie(object), inlist: inlist}= get_curie(object)
                 - elsif object.uri?
                   %li
-                    %a{:property => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
+                    %a{property: get_curie(predicate), href: object.to_s, inlist: inlist}= object.to_s
                 - elsif object.datatype == RDF.XMLLiteral
-                  %li{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_curie(object.datatype), :inlist => inlist}<!= get_value(object)
+                  %li{property: get_curie(predicate), lang: get_lang(object), datatype: get_curie(object.datatype), inlist: inlist}<!= get_value(object)
                 - else
-                  %li{:property => get_curie(predicate), :content => get_content(object), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(get_value(object))
+                  %li{property: get_curie(predicate), content: get_content(object), lang: get_lang(object), datatype: get_dt_curie(object), inlist: inlist}= escape_entities(get_value(object))
       ),
     }
-    HAML_TEMPLATES = {:base => BASE_HAML, :min => MIN_HAML, :distiller => DISTILLER_HAML}
+    HAML_TEMPLATES = {base: BASE_HAML, min: MIN_HAML, distiller: DISTILLER_HAML}
     DEFAULT_HAML = BASE_HAML
   end
 end