rdf-rdfa 1.1.6 → 1.1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c35772b1f7eef50854625886073f4f9be64a5c2
-  data.tar.gz: d7a977d1d2d7bd9a9214da5086e793d207ec0993
+  metadata.gz: 37184941079a9de95652928cc6444e4c81c0ae0b
+  data.tar.gz: 1115b899aaa0df5f9d9f5b0146e6188386dc5b4b
 SHA512:
-  metadata.gz: 225fa0befb726050bb84c824932d1b84ba833900d87b7b35ca8575ed6e4d58cc2f35e15b1211bcb0e4343729aefc455398edc4943b10a9f01202f4ee9dd4bd69
-  data.tar.gz: ba139cbe2580ce9aed68be9cf851ec1e1956fe4568cb09aa1b2784e2f864cb77483259534d7890ea2fe1626f382b8cbf1029fd960f8fd42df8bd52352bb5a254
+  metadata.gz: 69aada8837f30c1e952b133d96019f69c449bb8989450070849e7529f91fb8fa2d18ee9a0fb66290d942f3f0541590eadf66b26ac3a2804a8609d87cbf0450d8
+  data.tar.gz: d35995ba25cf44a360eba057bd9bd8221094e8de62c23f1522336d133aa5883f1493dad247b273c7a2de47735a7ff2a6c6ad6af78958ab2b7132b4a335e618a9

data/README

@@ -5,6 +5,7 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
 
 [![Gem Version](https://badge.fury.io/rb/rdf-rdfa.png)](http://badge.fury.io/rb/rdf-rdfa)
 [![Build Status](https://travis-ci.org/ruby-rdf/rdf-rdfa.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf-rdfa)
+[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-rdfa/badge.svg)](https://coveralls.io/r/ruby-rdf/rdf-rdfa)
 
 ## DESCRIPTION
 RDF::RDFa is an RDFa reader and writer for Ruby using the [RDF.rb][RDF.rb] library suite.

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.1.6.1

data/lib/rdf/rdfa/reader.rb

@@ -99,6 +99,16 @@ module RDF::RDFa
     # @return [Module]
     attr_reader :implementation
 
+    ##
+    # Warnings found during processing
+    # @return [Array<String>]
+    attr_reader :warnings
+
+    ##
+    # Accumulated errors found during processing
+    # @return [Array<String>]
+    attr_reader :errors
+
     # The Recursive Baggage
     # @private
     class EvaluationContext # :nodoc:
@@ -266,6 +276,10 @@ module RDF::RDFa
     #   Value is an array containing on or both of :output or :processor.
     # @option options [Repository] :vocab_repository (nil)
     #   Repository to save loaded vocabularies.
+    # @option options [Array] :errors
+    #   array for placing errors found when parsing
+    # @option options [Array] :warnings
+    #   array for placing warnings found when parsing
     # @option options [Array] :debug
     #   Array to place debug messages
     # @return [reader]
@@ -275,7 +289,9 @@ module RDF::RDFa
     # @raise [RDF::ReaderError] if _validate_
     def initialize(input = $stdin, options = {}, &block)
       super do
-        @debug = options[:debug]
+        @errors = @options[:errors]
+        @warnings = @options[:warnings]
+        @debug = @options[:debug]
         @options = {:reference_folding => true}.merge(@options)
         @repository = RDF::Repository.new
 
@@ -313,7 +329,7 @@ module RDF::RDFa
           add_error(nil, "Malformed document: #{$!.message}")
         end
         add_error(nil, "Empty document") if root.nil?
-        add_error(nil, "Syntax errors:\n#{doc_errors}") if !doc_errors.empty?
+        add_error(nil, doc_errors.map(&:message).uniq.join("\n")) if !doc_errors.empty?
 
         # Section 4.2 RDFa Host Language Conformance
         #
@@ -369,23 +385,30 @@ module RDF::RDFa
             begin
               # Formats don't exist unless they've been required
               case type.to_s
-              when 'application/rdf+xml' then require 'rdf/rdfxml'
-              when 'text/ntriples'       then require 'rdf/ntriples'
-              when 'text/turtle'         then require 'rdf/turtle'
-              when 'application/ld+json' then require 'json/ld'
+              when 'application/csvm+json' then require 'rdf/tabular'
+              when 'application/ld+json'   then require 'json/ld'
+              when 'application/rdf+xml'   then require 'rdf/rdfxml'
+              when 'text/ntriples'         then require 'rdf/ntriples'
+              when 'text/turtle'           then require 'rdf/turtle'
               end
             rescue LoadError
             end
 
-            if reader = RDF::Reader.for(:content_type => type)
+            if reader = RDF::Reader.for(:content_type => type.to_s)
               add_debug(el, "=> reader #{reader.to_sym}")
-              reader.new(input, options).each(&block)
+              # Wrap input in a RemoteDocument with appropriate content-type
+              doc = if input.is_a?(String)
+                RDF::Util::File::RemoteDocument.new(input, options.merge(content_type: type.to_s))
+              else
+                input
+              end
+              reader.new(doc, options).each(&block)
             else
               add_debug(el, "=> no reader found")
             end
           end
         
-          # Look for Embedded Turtle and RDF/XML
+          # Look for Embedded RDF/XML
           unless @root.xpath("//rdf:RDF", "rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#").empty?
             extract_script(@root, @doc, "application/rdf+xml", @options) do |statement|
               @repository << statement
@@ -484,10 +507,12 @@ module RDF::RDFa
     end
     
     def add_warning(node, message, process_class = RDF::RDFA.Warning)
+      @warnings << "#{node_path(node)}: #{message}" if @warnings
       add_processor_message(node, message, process_class)
     end
     
     def add_error(node, message, process_class = RDF::RDFA.Error)
+      @errors << "#{node_path(node)}: #{message}" if @errors
       add_processor_message(node, message, process_class)
       raise RDF::ReaderError, message if validate?
     end
@@ -1458,8 +1483,15 @@ module RDF::RDFa
     end
 
     def uri(value, append = nil)
-      value = RDF::URI.new(value)
-      value = value.join(append) if append
+      append = RDF::URI(append)
+      value = RDF::URI(value)
+      value = if append.absolute?
+        value = append
+      elsif append
+        value = value.join(append)
+      else
+        value
+      end
       value.validate! if validate?
       value.canonicalize! if canonicalize?
       value = RDF::URI.intern(value) if intern?

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

@@ -279,8 +279,8 @@ module RDF::RDFa
       ##
       # Document errors
       def doc_errors
-        # FIXME: Nokogiri version 1.5.5 things <time> is invalid
-        @doc.errors.reject {|e| e.to_s =~ /(Tag time invalid|Missing attribute name)/}
+        # 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)/}
       end
       
       ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.6.1
 platform: ruby
 authors:
 - Gregg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -21,6 +21,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,6 +34,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +58,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,6 +68,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +78,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -73,6 +88,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +132,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -121,6 +142,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +180,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -163,6 +190,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
+- !ruby/object:Gem::Dependency
+  name: rdf-microdata
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +214,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -177,6 +224,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +234,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -191,6 +244,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +254,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -205,6 +264,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: sparql
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +274,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -219,6 +284,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -279,7 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf-rdfa
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: RDFa reader/writer for RDF.rb.