rdf-rdfa 1.1.5 → 1.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7c35772b1f7eef50854625886073f4f9be64a5c2
+  data.tar.gz: d7a977d1d2d7bd9a9214da5086e793d207ec0993
+SHA512:
+  metadata.gz: 225fa0befb726050bb84c824932d1b84ba833900d87b7b35ca8575ed6e4d58cc2f35e15b1211bcb0e4343729aefc455398edc4943b10a9f01202f4ee9dd4bd69
+  data.tar.gz: ba139cbe2580ce9aed68be9cf851ec1e1956fe4568cb09aa1b2784e2f864cb77483259534d7890ea2fe1626f382b8cbf1029fd960f8fd42df8bd52352bb5a254

data/README

@@ -15,12 +15,12 @@ RDF::RDFa parses [RDFa][RDFa 1.1 Core] into statements or triples.
 * Fully compliant RDFa 1.1 parser.
 * Template-based Writer to generate XHTML+RDFa.
   * Writer uses user-replacable [Haml][Haml]-based templates to generate RDFa.
-* If available, Uses Nokogiri for parsing HTML/SVG, falls back to REXML otherwise
+* If available, uses Nokogiri for parsing HTML/SVG, falls back to REXML otherwise
 
-Install with 'gem install rdf-rdfa'
+Install with `gem install rdf-rdfa`
 
 ### Pure Ruby
-In order to run as pure ruby (not requiring any C modules), this gem does not directly depend on [Nokogiri][]
+In order to run as pure ruby (not requiring any C modules), this gem does not directly depend on [Nokogiri](http://www.nokogiri.org)
 and falls back to using REXML. As REXML is not really an HTML parsing library, the results will only be useful if the HTML is well-formed.
 For best performance, install the Nokogiri gem as well.
 
@@ -210,6 +210,7 @@ If the document includes a `<script>` element having an `@type` attribute
 
 generates the following Turtle:
 
+```
    @prefix foo:  <http://www.example.com/xyz#> .
    @prefix gr:   <http://purl.org/goodrelations/v1#> .
    @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
@@ -219,6 +220,7 @@ generates the following Turtle:
      a gr:BusinessEntity ;
      rdfs:seeAlso <http://www.example.com/xyz> ;
      gr:hasLegalName "Hepp Industries Ltd."^^xsd:string .
+```
 
 ### Support for Role Attribute
 The processor will generate RDF triples consistent with the [Role Attr][] specification.
@@ -235,6 +237,8 @@ generates the following Turtle:
 ### Support for microdata
 The RDFa reader will call out to `RDF::Microdata::Reader`, if an `@itemscope` attribute is detected, and the microdata reader is loaded. This avoids a common problem when pages contain both microdata and RDFa, and only one processor is run.
 
+### Support for value property
+In an [RDFA+HTML Errata](https://www.w3.org/2001/sw/wiki/RDFa_1.1._Errata#Using_.3Cdata.3E.2C_.3Cinput.3E_and_.3Cli.3E_along_with_.40value), it was suggested that the `@value` attribute could be parsed to obtain a numeric literal; this is consistent with how it's treated in microdata+rdfa. This processor now parses the value of an `@value` property to determine if it is an `xsd:integer`, `xsd:float`, or `xsd:double`, and uses a plain literal otherwise. The datatype can be overriden using the `@datatype` attribute.
 ## Usage
 
 ### Reading RDF data in the RDFa format
@@ -395,7 +399,7 @@ The template hash defines four Haml templates:
 * [Ruby](http://ruby-lang.org/) (>= 1.9.3)
 * [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1)
 * [Haml](https://rubygems.org/gems/haml) (>= 4.0)
-* [HTMLEntities](https://rubygems.org/gems/htmlentities) ('>= 4.3.1')
+* [HTMLEntities](https://rubygems.org/gems/htmlentities) (>= 4.3.1)
 * Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.6.1)
 
 ## Documentation
@@ -459,7 +463,7 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
 ## License
 
 This is free and unencumbered public domain software. For more information,
-see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
+see <http://unlicense.org/> or the accompanying [UNLICENSE](UNLICENSE) file.
 
 ## FEEDBACK
 

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

data/lib/rdf/rdfa/reader.rb

@@ -374,7 +374,7 @@ module RDF::RDFa
               when 'text/turtle'         then require 'rdf/turtle'
               when 'application/ld+json' then require 'json/ld'
               end
-            rescue
+            rescue LoadError
             end
 
             if reader = RDF::Reader.for(:content_type => type)
@@ -723,6 +723,7 @@ module RDF::RDFa
         role
         src
         typeof
+        value
         vocab
       ).each do |a|
         attrs[a.to_sym] = element.attributes[a].to_s.strip if element.attributes[a]
@@ -1102,7 +1103,7 @@ module RDF::RDFa
           when datatype && ![RDF.XMLLiteral, RDF.HTML].include?(datatype)
             # typed literal
             add_debug(element, "[Step 11] typed literal (#{datatype})")
-            RDF::Literal.new(attrs[:content] || attrs[:datetime] || element.inner_text.to_s, :datatype => datatype, :validate => validate?, :canonicalize => canonicalize?)
+            RDF::Literal.new(attrs[:content] || attrs[:datetime] || attrs[:value] || element.inner_text.to_s, :datatype => datatype, :validate => validate?, :canonicalize => canonicalize?)
           when @version == :"rdfa1.1"
             case
             when datatype == RDF.XMLLiteral
@@ -1142,12 +1143,22 @@ module RDF::RDFa
               rescue ArgumentError => e
                 add_error(element, e.message)
               end
+            when attrs[:value]
+              # Lexically scan value and assign appropriate type, otherwise, leave untyped
+              # See https://www.w3.org/2001/sw/wiki/RDFa_1.1._Errata#Using_.3Cdata.3E.2C_.3Cinput.3E_and_.3Cli.3E_along_with_.40value
+              add_debug(element, "[Step 11] value literal (#{attrs[:value]})")
+              v = attrs[:value].to_s
+              # Figure it out by parsing
+              dt_lit = %w(Integer Float Double).map {|t| RDF::Literal.const_get(t)}.detect do |dt|
+                v.match(dt::GRAMMAR)
+              end || RDF::Literal
+              dt_lit.new(v)
             when attrs[:datatype]
               # otherwise, as a plain literal if @datatype is present but has an empty value.
               # The actual literal is either the value of @content (if present) or a string created by
               # concatenating the value of all descendant text nodes, of the current element in turn.
               # typed literal
-              add_debug(element, "[Step 11] plain plain (#{datatype})")
+              add_debug(element, "[Step 11] datatyped literal (#{datatype})")
               RDF::Literal.new(attrs[:content] || element.inner_text.to_s, :language => language, :validate => validate?, :canonicalize => canonicalize?)
             when attrs[:content]
               # plain literal

data/lib/rdf/rdfa/writer.rb

@@ -233,7 +233,7 @@ module RDF::RDFa
       }.merge(options)
       hamlify(template, options) do |subject|
         yield(subject) if block_given?
-      end
+      end.gsub(/^\s+$/m, '')
     end
 
     # Render a subject using `haml_template[:subject]`.

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

@@ -18,7 +18,7 @@ module RDF::RDFa
               - if title
                 %title= title
           %body
-            - subjects.each do |subject|
+            - subjects.map do |subject|
               != yield(subject)
       ),
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 1.1.5
-  prerelease: 
+  version: 1.1.6
 platform: ruby
 authors:
 - Gregg
@@ -10,258 +9,228 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.6
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sparql
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 description: RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library
@@ -275,45 +244,44 @@ files:
 - README
 - UNLICENSE
 - VERSION
+- lib/rdf/rdfa.rb
+- lib/rdf/rdfa/context.rb
 - lib/rdf/rdfa/context/html.rb
 - lib/rdf/rdfa/context/xhtml.rb
 - lib/rdf/rdfa/context/xml.rb
-- lib/rdf/rdfa/context.rb
 - lib/rdf/rdfa/expansion.rb
 - lib/rdf/rdfa/format.rb
 - lib/rdf/rdfa/patches/string_hacks.rb
+- lib/rdf/rdfa/reader.rb
 - lib/rdf/rdfa/reader/nokogiri.rb
 - lib/rdf/rdfa/reader/rexml.rb
-- lib/rdf/rdfa/reader.rb
 - lib/rdf/rdfa/version.rb
 - lib/rdf/rdfa/vocab.rb
-- lib/rdf/rdfa/writer/haml_templates.rb
 - lib/rdf/rdfa/writer.rb
-- lib/rdf/rdfa.rb
+- lib/rdf/rdfa/writer/haml_templates.rb
 homepage: http://ruby-rdf.github.com/rdf-rdfa
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rdf-rdfa
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RDFa reader/writer for RDF.rb.
 test_files: []
 has_rdoc: false