Merge branch 'master' into nokogiri-error-handling

.travis.yml

@@ -1,11 +1,13 @@
 # https://github.com/travis-ci/travis-ci/wiki/.travis.yml-options
 language: "ruby"
-script: "bundle exec rake"
-sudo: false
 rvm:
   - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-  - jruby
-  - rbx-2
+  - 2.1.10
+  - 2.2.10
+  - 2.3.8
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
+  - jruby-9.2.12.0
+cache: bundler

README.md

@@ -1,10 +1,10 @@
 Nori
 ====
 
-[![Build Status](https://secure.travis-ci.org/savonrb/nori.png)](http://travis-ci.org/savonrb/nori)
-[![Gem Version](https://badge.fury.io/rb/nori.png)](http://badge.fury.io/rb/nori)
-[![Code Climate](https://codeclimate.com/github/savonrb/nori.png)](https://codeclimate.com/github/savonrb/nori)
-[![Coverage Status](https://coveralls.io/repos/savonrb/nori/badge.png?branch=master)](https://coveralls.io/r/savonrb/nori)
+[![Build Status](https://secure.travis-ci.org/savonrb/nori.svg?branch=master)](http://travis-ci.org/savonrb/nori)
+[![Gem Version](https://badge.fury.io/rb/nori.svg)](http://badge.fury.io/rb/nori)
+[![Code Climate](https://codeclimate.com/github/savonrb/nori.svg)](https://codeclimate.com/github/savonrb/nori)
+[![Coverage Status](https://coveralls.io/repos/savonrb/nori/badge.svg?branch=master)](https://coveralls.io/r/savonrb/nori)
 
 
 Really simple XML parsing ripped from Crack which ripped it from Merb.  

nori.gemspec

@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
   s.description = s.summary
   s.required_ruby_version = '>= 1.9.2'
 
-  s.rubyforge_project = "nori"
   s.license = "MIT"
 
   s.add_development_dependency "rake",     "~> 10.0"

spec/nori/api_spec.rb

@@ -156,7 +156,7 @@
   end
 
   context "#parse with :convert_dashes_to_underscores" do
-    it "can be configured to skip dash to underscope conversion" do
+    it "can be configured to skip dash to underscore conversion" do
       xml = '<any-tag>foo bar</any-tag>'
       hash = nori(:convert_dashes_to_underscores => false).parse(xml)
       expect(hash).to eq({'any-tag' => 'foo bar'})

spec/nori/core_ext/object_spec.rb

@@ -5,13 +5,13 @@
   describe "#blank?" do
     [nil, false, [], {}].each do |object|
       it "should return true for: #{object.inspect}" do
-        expect(object.blank?).to be_true
+        expect(object.blank?).to eq true
       end
     end
 
     [true, [nil], 1, "string", { :key => "value" }].each do |object|
       it "should return false for: #{object.inspect}" do
-        expect(object.blank?).to be_false
+        expect(object.blank?).to eq false
       end
     end
   end