Finish 3.1.0

Author: gkellogg

.travis.yml

@@ -1,18 +1,16 @@
 language: ruby
-bundler_args: --without debug
 script: "bundle exec rspec spec"
 env:
   - CI=true
 rvm:
-  - 2.2
-  - 2.3
   - 2.4
-  - jruby-9
-  - rbx-3
+  - 2.5
+  - 2.6
+  - 2.7
+  - jruby
 cache: bundler
 sudo: false
 matrix:
   allow_failures:
-    - rvm: jruby-9
-    - rvm: rbx-3
+    - rvm: jruby
 dist: trusty

Gemfile

@@ -6,7 +6,7 @@ gem 'rdf',      git: "https://github.com/ruby-rdf/rdf",       branch: "develop"
 gem "nokogiri"
 
 group :development do
-  gem 'ebnf',               git: "https://github.com/gkellogg/ebnf",           branch: "develop"
+  gem 'ebnf',               git: "https://github.com/dryruby/ebnf",            branch: "develop"
   gem 'json-ld',            git: "https://github.com/ruby-rdf/json-ld",        branch: "develop"
   gem 'rdf-isomorphic',     git: "https://github.com/ruby-rdf/rdf-isomorphic", branch: "develop"
   gem 'rdf-spec',           git: "https://github.com/ruby-rdf/rdf-spec",       branch: "develop"
@@ -15,8 +15,3 @@ group :development do
   gem "syntax"
   gem "byebug", platform: :mri
 end
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubinius', '~> 2.0'
-end

README.md

@@ -22,8 +22,8 @@ Documentation
 Dependencies
 ------------
 
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.2.2)
-  [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.6.0)
+* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.1)
+  [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.10.0)
 
 Installation
 ------------

VERSION

@@ -1 +1 @@
-2.2.1
+3.1.0

lib/rdf/trix/reader.rb

@@ -66,7 +66,7 @@ class Reader < RDF::Reader
     # @yield  [reader] `self`
     # @yieldparam  [RDF::Reader] reader
     # @yieldreturn [void] ignored
-    def initialize(input = $stdin, options = {}, &block)
+    def initialize(input = $stdin, **options, &block)
       super do
         @library = case options[:library]
           when nil
@@ -97,7 +97,7 @@ def initialize(input = $stdin, options = {}, &block)
         self.extend(@implementation)
 
         begin
-          initialize_xml(options)
+          initialize_xml(**options)
         rescue
           log_error("Malformed document: #{$!.message}")
         end

lib/rdf/trix/reader/libxml.rb

@@ -20,7 +20,7 @@ def self.library
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [void]
-      def initialize_xml(options = {})
+      def initialize_xml(**options)
         require 'libxml' unless defined?(::LibXML)
         @xml = case @input
           when File         then ::LibXML::XML::Document.file(@input.path)

lib/rdf/trix/reader/nokogiri.rb

@@ -20,7 +20,7 @@ def self.library
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [void]
-      def initialize_xml(options = {})
+      def initialize_xml(**options)
         require 'nokogiri' unless defined?(::Nokogiri)
         @xml = ::Nokogiri::XML(@input)
         log_error("Errors: #{@xml.errors.join('\n')}") unless @xml.errors.empty?

lib/rdf/trix/reader/rexml.rb

@@ -20,7 +20,7 @@ def self.library
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [void]
-      def initialize_xml(options = {})
+      def initialize_xml(**options)
         require 'rexml/document' unless defined?(::REXML)
         @xml = ::REXML::Document.new(@input, :compress_whitespace => %w{uri})
       end

lib/rdf/trix/writer.rb

@@ -70,7 +70,7 @@ class Writer < RDF::Writer
     # @yield  [writer] `self`
     # @yieldparam  [RDF::Writer] writer
     # @yieldreturn [void] ignored
-    def initialize(output = $stdout, options = {}, &block)
+    def initialize(output = $stdout, **options, &block)
       @graph_name = nil
       @nesting = 0
 
@@ -104,7 +104,7 @@ def initialize(output = $stdout, options = {}, &block)
       self.extend(@implementation)
 
       @encoding = (options[:encoding] || 'utf-8').to_s
-      initialize_xml(options)
+      initialize_xml(**options)
 
       super do
         if block_given?
@@ -193,11 +193,11 @@ def write_triple(subject, predicate, object)
     # @param  [RDF::Value]             object
     # @param  [Hash{Symbol => Object}] options
     # @return [Element]
-    def format_triple(subject, predicate, object, options = {})
+    def format_triple(subject, predicate, object, **options)
       create_element(:triple) do |triple|
-        triple << format_term(subject, options)
-        triple << format_term(predicate, options)
-        triple << format_term(object, options)
+        triple << format_term(subject, **options)
+        triple << format_term(predicate, **options)
+        triple << format_term(object, **options)
       end
     end
 
@@ -207,7 +207,7 @@ def format_triple(subject, predicate, object, options = {})
     # @param  [RDF::Node]              value
     # @param  [Hash{Symbol => Object}] options
     # @return [Element]
-    def format_node(value, options = {})
+    def format_node(value, **options)
       create_element(:id, value.id.to_s)
     end
 
@@ -217,7 +217,7 @@ def format_node(value, options = {})
     # @param  [RDF::URI]               value
     # @param  [Hash{Symbol => Object}] options
     # @return [Element]
-    def format_uri(value, options = {})
+    def format_uri(value, **options)
       create_element(:uri, value.to_s)
     end
 
@@ -227,7 +227,7 @@ def format_uri(value, options = {})
     # @param  [RDF::Literal, String, #to_s] value
     # @param  [Hash{Symbol => Object}]      options
     # @return [Element]
-    def format_literal(value, options = {})
+    def format_literal(value, **options)
       case
         when value.has_datatype?
           create_element(:typedLiteral, value.value.to_s, 'datatype' => value.datatype.to_s)

lib/rdf/trix/writer/nokogiri.rb

@@ -18,7 +18,7 @@ def self.library
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [void]
-      def initialize_xml(options = {})
+      def initialize_xml(**options)
         require 'nokogiri' unless defined?(::Nokogiri)
         @xml = ::Nokogiri::XML::Document.new
         @xml.encoding = @encoding