Finish 2.2.9

README.md

@@ -360,7 +360,6 @@ follows:
 * <http://rubydoc.info/github/ruby-rdf/rdf/frames>
 * <http://github.com/ruby-rdf/rdf>
 * <http://rubygems.org/gems/rdf>
-* <http://rubyforge.org/projects/rdf/>
 * <http://raa.ruby-lang.org/project/rdf/>
 * <http://www.ohloh.net/p/rdf>
 

VERSION

@@ -1 +1 @@
-2.2.8
+2.2.9

etc/doap.nq

@@ -31,7 +31,7 @@
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#documenter> <http://ar.to/#self> .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#documenter> <http://bhuga.net/#ben> .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#documenter> <http://greggkellogg.net/foaf#me> .
-<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#download-page> <http://rubyforge.org/projects/rdf/> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#download-page> <http://rubygems.org/gems/rdf/> .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#helper> _:genid1 .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#helper> _:genid2 .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#helper> _:genid3 .

etc/doap.nt

@@ -11,7 +11,7 @@
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#implements> <http://www.w3.org/TR/rdf11-concepts/> .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#implements> <http://www.w3.org/TR/n-quads/> .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#implements> <http://www.w3.org/TR/n-triples/> .
-<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#download-page> <http://rubyforge.org/projects/rdf/> .
+<http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#download-page> <http://rubygems.org/gems/rdf/> .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#bug-database> <http://github.com/ruby-rdf/rdf/issues> .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#blog> <http://ar.to/> .
 <http://rubygems.org/gems/rdf> <http://usefulinc.com/ns/doap#blog> <http://blog.datagraph.org/> .

etc/doap.ttl

@@ -18,7 +18,7 @@
   doap:implements    <http://www.w3.org/TR/rdf11-concepts/>,
                      <http://www.w3.org/TR/n-quads/>,
                      <http://www.w3.org/TR/n-triples/> ;
-  doap:download-page <http://rubyforge.org/projects/rdf/> ;
+  doap:download-page <http://rubygems.org/gems/rdf/> ;
   doap:bug-database  <http://github.com/ruby-rdf/rdf/issues> ;
   doap:blog          <http://ar.to/>, <http://blog.datagraph.org/> ;
   doap:vendor        <http://datagraph.org/> ;

lib/rdf/cli.rb

@@ -124,11 +124,13 @@ def initialize(symbol: nil, on: nil, datatype: nil, control: nil,
         @symbol, @on, @datatype, @control, @description, @use, @callback = symbol.to_sym, Array(on), datatype, control, description, use, block
       end
 
-      def call(arg, options)
+      def call(arg, options = {})
         if @callback
           case @callback.arity
+          when 0 then @callback.call
           when 1 then @callback.call(arg)
           when 2 then @callback.call(arg, options)
+          else arg
           end
         else
           arg
@@ -305,7 +307,7 @@ def to_hash
             on_args = cli_opt.on || []
             on_args << cli_opt.description if cli_opt.description
             options.on(*on_args) do |opt_arg|
-              options.options[cli_opt.symbol] = cli_opt.call(opt_arg)
+              options.options[cli_opt.symbol] = cli_opt.call(opt_arg, options)
             end
           end if reader
           arg.downcase.to_sym
@@ -327,7 +329,7 @@ def to_hash
             on_args = cli_opt.on || []
             on_args << cli_opt.description if cli_opt.description
             options.on(*on_args) do |opt_arg|
-              options.options[cli_opt.symbol] = cli_opt.call(opt_arg)
+              options.options[cli_opt.symbol] = cli_opt.call(opt_arg, options)
             end
           end if writer
           arg.downcase.to_sym
@@ -358,7 +360,7 @@ def self.basename() File.basename($0) end
     #     Returns discovered options
     def self.options(argv, format: nil)
       options = OptionParser.new
-      cli_opts = OPTIONS.dup
+      cli_opts = OPTIONS.map(&:dup)
       logger = Logger.new($stderr)
       logger.level = Logger::WARN
       logger.formatter = lambda {|severity, datetime, progname, msg| "#{severity} #{msg}\n"}
@@ -428,7 +430,7 @@ def self.options(argv, format: nil)
 
     ##
     # Output usage message
-    def self.usage(options, cmd_opts = {}, banner: nil)
+    def self.usage(options, cmd_opts: {}, banner: nil)
       options.banner = banner if banner
       $stdout.puts options
       $stdout.puts "Note: available commands and options may be different depending on selected --input-format and/or --output-format."
@@ -505,6 +507,17 @@ def self.exec(args, output: $stdout, option_parser: nil, messages: {}, **options
         COMMANDS[command.to_sym][:lambda].call(args, output: output, **options.merge(messages: messages))
       end
 
+      # Normalize messages
+      messages.each do |kind, term_messages|
+        case term_messages
+        when Hash
+        when Array
+          messages[kind] = {result: term_messages}
+        else
+          messages[kind] = {result: [term_messages]}
+        end
+      end
+
       if options[:statistics]
         options[:statistics][:reader] = @readers.first unless (@readers || []).empty?
         options[:statistics][:count] = @repository.count

lib/rdf/model/uri.rb

@@ -23,7 +23,7 @@ module RDF
   # @see http://en.wikipedia.org/wiki/Uniform_Resource_Identifier
   # @see http://www.ietf.org/rfc/rfc3986.txt
   # @see http://www.ietf.org/rfc/rfc3987.txt
-  # @see http://addressable.rubyforge.org/
+  # @see http://www.rubydoc.info/gems/addressable
   class URI
     include RDF::Resource
 

lib/rdf/ntriples.rb

@@ -13,7 +13,7 @@ module RDF
   #
   # An example of an RDF statement in N-Triples format:
   #
-  #     <http://rubyforge.org/> <http://purl.org/dc/terms/title> "RubyForge" .
+  #     <http://rubygems.org/gems/rdf> <http://purl.org/dc/terms/title> "rdf" .
   #
   # Installation
   # ------------

lib/rdf/util/cache.rb

@@ -9,8 +9,8 @@ module RDF; module Util
   #
   # While this cache is something of an internal implementation detail of
   # RDF.rb, some external libraries do currently make use of it as well,
-  # including [SPARQL](http://ruby-rdf/sparql/) and
-  # [Spira](http://spira.rubyforge.org/). Do be sure to include any changes
+  # including [SPARQL](http://github.com/ruby-rdf/sparql/) and
+  # [Spira](http://github.com/ruby-rdf/spira). Do be sure to include any changes
   # here in the RDF.rb changelog.
   #
   # @see   RDF::URI.intern

rdf.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |gem|
   gem.license            = 'Unlicense'
   gem.summary            = 'A Ruby library for working with Resource Description Framework (RDF) data.'
   gem.description        = 'RDF.rb is a pure-Ruby library for working with Resource Description Framework (RDF) data.'
-  gem.rubyforge_project  = 'rdf'
 
   gem.authors            = ['Arto Bendiken', 'Ben Lavender', 'Gregg Kellogg']
   gem.email              = '[email protected]'