rdf-rdfa 1.1.3 → 1.1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58fae43e45c36c0ae16fc3ec3e13ca7d37172c1e
-  data.tar.gz: c14110e7a10a20418e85f37762d2407ccc2b29e2
+  metadata.gz: aa94aaaa648d4da2e0dafb9f82d441e9b6e00066
+  data.tar.gz: 300cbc452eb89060eefa5d7b4f6d9dc853ecb166
 SHA512:
-  metadata.gz: a3921617b492e2cf53595f17bcd3294826c755014cab28b4e1ec6a44861030fc331422ce3d9afea1f2dce2f50b23e62644e40c2f4b2b02c5b01af1733b58beec
-  data.tar.gz: cdc1f16371a4572a0a0665937420efc1a5bea7939fef2e950830d4bdcdbf60b4ff7e650956f2dd8696152a3d42e7466678a085399de186db28efb00dac55ff13
+  metadata.gz: f07f7a03c8d54b0cee86fb63b2e03bcf6fd324067dc7b6dc8e124ce749cae998016acb9436ff8622cb38fcb98cbed748a4e786e8df25556a71fa4e1973b75dac
+  data.tar.gz: 990b662351c27483a21106c757b2638246e234986b14a8f63693f2479e8720d55c6a7e6b7e1536b66afa3bf753d6b31205f091ca739464638594d83e49afff64

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.3.1

data/lib/rdf/rdfa/reader.rb

@@ -354,85 +354,88 @@ module RDF::RDFa
     # @yieldparam [RDF::Statement] statement
     # @return [void]
     def each_statement(&block)
-      unless @processed || @root.nil?
-        # Add prefix definitions from host defaults
-        @host_defaults[:uri_mappings].each_pair do |prefix, value|
-          prefix(prefix, value)
-        end
-
-        # parse
-        parse_whole_document(@doc, RDF::URI(base_uri))
+      if block_given?
+        unless @processed || @root.nil?
+          # Add prefix definitions from host defaults
+          @host_defaults[:uri_mappings].each_pair do |prefix, value|
+            prefix(prefix, value)
+          end
 
-        def extract_script(el, input, type, options, &block)
-          add_debug(el, "script element of type #{type}")
-          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'
+          # parse
+          parse_whole_document(@doc, RDF::URI(base_uri))
+
+          def extract_script(el, input, type, options, &block)
+            add_debug(el, "script element of type #{type}")
+            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'
+              end
+            rescue
             end
-          rescue
-          end
 
-          if reader = RDF::Reader.for(:content_type => type)
-            add_debug(el, "=> reader #{reader.to_sym}")
-            reader.new(input, options).each(&block)
-          else
-            add_debug(el, "=> no reader found")
+            if reader = RDF::Reader.for(:content_type => type)
+              add_debug(el, "=> reader #{reader.to_sym}")
+              reader.new(input, options).each(&block)
+            else
+              add_debug(el, "=> no reader found")
+            end
           end
-        end
         
-        # Look for Embedded Turtle and RDF/XML
-        unless @root.xpath("//rdf:RDF", "xmlns:rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#").empty?
-          extract_script(@root, @doc, "application/rdf+xml", @options) do |statement|
-            @repository << statement
+          # Look for Embedded Turtle and RDF/XML
+          unless @root.xpath("//rdf:RDF", "xmlns:rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#").empty?
+            extract_script(@root, @doc, "application/rdf+xml", @options) do |statement|
+              @repository << statement
+            end
           end
-        end
 
-        # Look for Embedded scripts
-        @root.css("script[type]").each do |el|
-          type = el.attribute("type")
+          # Look for Embedded scripts
+          @root.css("script[type]").each do |el|
+            type = el.attribute("type")
 
-          text = el.inner_html.sub(%r(\A\s*\<!\[CDATA\[)m, '').sub(%r(\]\]>\s*\Z)m, '')
+            text = el.inner_html.sub(%r(\A\s*\<!\[CDATA\[)m, '').sub(%r(\]\]>\s*\Z)m, '')
 
-          extract_script(el, text, type, @options) do |statement|
-            @repository << statement
+            extract_script(el, text, type, @options) do |statement|
+              @repository << statement
+            end
           end
-        end
         
-        # Look for Embedded microdata
-        unless @root.xpath("//@itemscope").empty?
-          begin
-            require 'rdf/microdata'
-            add_debug(@doc, "process microdata")
-            @repository << RDF::Microdata::Reader.new(@doc, options)
-          rescue LoadError
-            add_debug(@doc, "microdata detected, not processed")
+          # Look for Embedded microdata
+          unless @root.xpath("//@itemscope").empty?
+            begin
+              require 'rdf/microdata'
+              add_debug(@doc, "process microdata")
+              @repository << RDF::Microdata::Reader.new(@doc, options)
+            rescue LoadError
+              add_debug(@doc, "microdata detected, not processed")
+            end
           end
-        end
 
-        # Perform property copying
-        copy_properties(@repository) if @options[:reference_folding]
+          # Perform property copying
+          copy_properties(@repository) if @options[:reference_folding]
 
-        # Perform vocabulary expansion
-        expand(@repository) if @options[:vocab_expansion]
+          # Perform vocabulary expansion
+          expand(@repository) if @options[:vocab_expansion]
         
-        @processed = true
-      end
+          @processed = true
+        end
 
-      # Return statements in the default graph for
-      # statements in the associated named or default graph from the
-      # processed repository
-      @repository.each do |statement|
-        case statement.context
-        when nil
-          yield statement if @options[:rdfagraph].include?(:output)
-        when RDF::RDFA.ProcessorGraph
-          yield RDF::Statement.new(*statement.to_triple) if @options[:rdfagraph].include?(:processor)
+        # Return statements in the default graph for
+        # statements in the associated named or default graph from the
+        # processed repository
+        @repository.each do |statement|
+          case statement.context
+          when nil
+            yield statement if @options[:rdfagraph].include?(:output)
+          when RDF::RDFA.ProcessorGraph
+            yield RDF::Statement.new(*statement.to_triple) if @options[:rdfagraph].include?(:processor)
+          end
         end
       end
+      enum_for(:each_statement)
     end
 
     ##
@@ -444,9 +447,12 @@ module RDF::RDFa
     # @yieldparam [RDF::Value]    object
     # @return [void]
     def each_triple(&block)
-      each_statement do |statement|
-        block.call(*statement.to_triple)
+      if block_given?
+        each_statement do |statement|
+          block.call(*statement.to_triple)
+        end
       end
+      enum_for(:each_triple)
     end
     
     private

metadata

@@ -1,89 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.3.1
 platform: ruby
 authors:
 - Gregg
 - Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.3'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -91,9 +91,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -101,120 +99,121 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rdf-spec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rdf-turtle
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rdf-rdfxml
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rdf-isomorphic
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: sparql
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: sparql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+  type: :development
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-description: RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library
-  suite.
+  prerelease: false
+  type: :development
+description: RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables: []
 extensions: []
@@ -253,7 +252,7 @@ homepage: http://ruby-rdf.github.com/rdf-rdfa
 licenses:
 - Public Domain
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -270,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project: rdf-rdfa
 rubygems_version: 2.2.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: RDFa reader/writer for RDF.rb.
 test_files: []