Skip to content

Commit 47e9aea

Browse files
gkellogggkellogg
committed
Release 2.0.0.beta1
2 parents d16950e + e96c3ff commit 47e9aea

24 files changed

+482
-583
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
/.rbx/
77
/spec/w3c-rdf
88
*.lock
9+
*.byebug_history

‎.travis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ script: "bundle exec rspec spec"
44
env:
55
- CI=true
66
rvm:
7-
- 1.9.3
87
- 2.0
98
- 2.1
10-
- 2.2
11-
- jruby
9+
- 2.2.4
10+
- 2.3.0
11+
- jruby-9.0.4.0
1212
- rbx-2
1313
gemfile:
1414
- Gemfile
@@ -20,4 +20,4 @@ cache: bundler
2020
sudo: false
2121
matrix:
2222
allow_failures:
23-
- rvm: jruby
23+
- rvm: rbx-2

‎Gemfile‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,28 @@ source "https://rubygems.org"
22

33
gemspec
44

5-
gem "rdf", :git => "git://github.com/ruby-rdf/rdf.git", :branch => "develop"
6-
gem "rdf-rdfa", :git => "git://github.com/ruby-rdf/rdf-rdfa.git", :branch => "develop"
5+
gem 'rdf', github: "ruby-rdf/rdf", branch: "develop"
6+
gem 'rdf-rdfa', github: "ruby-rdf/rdf-rdfa", branch: "develop"
77
gem "nokogiri"
88

99
group :development do
10+
gem 'ebnf', github: "gkellogg/ebnf", branch: "develop"
11+
gem 'json-ld', github: "ruby-rdf/json-ld", branch: "develop"
12+
gem 'rdf-aggregate-repo', github: "ruby-rdf/rdf-aggregate-repo", branch: "develop"
13+
gem 'rdf-isomorphic', github: "ruby-rdf/rdf-isomorphic", branch: "develop"
14+
gem 'rdf-spec', github: "ruby-rdf/rdf-spec", branch: "develop"
15+
gem 'rdf-turtle', github: "ruby-rdf/rdf-turtle", branch: "develop"
16+
gem 'rdf-vocab', github: "ruby-rdf/rdf-vocab", branch: "develop"
17+
gem "rdf-xsd", github: "ruby-rdf/rdf-xsd", branch: "develop"
18+
gem 'sxp', github: "gkellogg/sxp-ruby"
19+
1020
gem "equivalent-xml"
11-
gem "rdf-xsd", :git => "git://github.com/ruby-rdf/rdf-xsd.git", :branch => "develop"
12-
gem 'json-ld', :git => "git://github.com/ruby-rdf/json-ld.git", :branch => "develop"
13-
gem 'rdf-isomorphic', :git => "git://github.com/ruby-rdf/rdf-isomorphic.git", :branch => "develop"
14-
gem "rdf-spec", :git => "git://github.com/ruby-rdf/rdf-spec.git", :branch => "develop"
15-
gem "rdf-turtle", :git => "git://github.com/ruby-rdf/rdf-turtle.git", :branch => "develop"
16-
gem "rdf-vocab", :git => "git://github.com/ruby-rdf/rdf-vocab.git", :branch => "develop"
1721
end
1822

1923
group :debug do
2024
gem "wirble"
21-
gem "ruby-debug", :platforms => :jruby
22-
gem "debugger", :platforms => :mri_19
23-
gem "byebug", :platforms => [:mri_20, :mri_21]
25+
gem "ruby-debug", platforms: :jruby
26+
gem "byebug", platform: :mri
2427
end
2528

2629
platforms :rbx do

‎Gemfile-pure‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,27 @@ source "https://rubygems.org"
33

44
gemspec
55

6-
gem "rdf", :git => "git://github.com/ruby-rdf/rdf.git", :branch => "develop"
7-
gem "rdf-rdfa", :git => "git://github.com/ruby-rdf/rdf-rdfa.git", :branch => "develop"
6+
gem 'rdf', github: "ruby-rdf/rdf", branch: "develop"
7+
gem 'rdf-rdfa', github: "ruby-rdf/rdf-rdfa", branch: "develop"
88

99
group :development do
10-
gem "rdf-xsd", :git => "git://github.com/ruby-rdf/rdf-xsd.git", :branch => "develop"
11-
gem 'json-ld', :git => "git://github.com/ruby-rdf/json-ld.git", :branch => "develop"
12-
gem 'rdf-isomorphic', :git => "git://github.com/ruby-rdf/rdf-isomorphic.git", :branch => "develop"
13-
gem "rdf-spec", :git => "git://github.com/ruby-rdf/rdf-spec.git", :branch => "develop"
14-
gem "rdf-turtle", :git => "git://github.com/ruby-rdf/rdf-turtle.git", :branch => "develop"
15-
gem "rdf-vocab", :git => "git://github.com/ruby-rdf/rdf-vocab.git", :branch => "develop"
10+
gem 'ebnf', github: "gkellogg/ebnf", branch: "develop"
11+
gem 'json-ld', github: "ruby-rdf/json-ld", branch: "develop"
12+
gem 'rdf-aggregate-repo', github: "ruby-rdf/rdf-aggregate-repo", branch: "develop"
13+
gem 'rdf-isomorphic', github: "ruby-rdf/rdf-isomorphic", branch: "develop"
14+
gem 'rdf-spec', github: "ruby-rdf/rdf-spec", branch: "develop"
15+
gem 'rdf-turtle', github: "ruby-rdf/rdf-turtle", branch: "develop"
16+
gem 'rdf-vocab', github: "ruby-rdf/rdf-vocab", branch: "develop"
17+
gem "rdf-xsd", github: "ruby-rdf/rdf-xsd", branch: "develop"
18+
gem 'sxp', github: "gkellogg/sxp-ruby"
19+
20+
gem "equivalent-xml"
1621
end
1722

1823
group :debug do
1924
gem "wirble"
20-
gem "ruby-debug", :platforms => :jruby
21-
gem "debugger", :platforms => :mri_19
22-
gem "byebug", :platforms => [:mri_20, :mri_21]
25+
gem "ruby-debug", platforms: :jruby
26+
gem "byebug", platform: :mri
2327
end
2428

2529
platforms :rbx do

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Install with `gem install rdf-rdfxml`
1818

1919
* 100% free and unencumbered [public domain](http://unlicense.org/) software.
2020
* Implements a complete parser for [RDF/XML][].
21-
* Compatible with Ruby >= 1.9.2.
21+
* Compatible with Ruby >= 2.0.
2222

2323
## Usage:
2424
Instantiate a parser and parse source, specifying type and base-URL
@@ -40,7 +40,7 @@ Write a graph to a file:
4040
end
4141

4242
## Dependencies
43-
* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1)
43+
* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.0)
4444
* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.6.0)
4545

4646
## Documentation

‎Rakefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ namespace :spec do
4646
end
4747
end
4848

49-
task :specs => :spec
50-
task :default => :spec
49+
task specs: :spec
50+
task default: :spec
5151

5252

5353
desc "Generate etc/doap.{nt,ttl} from etc/doap.html."

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.99.0
1+
2.0.0.beta1

‎etc/earl.ttl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
@prefix foaf: <http://xmlns.com/foaf/0.1/> .
55
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
66
@prefix xhv: <http://www.w3.org/1999/xhtml/vocab#> .
7+
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
78

89
<http://rubygems.org/gems/rdf-rdfxml> a doap:Project;
910
dc:creator <http://greggkellogg.net/foaf#me>;
@@ -28,7 +29,7 @@
2829
foaf:maker <http://greggkellogg.net/foaf#me> .
2930

3031
<> foaf:primaryTopic <http://rubygems.org/gems/rdf-rdfxml> ;
31-
dct:issued "2014-01-29T11:10:43-08:00"^^xsd:dateTime ;
32+
dc:issued "2014-01-29T11:10:43-08:00"^^xsd:dateTime ;
3233
foaf:maker <http://greggkellogg.net/foaf#me> .
3334

3435
<http://greggkellogg.net/foaf#me> a foaf:Person, earl:Assertor;

‎example-files/tom-morris.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</rdf:RDF>
3131
EOF
3232

33-
RDF::RDFXML::Reader.new(data, :base_uri => 'http://example.org/example.xml') do |reader|
33+
RDF::RDFXML::Reader.new(data, base_uri: 'http://example.org/example.xml') do |reader|
3434
reader.each_statement do |statement|
3535
statement.inspect!
3636
end

‎lib/rdf/rdfxml/format.rb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ module RDF::RDFXML
66
# RDF::Format.for(:rdf) # RDF::RDFXML::Format
77
# RDF::Format.for(:rdfxml) # RDF::RDFXML::Format
88
# RDF::Format.for("etc/foaf.xml")
9-
# RDF::Format.for(:file_name => "etc/foaf.xml")
10-
# RDF::Format.for(:file_extension => "xml")
11-
# RDF::Format.for(:file_extension => "rdf")
12-
# RDF::Format.for(:content_type => "application/xml")
13-
# RDF::Format.for(:content_type => "application/rdf+xml")
9+
# RDF::Format.for(file_name: "etc/foaf.xml")
10+
# RDF::Format.for(file_extension: "xml")
11+
# RDF::Format.for(file_extension: "rdf")
12+
# RDF::Format.for(content_type: "application/xml")
13+
# RDF::Format.for(content_type: "application/rdf+xml")
1414
#
1515
# @example Obtaining serialization format MIME types
1616
# RDF::Format.content_types #=> {"application/rdf+xml" => [RDF::RDFXML::Format]}
1717
#
1818
# @example Obtaining serialization format file extension mappings
19-
# RDF::Format.file_extensions #=> {:rdf => "application/rdf+xml"}
19+
# RDF::Format.file_extensions #=> {rdf: "application/rdf+xml"}
2020
#
2121
# @see http://www.w3.org/TR/rdf-testcases/#ntriples
2222
class Format < RDF::Format
23-
content_type 'application/rdf+xml', :extension => :rdf
23+
content_type 'application/rdf+xml', extensions: [:rdf, :owl]
2424
content_encoding 'utf-8'
2525

2626
reader { RDF::RDFXML::Reader }
@@ -45,7 +45,7 @@ def self.name
4545
end
4646

4747
def self.symbols
48-
[:rdfxml, :rdf]
48+
[:rdfxml, :rdf, :owl]
4949
end
5050
end
5151
end

0 commit comments

Comments
 (0)