Release 2.0.0.beta1

ruby-rdf · Feb 22, 2016 · 47e9aea · 47e9aea
2 parents d16950e + e96c3ff
commit 47e9aea
Show file tree

Hide file tree

Showing 24 changed files with 482 additions and 583 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@
 /.rbx/
 /spec/w3c-rdf
 *.lock
+*.byebug_history
diff --git a/.travis.yml b/.travis.yml
@@ -4,11 +4,11 @@ script: "bundle exec rspec spec"
 env:
   - CI=true
 rvm:
-  - 1.9.3
   - 2.0
   - 2.1
-  - 2.2
-  - jruby
+  - 2.2.4
+  - 2.3.0
+  - jruby-9.0.4.0
   - rbx-2
 gemfile:
   - Gemfile
@@ -20,4 +20,4 @@ cache: bundler
 sudo: false
 matrix:
   allow_failures:
-      - rvm: jruby
+    - rvm: rbx-2
diff --git a/Gemfile b/Gemfile
@@ -2,25 +2,28 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rdf",            :git => "git://github.com/ruby-rdf/rdf.git", :branch => "develop"
-gem "rdf-rdfa",       :git => "git://github.com/ruby-rdf/rdf-rdfa.git", :branch => "develop"
+gem 'rdf',      github: "ruby-rdf/rdf",       branch: "develop"
+gem 'rdf-rdfa', github: "ruby-rdf/rdf-rdfa",  branch: "develop"
 gem "nokogiri"
 
 group :development do
+  gem 'ebnf',               github: "gkellogg/ebnf",                branch: "develop"
+  gem 'json-ld',            github: "ruby-rdf/json-ld",             branch: "develop"
+  gem 'rdf-aggregate-repo', github: "ruby-rdf/rdf-aggregate-repo",  branch: "develop"
+  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 'rdf-vocab',          github: "ruby-rdf/rdf-vocab",           branch: "develop"
+  gem "rdf-xsd",            github: "ruby-rdf/rdf-xsd",             branch: "develop"
+  gem 'sxp',                github: "gkellogg/sxp-ruby"
+
   gem "equivalent-xml"
-  gem "rdf-xsd",        :git => "git://github.com/ruby-rdf/rdf-xsd.git", :branch => "develop"
-  gem 'json-ld',        :git => "git://github.com/ruby-rdf/json-ld.git", :branch => "develop"
-  gem 'rdf-isomorphic', :git => "git://github.com/ruby-rdf/rdf-isomorphic.git", :branch => "develop"
-  gem "rdf-spec",       :git => "git://github.com/ruby-rdf/rdf-spec.git", :branch => "develop"
-  gem "rdf-turtle",     :git => "git://github.com/ruby-rdf/rdf-turtle.git", :branch => "develop"
-  gem "rdf-vocab",      :git => "git://github.com/ruby-rdf/rdf-vocab.git", :branch => "develop"
 end
 
 group :debug do
   gem "wirble"
-  gem "ruby-debug", :platforms => :jruby
-  gem "debugger", :platforms => :mri_19
-  gem "byebug", :platforms => [:mri_20, :mri_21]
+  gem "ruby-debug", platforms: :jruby
+  gem "byebug",     platform: :mri
 end
 
 platforms :rbx do

diff --git a/Gemfile-pure b/Gemfile-pure
@@ -3,23 +3,27 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rdf",            :git => "git://github.com/ruby-rdf/rdf.git", :branch => "develop"
-gem "rdf-rdfa",       :git => "git://github.com/ruby-rdf/rdf-rdfa.git", :branch => "develop"
+gem 'rdf',      github: "ruby-rdf/rdf",       branch: "develop"
+gem 'rdf-rdfa', github: "ruby-rdf/rdf-rdfa",  branch: "develop"
 
 group :development do
-  gem "rdf-xsd",        :git => "git://github.com/ruby-rdf/rdf-xsd.git", :branch => "develop"
-  gem 'json-ld',        :git => "git://github.com/ruby-rdf/json-ld.git", :branch => "develop"
-  gem 'rdf-isomorphic', :git => "git://github.com/ruby-rdf/rdf-isomorphic.git", :branch => "develop"
-  gem "rdf-spec",       :git => "git://github.com/ruby-rdf/rdf-spec.git", :branch => "develop"
-  gem "rdf-turtle",     :git => "git://github.com/ruby-rdf/rdf-turtle.git", :branch => "develop"
-  gem "rdf-vocab",      :git => "git://github.com/ruby-rdf/rdf-vocab.git", :branch => "develop"
+  gem 'ebnf',               github: "gkellogg/ebnf",                branch: "develop"
+  gem 'json-ld',            github: "ruby-rdf/json-ld",             branch: "develop"
+  gem 'rdf-aggregate-repo', github: "ruby-rdf/rdf-aggregate-repo",  branch: "develop"
+  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 'rdf-vocab',          github: "ruby-rdf/rdf-vocab",           branch: "develop"
+  gem "rdf-xsd",            github: "ruby-rdf/rdf-xsd",             branch: "develop"
+  gem 'sxp',                github: "gkellogg/sxp-ruby"
+
+  gem "equivalent-xml"
 end
 
 group :debug do
   gem "wirble"
-  gem "ruby-debug", :platforms => :jruby
-  gem "debugger", :platforms => :mri_19
-  gem "byebug", :platforms => [:mri_20, :mri_21]
+  gem "ruby-debug", platforms: :jruby
+  gem "byebug",     platform: :mri
 end
 
 platforms :rbx do

diff --git a/README.md b/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

diff --git a/Rakefile b/Rakefile
@@ -46,8 +46,8 @@ namespace :spec do
   end
 end
 
-task :specs => :spec
-task :default => :spec
+task specs: :spec
+task default: :spec
 
 
 desc "Generate etc/doap.{nt,ttl} from etc/doap.html."

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.99.0
+2.0.0.beta1
diff --git a/etc/earl.ttl b/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;

diff --git a/example-files/tom-morris.rb b/example-files/tom-morris.rb
@@ -30,7 +30,7 @@
   </rdf:RDF>
 EOF
 
-RDF::RDFXML::Reader.new(data, :base_uri => 'http://example.org/example.xml') do |reader|
+RDF::RDFXML::Reader.new(data, base_uri: 'http://example.org/example.xml') do |reader|
   reader.each_statement do |statement|
     statement.inspect!
   end

diff --git a/lib/rdf/rdfxml/format.rb b/lib/rdf/rdfxml/format.rb
@@ -6,21 +6,21 @@ module RDF::RDFXML
   #   RDF::Format.for(:rdf)         # RDF::RDFXML::Format
   #   RDF::Format.for(:rdfxml)      # RDF::RDFXML::Format
   #   RDF::Format.for("etc/foaf.xml")
-  #   RDF::Format.for(:file_name      => "etc/foaf.xml")
-  #   RDF::Format.for(:file_extension => "xml")
-  #   RDF::Format.for(:file_extension => "rdf")
-  #   RDF::Format.for(:content_type   => "application/xml")
-  #   RDF::Format.for(:content_type   => "application/rdf+xml")
+  #   RDF::Format.for(file_name: "etc/foaf.xml")
+  #   RDF::Format.for(file_extension: "xml")
+  #   RDF::Format.for(file_extension: "rdf")
+  #   RDF::Format.for(content_type: "application/xml")
+  #   RDF::Format.for(content_type: "application/rdf+xml")
   #
   # @example Obtaining serialization format MIME types
   #   RDF::Format.content_types      #=> {"application/rdf+xml" => [RDF::RDFXML::Format]}
   #
   # @example Obtaining serialization format file extension mappings
-  #   RDF::Format.file_extensions    #=> {:rdf => "application/rdf+xml"}
+  #   RDF::Format.file_extensions    #=> {rdf: "application/rdf+xml"}
   #
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
   class Format < RDF::Format
-    content_type     'application/rdf+xml', :extension => :rdf
+    content_type     'application/rdf+xml', extensions: [:rdf, :owl]
     content_encoding 'utf-8'
 
     reader { RDF::RDFXML::Reader }
@@ -45,7 +45,7 @@ def self.name
     end
 
     def self.symbols
-      [:rdfxml, :rdf]
+      [:rdfxml, :rdf, :owl]
     end
   end
 end