rdf-microdata 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1d1b0be6be75b9604495e5571840eae3d760b5c
-  data.tar.gz: 72ea12e35779e10447eabd3965238533e892816b
+  metadata.gz: e67c356f5d9c16989fec6fdbffc268aaac86580b
+  data.tar.gz: ad36ebdb564304d87628944c0a68e2047c8f1b83
 SHA512:
-  metadata.gz: 1bb225e865fe2e48b4606d67ccb04f5bce62b4dfa30c5a29d99217e4007ab290f273725eedf1682cb9d8e3e3a9facc2df4de6c1b8f22014d0bab951214a97967
-  data.tar.gz: 0f8cad8716484382a1b0286d66245698c37d8e4e81456d2cc3a0018be1e23fe13ff4875e0bf598a9df94359a3ae24547db14913571c69011fc0964cd40f94071
+  metadata.gz: 12aac445519aeca33f567dcde2d0f94dbfa7302601802e50dd8294e2d41739d9525ec5bd4e7b0ca86e5779cdad2a3630bb4d96b058c98cbc42ddc811a39a686d
+  data.tar.gz: a4136789520f57273e147f1b01e934f99efc129d242766ca4005478448d64955af0b2af6718766d932ee49cddf10684992f4db25ebe6b261c9d97eb5cd38005d

data/README

@@ -30,12 +30,12 @@ The parser uses a build-in version of the [Microdata RDF][] registry.
 ### Reading RDF data in the Microdata format
 
     require 'rdf/microdata'
-    graph = RDF::Graph.load("etc/doap.html", :format => :microdata)
+    graph = RDF::Graph.load("etc/doap.html", format: :microdata)
 
 ### Reading using content-negotation
 
     require 'rdf/microdata'
-    graph = RDF::Graph.load("etc/doap.html", :content_type => "text/html")
+    graph = RDF::Graph.load("etc/doap.html", content_type: "text/html")
     
 ## Note
 This spec is based on the W3C HTML Data Task Force specification and does not support
@@ -97,7 +97,7 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 * <http://github.com/ruby-rdf/rdf-microdata>
 * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
-[RDF.rb]:           http://rdf.rubyforge.org/
+[RDF.rb]:           https://github.com/ruby-rdf/rdf
 [YARD]:             http://yardoc.org/
 [YARD-GS]:          http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
 [PDD]:              http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/rdf/microdata/expansion.rb

@@ -31,9 +31,9 @@ module RDF::Microdata
       
       repo = owl_entailment(repo)
 
-      # Return graph with default context
+      # Return graph with default graph
       graph = RDF::Graph.new
-      repo.statements.each {|st| graph << st if st.context.nil?}
+      repo.statements.each {|st| graph << st}
       graph
     end
 
@@ -83,12 +83,12 @@ module RDF::Microdata
         end
       end
 
-      def antecedent(subject, prediate, object, context = nil)
-        antecedents << RDF::Query::Pattern.new(subject, prediate, object, :context => context)
+      def antecedent(subject, prediate, object)
+        antecedents << RDF::Query::Pattern.new(subject, prediate, object)
       end
 
-      def consequent(subject, prediate, object, context = nil)
-        consequents << RDF::Query::Pattern.new(subject, prediate, object, :context => context)
+      def consequent(subject, prediate, object)
+        consequents << RDF::Query::Pattern.new(subject, prediate, object)
       end
       
       ##
@@ -102,7 +102,7 @@ module RDF::Microdata
           nodes = {}
           consequents.each do |consequent|
             terms = {}
-            [:subject, :predicate, :object, :context].each do |r|
+            [:subject, :predicate, :object].each do |r|
               terms[r] = case o = consequent.send(r)
               when RDF::Node            then nodes[o] ||= RDF::Node.new
               when RDF::Query::Variable then solution[o]

data/lib/rdf/microdata/format.rb

@@ -13,7 +13,7 @@ module RDF::Microdata
   #   RDF::Format.for(:microdata)         #=> RDF::Microdata::Format
   #   RDF::Format.for("etc/foaf.html")
   #   RDF::Format.for(:file_name      => "etc/foaf.html")
-  #   RDF::Format.for(:file_extension => "html")
+  #   RDF::Format.for(file_extension: "html")
   #   RDF::Format.for(:content_type   => "text/html")
   #
   # @example Obtaining serialization format MIME types
@@ -26,7 +26,7 @@ module RDF::Microdata
     # Only define content type if RDFa is not available.
     # The Microdata processor will be launched from there
     # otherwise.
-    content_type     'text/html', :extension => :html unless RDF::Format.for(:rdfa)
+    content_type     'text/html', extension: :html unless RDF::Format.for(:rdfa)
     reader { RDF::Microdata::Reader }
   
     ##

data/lib/rdf/microdata/reader.rb

@@ -23,6 +23,11 @@ module RDF::Microdata
     # @return [Module] Returns the HTML implementation module for this reader instance.
     attr_reader :implementation
 
+    ##
+    # Accumulated errors found during processing
+    # @return [Array<String>]
+    attr_reader :errors
+
     ##
     # Returns the base URI determined by this reader.
     #
@@ -158,6 +163,8 @@ module RDF::Microdata
     # @option options [#to_s]    :base_uri     (nil)
     #   the base URI to use when resolving relative URIs
     # @option options [#to_s]    :registry
+    # @option options [Array] :errors
+    #   array for placing errors found when parsing
     # @option options [Array] :debug
     #   Array to place debug messages
     # @return [reader]
@@ -167,6 +174,8 @@ module RDF::Microdata
     # @raise [Error] Raises `RDF::ReaderError` when validating
     def initialize(input = $stdin, options = {}, &block)
       super do
+        @errors = @options[:errors]
+        @warnings = @options[:warnings]
         @debug = options[:debug]
 
         @library = :nokogiri
@@ -266,6 +275,7 @@ module RDF::Microdata
     end
 
     def add_error(node, message)
+      @errors << "#{node_path(node)}: #{message}" if @errors
       add_debug(node, message)
       raise RDF::ReaderError, message if validate?
     end
@@ -303,7 +313,7 @@ module RDF::Microdata
       ec = {
         :memory             => {},
         :current_type       => nil,
-        :current_vocabulary => nil,
+        current_vocabulary: nil,
         :document_base      => base,
       }
       # 1) For each element that is also a top-level item, Generate the triples for that item using the evaluation context.
@@ -371,7 +381,7 @@ module RDF::Microdata
         element.attribute('itemprop').to_s.split(' ').compact.each do |name|
           add_debug(item) {"gentrips(9.1): name=#{name.inspect}, type=#{type}"}
           # 9.1.1) Let context be a copy of evaluation context with current type set to type and current vocabulary set to vocab.
-          ec_new = ec.merge({:current_type => type, :current_vocabulary => vocab})
+          ec_new = ec.merge({current_type: type, current_vocabulary: vocab})
           
           # 9.1.2) Let predicate be the result of generate predicate URI using context and name. Update context by setting current name to predicate.
           predicate = vocab.predicateURI(name, ec_new)
@@ -405,7 +415,7 @@ module RDF::Microdata
         element.attribute('itemprop-reverse').to_s.split(' ').compact.each do |name|
           add_debug(item) {"gentrips(10.1): name=#{name.inspect}"}
           # 10.1.1) Let context be a copy of evaluation context with current type set to type and current vocabulary set to vocab.
-          ec_new = ec.merge({:current_type => type, :current_vocabulary => vocab})
+          ec_new = ec.merge({current_type: type, current_vocabulary: vocab})
           
           # 10.1.2) Let predicate be the result of generate predicate URI using context and name. Update context by setting current name to predicate.
           predicate = vocab.predicateURI(name, ec_new)
@@ -483,9 +493,9 @@ module RDF::Microdata
     # To collect all the elements in the item root, the user agent must run these steps. They return a list of elements.
     #
     # @param [Nokogiri::XML::Element] root
-    # @return Array<Nokogiri::XML::Element>]
+    # @return [Array<Nokogiri::XML::Element>]
     #   Resultant elements and error count
-    # @raise CrawlFailure on element recursion
+    # @raise [CrawlFailure] on element recursion
     def elements_in_item(root)
       # Let results and pending be empty lists of elements.
       # Let errors be zero.
@@ -531,7 +541,7 @@ module RDF::Microdata
       when element.has_attribute?('itemscope')
         {}
       when element.name == 'meta'
-        RDF::Literal.new(element.attribute('content').to_s, :language => element.language)
+        RDF::Literal.new(element.attribute('content').to_s, language: element.language)
       when %w(data meter).include?(element.name) && element.attribute('value')
         # Lexically scan value and assign appropriate type, otherwise, leave untyped
         v = element.attribute('value').to_s
@@ -552,9 +562,9 @@ module RDF::Microdata
         datatype = %w(Date Time DateTime Duration).map {|t| RDF::Literal.const_get(t)}.detect do |dt|
           v.match(dt::GRAMMAR)
         end || RDF::Literal
-        datatype.new(v, :language => element.language)
+        datatype.new(v, language: element.language)
       else
-        RDF::Literal.new(element.inner_text, :language => element.language)
+        RDF::Literal.new(element.inner_text, language: element.language)
       end
       add_debug(element) {"  #{value.inspect}"}
       value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-microdata
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 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-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf-microdata
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Microdata reader for Ruby.