Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Start release 0.2.5

  • Loading branch information...
commit 157eaefec6fe60b75c72230173ffe4d1b6f7a69e 1 parent 604c667
@gkellogg gkellogg authored
View
1  .gitignore
@@ -1,3 +1,4 @@
/.yardoc/
/doc/
/pkg/
+/.rbx/
View
13 .travis.yml
@@ -0,0 +1,13 @@
+language: ruby
+bundler_args: --without development
+script: "bundle exec rake spec"
+env:
+ - CI=true
+rvm:
+ - ree
+ - 1.8.7
+ - 1.9.3
+# - jruby-18mode # JRuby in 1.8 mode
+# - jruby-19mode # JRuby in 1.9 mode
+ - rbx-18mode
+ - rbx-19mode
View
2  Gemfile
@@ -2,6 +2,6 @@ source "http://rubygems.org"
gemspec :name => ""
-group :development do
+group :debug do
gem "wirble"
end
View
10 Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- rdf-microdata (0.2.3.1)
+ rdf-microdata (0.2.4)
htmlentities (>= 4.3.0)
json (>= 1.6.1)
rdf (>= 0.3.4)
@@ -11,12 +11,13 @@ GEM
remote: http://rubygems.org/
specs:
addressable (2.2.7)
+ backports (2.6.2)
diff-lcs (1.1.3)
equivalent-xml (0.2.9)
nokogiri (>= 1.4.3)
htmlentities (4.3.1)
- json (1.6.5)
- json (1.6.5-java)
+ json (1.7.3)
+ json (1.7.3-java)
nokogiri (1.5.2)
nokogiri (1.5.2-java)
promise (0.3.0)
@@ -28,7 +29,8 @@ GEM
rspec (>= 2.8.0)
rdf-turtle (0.1.1)
rdf (>= 0.3.4)
- rdf-xsd (0.3.5)
+ rdf-xsd (0.3.7)
+ backports
nokogiri (>= 1.5.0)
rdf (>= 0.3.4)
rspec (2.8.0)
View
9 History.md
@@ -1,3 +1,12 @@
+### 0.2.5
+* If RDFa is loaded, don't assert text/html and :html content-type/extension, as RDFa will call out based on presence of @itemscope
+
+### 0.2.4
+* Update contextual case based on LC spec change to use current_name instead of current_type when creating a predicate URI in contextual.
+* Add hCard and hCalendar vocabulary definitions.
+* Make sure registry_uri is processed for each invocation, allowing it to be passed as a parameter.
+* Add --registry argument to script/parse to allow it to be specified.
+
### 0.2.3
* Update to latest processing rules, including the use of a registry.
* Updated microdata namespace.
View
2  VERSION
@@ -1 +1 @@
-0.2.4
+0.2.5
View
6 lib/rdf/microdata/format.rb
@@ -15,7 +15,11 @@ module RDF::Microdata
# @see http://www.w3.org/TR/rdf-testcases/#ntriples
class Format < RDF::Format
content_encoding 'utf-8'
- content_type 'text/html', :extension => :html
+
+ # 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)
reader { RDF::Microdata::Reader }
##
Please sign in to comment.
Something went wrong with that request. Please try again.