Finish keyword-arguments

Author: gkellogg

.travis.yml

@@ -4,11 +4,10 @@ script: "bundle exec rspec spec"
 env:
   - CI=true
 rvm:
-  - 1.9.3
   - 2.0
   - 2.1
-  - 2.2
-  - jruby
+  - 2.2.4
+  - jruby-9.0.4.0
   - rbx-2
 gemfile:
   - Gemfile
@@ -20,4 +19,4 @@ cache: bundler
 sudo: false
 matrix:
   allow_failures:
-      - rvm: jruby
+    - rvm: rbx-2

Gemfile

@@ -19,8 +19,7 @@ end
 group :debug do
   gem "wirble"
   gem "ruby-debug", platforms: :jruby
-  gem "debugger", platforms: :mri_19
-  gem "byebug", platforms: [:mri_20, :mri_21]
+  gem "byebug", platform: :mri
 end
 
 platforms :rbx do

Gemfile-pure

@@ -18,8 +18,7 @@ end
 group :debug do
   gem "wirble"
   gem "ruby-debug", platforms: :jruby
-  gem "debugger", platforms: :mri_19
-  gem "byebug", platforms: [:mri_20, :mri_21]
+  gem "byebug", platform: :mri
 end
 
 platforms :rbx do

README.md

@@ -18,7 +18,7 @@ Install with `gem install rdf-rdfxml`
 
 * 100% free and unencumbered [public domain](http://unlicense.org/) software.
 * Implements a complete parser for [RDF/XML][].
-* Compatible with Ruby >= 1.9.2.
+* Compatible with Ruby >= 2.0.
 
 ## Usage:
 Instantiate a parser and parse source, specifying type and base-URL
@@ -40,7 +40,7 @@ Write a graph to a file:
     end
 
 ## Dependencies
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.0)
 * Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.6.0)
 
 ## Documentation

etc/earl.ttl

@@ -4,6 +4,7 @@
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix xhv: <http://www.w3.org/1999/xhtml/vocab#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 <http://rubygems.org/gems/rdf-rdfxml> a doap:Project;
    dc:creator <http://greggkellogg.net/foaf#me>;
@@ -28,7 +29,7 @@
    foaf:maker <http://greggkellogg.net/foaf#me> .
 
 <> foaf:primaryTopic <http://rubygems.org/gems/rdf-rdfxml> ;
-  dct:issued "2014-01-29T11:10:43-08:00"^^xsd:dateTime ;
+  dc:issued "2014-01-29T11:10:43-08:00"^^xsd:dateTime ;
   foaf:maker <http://greggkellogg.net/foaf#me> .
 
 <http://greggkellogg.net/foaf#me> a foaf:Person, earl:Assertor;

lib/rdf/rdfxml/reader.rb

@@ -283,7 +283,7 @@ def add_error(node, message = "", &block)
     # @return [Statement] Added statement
     # @raise [RDF::ReaderError] Checks parameter types and raises if they are incorrect if validating.
     def add_triple(node, subject, predicate, object)
-      statement = RDF::Statement.new(subject, predicate, object)
+      statement = RDF::Statement(subject, predicate, object)
       add_debug(node) {"statement: #{statement}"}
       @callback.call(statement)
     end

lib/rdf/rdfxml/writer.rb

@@ -234,7 +234,7 @@ def render_property(predicate, objects, options = {}, &block)
       # Separate out the objects which are lists and render separately
       lists = objects.
         select(&:node?).
-        map {|o| RDF::List.new(o, @graph)}.
+        map {|o| RDF::List.new(subject: o, graph: @graph)}.
         select {|l| l.valid? && l.none?(&:literal?)}
 
       unless lists.empty?

rdf-rdfxml.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.require_paths         = %w(lib)
   gem.has_rdoc              = false
 
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.0.0'
   gem.requirements          = []
 
   gem.add_runtime_dependency     'rdf',             '~> 1.99'

spec/suite_helper.rb

@@ -119,11 +119,11 @@ def base
 
       # Alias data and query
       def input
-        RDF::Util::File.open_file(action)
+        RDF::Util::File.open_file(action) {|f| f.read}
       end
 
       def expected
-        RDF::Util::File.open_file(result)
+        RDF::Util::File.open_file(result) {|f| f.read}
       end
 
       def evaluate?

spec/suite_spec.rb

@@ -13,7 +13,7 @@
             specify "#{t.name}" do
               t.logger = RDF::Spec.logger
               t.logger.info t.inspect
-              t.logger.info "source:\n#{t.input.read}"
+              t.logger.info "source:\n#{t.input}"
 
               reader = RDF::RDFXML::Reader.new(t.input,
                   base_uri: t.base,