rdf-rdfa 3.2.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1607516f63a1cce40c7ddc6b5a17ad311673f8b8d621bb371f01919e2a138f44
-  data.tar.gz: e7768c0968243e1cdb2054ff13107d52cff292889213f7103d2c8e0098f92c75
+  metadata.gz: 9f75ea1f2749a0d47ceb49a9968b419523908148428154510a276ea9353982e6
+  data.tar.gz: 06acea15580c87656d573d7cc1e931b9510cd560d786c81355798ad280adfb26
 SHA512:
-  metadata.gz: d019f203248eff7ab6d138291b715cf8b803059cc7f1619dea2fb677d0001d4f4804e2b1d39e718cd6c5d05ec7cb43aabf16e08520ba5cdccf95f208ff900875
-  data.tar.gz: c735757bbf56431c7a3add53a5b05de4f75bd86c95d2ea4f170ea6be5b8a14d62a2f42f5888940b2d27d133e7dc4ce8814da44c4c63d80ca2e5ad3753367f1f2
+  metadata.gz: c53ac6cede929d3fe122f9eb722d2d6abb01b7064943231cf909f0ecea1c4d25f20e4e44cac534e388c7a6a57796c8b7b3c673098f320e654d7c44a0e7541aab
+  data.tar.gz: 871fecae5aa1b85e48fe8ad476d3e250587ac25da3f9f5328c2dc5477b4536e0ccbd9636b86a54b78fdfce3803862c1f1ea4fee6f8ee6cc5fdd15fdfd93ff13e

data/README.md

@@ -399,7 +399,7 @@ The template hash defines four Haml templates:
 ## Dependencies
 * [Ruby](https://ruby-lang.org/) (>= 2.6)
 * [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2)
-* [Haml](https://rubygems.org/gems/haml) (~> 5.2)
+* [Haml](https://rubygems.org/gems/haml) (>- 5.2, < 7)
 * [HTMLEntities](https://rubygems.org/gems/htmlentities) (~> 4.3)
 * Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (~> 1.12)
 
@@ -473,7 +473,7 @@ see <https://unlicense.org/> or the accompanying [UNLICENSE](UNLICENSE) file.
 [HTML+RDFa 1.1]:    https://www.w3.org/TR/rdfa-in-html/                                   "HTML+RDFa 1.1"
 [RDFa-test-suite]:  https://rdfa.info/test-suite/                                         "RDFa test suite"
 [Role Attr]:        https://www.w3.org/TR/role-attribute/                                 "Role Attribute"
-[RDFa doc]:         https://rubydoc.info/github/ruby-rdf/rdf-rdfa/frames
+[RDFa doc]:         https://ruby-rdf.github.io/rdf-rdfa/frames
 [Haml]:             https://haml-lang.com/
 [Turtle]:           https://www.w3.org/TR/2011/WD-turtle-20110809/
 [Nokogiri]:         https://www.nokogiri.org

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.2.2

data/lib/rdf/rdfa/format.rb

@@ -21,7 +21,8 @@ module RDF::RDFa
     content_encoding 'utf-8'
     content_type     'text/html;q=0.5',
       aliases: %w(application/xhtml+xml;q=0.7 image/svg+xml;q=0.4),
-      extensions: [:html, :xhtml, :svg]
+      extensions: [:html, :xhtml, :svg],
+      uri: 'http://www.w3.org/ns/formats/RDFa'
     reader { RDF::RDFa::Reader }
     writer { RDF::RDFa::Writer }
 

data/lib/rdf/rdfa/reader.rb

@@ -245,7 +245,7 @@ module RDF::RDFa
 
     ##
     # RDFa Reader options
-    # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Reader#options-class_method
+    # @see https://ruby-rdf.github.io/rdf/RDF/Reader#options-class_method
     def self.options
       super + [
         RDF::CLI::Option.new(

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

@@ -10,11 +10,11 @@ module RDF::RDFa
       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}.compact}
           - if base || title
             %head
               - if base
-                %base{href: base}
+                %base{**{href: base}.compact}
               - if title
                 %title= title
           %body
@@ -33,13 +33,13 @@ module RDF::RDFa
       # Yield: predicates.each
       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}.compact}
             - 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}.compact}
             - if typeof
               %span.type!= typeof
             - predicates.each do |predicate|
@@ -53,7 +53,7 @@ module RDF::RDFa
       # Otherwise, render result
       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}.compact}= escape_entities(get_value(object))
         - else
           %div.property
             %span.label
@@ -63,13 +63,13 @@ module RDF::RDFa
             - elsif get_curie(object) == 'rdf:nil'
               %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}.compact}= 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}.compact}= 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}.compact}<!= 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}.compact}= escape_entities(get_value(object))
       ),
 
       # Output for multi-valued properties
@@ -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}.compact}= 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}.compact}= 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}.compact}<!= 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}.compact}= escape_entities(get_value(object))
       ),
     }
 
@@ -106,10 +106,10 @@ module RDF::RDFa
       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}.compact}
           - if base
             %head
-              %base{href: base}
+              %base{*{href: base}.compact}
           %body
             - subjects.each do |subject|
               != yield(subject)
@@ -121,7 +121,7 @@ module RDF::RDFa
       # Locals: about, typeof, predicates, :inlist
       # Yield: predicates.each
       subject: %q(
-        %div{rel: rel, resource: (about || resource), typeof: typeof}
+        %div{**{rel: rel, resource: (about || resource), typeof: typeof}.compact}
           - predicates.each do |predicate|
             != yield(predicate)
       ),
@@ -138,13 +138,13 @@ module RDF::RDFa
       - elsif get_curie(object) == 'rdf:nil'
         %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}.compact}= 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}.compact}= 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}.compact}<!= 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}.compact}= escape_entities(get_value(object))
       )
     }
 
@@ -156,7 +156,7 @@ module RDF::RDFa
       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}.compact}
           - if base || title
             %head
               - if base
@@ -189,21 +189,21 @@ module RDF::RDFa
       # Yield: predicates.each
       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}.compact}
             - if typeof
               %span.type!= typeof
             %table.properties
               - predicates.each do |predicate|
                 != yield(predicate)
         - elsif rel
-          %td{rel: rel, resource: (about || resource), typeof: typeof, inlist: inlist}
+          %td{**{rel: rel, resource: (about || resource), typeof: typeof, inlist: inlist}.compact}
             - if typeof
               %span.type!= typeof
             %table.properties
               - predicates.each do |predicate|
                 != yield(predicate)
         - else
-          %div{resource: (about || resource), typeof: typeof, inlist: inlist}
+          %div{**{resource: (about || resource), typeof: typeof, inlist: inlist}.compact}
             - if typeof
               %span.type!= typeof
             %table.properties
@@ -218,7 +218,7 @@ module RDF::RDFa
       # Otherwise, render result
       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}.compact}= escape_entities(get_value(object))
         - else
           %tr.property
             %td.label
@@ -228,14 +228,14 @@ module RDF::RDFa
             - elsif get_curie(object) == 'rdf:nil'
               %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}.compact}= 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}.compact}= 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}.compact}<!= 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}.compact}= escape_entities(get_value(object))
       ),
 
       # Output for multi-valued properties
@@ -251,14 +251,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}.compact}= 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}.compact}= 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}.compact}<!= 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}.compact}= escape_entities(get_value(object))
       ),
     }
     HAML_TEMPLATES = {base: BASE_HAML, min: MIN_HAML, distiller: DISTILLER_HAML}

data/lib/rdf/rdfa/writer.rb

@@ -75,7 +75,7 @@ module RDF::RDFa
 
     ##
     # RDFa Writer options
-    # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Writer#options-class_method
+    # @see https://ruby-rdf.github.io/rdf/RDF/Writer#options-class_method
     def self.options
       super + [
         RDF::CLI::Option.new(
@@ -721,6 +721,8 @@ module RDF::RDFa
     # @return [String]
     #   Entity-encoded string
     def escape_entities(str)
+      # Haml 6 does escaping
+      return str if Haml.const_defined?(:Template)
       CGI.escapeHTML(str).gsub(/[\n\r]/) {|c| '&#x' + c.unpack('h').first + ';'}
     end
 
@@ -761,7 +763,13 @@ module RDF::RDFa
       template = template.align_left
       log_debug {"hamlify locals: #{locals.inspect}"}
 
-      Haml::Engine.new(template, @options[:haml_options] || HAML_OPTIONS).render(self, locals) do |*args|
+      haml_opts = @options[:haml_options] || HAML_OPTIONS
+      haml_runner = if Haml::VERSION >= "6"
+        Haml::Template.new(**haml_opts) {template}
+      else
+        Haml::Engine.new(template, **haml_opts)
+      end
+      haml_runner.render(self, locals) do |*args|
         yield(*args) if block_given?
       end
     rescue Haml::Error => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.2
 platform: ruby
 authors:
 - Gregg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2023-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -43,16 +43,22 @@ dependencies:
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
@@ -264,7 +270,12 @@ files:
 homepage: https://github.com/ruby-rdf/rdf-rdfa
 licenses:
 - Unlicense
-metadata: {}
+metadata:
+  documentation_uri: https://ruby-rdf.github.io/rdf-rdfa
+  bug_tracker_uri: https://github.com/ruby-rdf/rdf-rdfa/issues
+  homepage_uri: https://github.com/ruby-rdf/rdf-rdfa
+  mailing_list_uri: https://lists.w3.org/Archives/Public/public-rdf-ruby/
+  source_code_uri: https://github.com/ruby-rdf/rdf-rdfa
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -280,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: RDFa reader/writer for RDF.rb.