rdf 2.2.8 → 2.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a77462d7aa84383474aec0d885fcff326293c41
-  data.tar.gz: fc3ff787ef744bb281ce34a3a9d415232fd4081a
+  metadata.gz: 4c1a5dbdabcabf42a336dcd47777e3bca134a2fa
+  data.tar.gz: 0dd66ec264c9dd2b475a12d615fe88bb6ef73a91
 SHA512:
-  metadata.gz: 0e257e359a05481b608dad6d3fd783e723485aaa7dd7cee828fdc3e9202b2625541fb3bc324dc4fe6703ec487c62667bbbef1f2febcddb357bee3b3abf74eea2
-  data.tar.gz: fe307ff319e3c78a1aec5d014b6a57dce05b4cdac64c88dad09fdab9d7d6f238f31ff64e5cf33a1ac8110530de3477755e5e5b860683517adf11cd0a819ed626
+  metadata.gz: 56a8bcbe0ce7eb75dfb7854efe9dfabdb17ad2f05895ac0c3f5d6084a004a97fd51b1b5a58084823e18f844f41676cdafe9be8e3fd0ebf808b0c0572e44cc9fc
+  data.tar.gz: c069aa63600fb1d0b50179c1aa0f2314bed3463eb087c7589661cc5b804dafab1155ae181cc867d85917c18b8e51576294b25e66830bd9ed55a4850a16128c96

data/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>
 

data/VERSION

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

data/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/> .

data/lib/rdf/cli.rb

@@ -124,11 +124,13 @@ module RDF
         @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 @@ module RDF
             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 @@ module RDF
             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 @@ module RDF
     #     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 @@ module RDF
 
     ##
     # 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 @@ module RDF
         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

data/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
 

data/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
   # ------------

data/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.2.9
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
@@ -297,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rdf
+rubyforge_project: 
 rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4