Finish 2.1.0

ruby-rdf · Dec 31, 2016 · 1705238 · 1705238
2 parents 9bf764d + 443737d
commit 1705238
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,14 +4,14 @@ script: "bundle exec rspec spec"
 env:
   - CI=true
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2.4
-  - 2.3.0
-  - jruby-9.0.4.0
-  - rbx-2
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+  - jruby
+  - rbx
 cache: bundler
 sudo: false
 matrix:
   allow_failures:
-    - rvm: rbx-2
+    - rvm: rbx
+    - rvm: jruby
diff --git a/Gemfile b/Gemfile
@@ -12,11 +12,10 @@ group :development do
   gem 'rdf-isomorphic',     github: "ruby-rdf/rdf-isomorphic",      branch: "develop"
   gem "rdf-spec",           github: "ruby-rdf/rdf-spec",            branch: "develop"
   gem 'rdf-turtle',         github: "ruby-rdf/rdf-turtle",          branch: "develop"
-  gem 'sxp',                github: "gkellogg/sxp-ruby",            branch: "develop"
+  gem 'sxp',                github: "dryruby/sxp.rb",               branch: "develop"
 end
 
 group :debug do
-  gem "wirble"
   gem "byebug", platform: :mri
 end
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.3
+2.1.0
diff --git a/dependencyci.yml b/dependencyci.yml
@@ -0,0 +1,5 @@
+platform:
+  Rubygems:
+    rdf-isomorphic:
+      tests:
+        unmaintained: skip
diff --git a/lib/rdf/microdata/format.rb b/lib/rdf/microdata/format.rb
@@ -26,7 +26,7 @@ class Format < RDF::Format
     # 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;q=0.5', extension: :html unless RDF::Format.for(:rdfa)
     reader { RDF::Microdata::Reader }
 
     ##

diff --git a/lib/rdf/microdata/reader.rb b/lib/rdf/microdata/reader.rb
@@ -281,10 +281,10 @@ def parse_whole_document(doc, base)
       log_info(nil) {"parse_whole_doc: base='#{base}'"}
 
       ec = {
-        :memory             => {},
-        :current_type       => nil,
+        memory:             {},
+        current_type:       nil,
         current_vocabulary: nil,
-        :document_base      => base,
+        document_base:      base,
       }
       # 1) For each element that is also a top-level item, Generate the triples for that item using the evaluation context.
       getItems.each do |el|

diff --git a/rdf-microdata.gemspec b/rdf-microdata.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.test_files            = %w()
   gem.has_rdoc              = false
 
-  gem.required_ruby_version = '>= 2.0'
+  gem.required_ruby_version = '>= 2.2.2'
   gem.requirements          = []
   gem.add_runtime_dependency     'rdf',             '~> 2.0'
   gem.add_runtime_dependency     'rdf-xsd',         '~> 2.0'

diff --git a/spec/reader_spec.rb b/spec/reader_spec.rb
@@ -642,6 +642,7 @@
 
       it "catches infinite recursion" do
         md = %(
+        <html><body>
         <div itemscope>
           <div id="ref">
             <div itemprop="name">friend1</div>
@@ -651,6 +652,7 @@
             </div>
           </div>
         </div>
+        </body></html>
         )
         expect {parse(md, validate: true)}.to raise_error(RDF::ReaderError)
         expect(@logger.to_s).to include("itemref recursion")