rdf-microdata 0.2.1 → 0.2.2

data/README

@@ -61,16 +61,15 @@ of the generated literal.
 html>head>title and anchor (_a_) elements no longer generate triples without @item* properties
 
 ## Dependencies
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.3)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.4)
 * [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.3.3)
 
 ## Documentation
-Full documentation available on [RubyForge](http://rdf.rubyforge.org/microdata)
+Full documentation available on [Rubydoc.info][Microdata doc]
 
 ### Principle Classes
 * {RDF::Microdata::Format}
-  * {RDF::Microdata::HTML}
-    Asserts :html format, text/html mime-type and .html file extension.
+  Asserts :html format, text/html mime-type and .html file extension.
 * {RDF::Microdata::Reader}
 
 ### Additional vocabularies
@@ -119,3 +118,4 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [YARD-GS]:          http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
 [PDD]:              http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
 [Microdata]:        http://www.w3.org/TR/2011/WD-microdata-20110525/     "HTML Microdata"
+[Microdata doc]:    http://rubydoc.info/github/gkellogg/rdf-microdata/frames

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/rdf/microdata/format.rb

@@ -17,5 +17,18 @@ module RDF::Microdata
     content_encoding 'utf-8'
     content_type     'text/html', :extension => :html
     reader { RDF::Microdata::Reader }
+  
+    ##
+    # Sample detection to see if it matches Microdata (not RDF/XML or RDFa)
+    #
+    # Use a text sample to detect the format of an input file. Sub-classes implement
+    # a matcher sufficient to detect probably format matches, including disambiguating
+    # between other similar formats.
+    #
+    # @param [String] sample Beginning several bytes (~ 1K) of input.
+    # @return [Boolean]
+    def self.detect(sample)
+      !!sample.match(/<[^>]*(itemprop|itemtype|itemref|itemscope|itemid)[^>]*>/m)
+    end
   end
 end

data/lib/rdf/microdata/reader.rb

@@ -73,14 +73,16 @@ module RDF::Microdata
           Nokogiri::HTML.parse(input, base_uri.to_s, options[:encoding])
         end
         
-        if (@doc.nil? || @doc.root.nil?)
-          add_error(nil, "Empty document")
-          raise RDF::ReaderError, "Empty Document"
-        end
         errors = @doc.errors.reject {|e| e.to_s =~ /Tag (audio|source|track|video|time) invalid/}
-        add_error(nil, "Synax errors:\n#{@doc.errors}") if !errors.empty? && validate?
+        raise RDF::ReaderError, "Syntax errors:\n#{errors}" if !errors.empty? && validate?
+        raise RDF::ReaderError, "Empty document" if (@doc.nil? || @doc.root.nil?) && validate?
 
-        block.call(self) if block_given?
+        if block_given?
+          case block.arity
+            when 0 then instance_eval(&block)
+            else block.call(self)
+          end
+        end
       end
     end
 

metadata

@@ -1,144 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rdf-microdata
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
 platform: ruby
-authors: 
-- Gregg Kellogg
+authors:
+- Gregg
+- Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-19 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdf
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2165538060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 3
-        - 3
-        version: 0.3.3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2165538060
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2165537460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2165537460
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2165536800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2165536800
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2165535880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rdf-spec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2165535880
+- !ruby/object:Gem::Dependency
+  name: rdf-spec
+  requirement: &2165534820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
-        version: 0.3.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.4
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rdf-n3
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2165534820
+- !ruby/object:Gem::Dependency
+  name: rdf-n3
+  requirement: &2165509980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 3
-        - 3
-        version: 0.3.3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.5
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rdf-isomorphic
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2165509980
+- !ruby/object:Gem::Dependency
+  name: rdf-isomorphic
+  requirement: &2165509180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 3
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.4
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *2165509180
 description: Microdata reader for Ruby.
 email: public-rdf-ruby@w3.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - AUTHORS
 - README
 - UNLICENSE
@@ -149,41 +105,29 @@ files:
 - lib/rdf/microdata/version.rb
 - lib/rdf/microdata/vocab.rb
 - lib/rdf/microdata.rb
-has_rdoc: false
 homepage: http://github.com/gkellogg/rdf-microdata
-licenses: 
+licenses:
 - Public Domain
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 53
-      segments: 
-      - 1
-      - 8
-      - 1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rdf-microdata
-rubygems_version: 1.5.0
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Microdata reader for Ruby.
 test_files: []
-