Finish 3.0.13

Author: gkellogg

VERSION

@@ -1 +1 @@
-3.0.12
+3.0.13

lib/rdf.rb

@@ -6,6 +6,9 @@
 require 'rdf/version'
 require 'rdf/extensions'
 
+# When loading, issue deprecation warning on forthcoming unsupported versions of Ruby
+warn "[DEPRECATION] Ruby 2.4+ required in next version 3.1 of RDF.rb" if RUBY_VERSION < "2.4"
+
 module RDF
   # RDF mixins
   autoload :Countable,         'rdf/mixin/countable'

lib/rdf/cli.rb

@@ -262,7 +262,7 @@ def to_hash
         description: "Validate parsed input",
         control: :none,
         parse: true,
-        help: "validate [options] [args...]\nvalidates parsed input (may also be used with --validate)",
+        help: "validate [options] [args...]\nvalidates resulting repository (may also be used with --validate to check for parse-time errors)",
         lambda: ->(argv, opts) do
           opts[:output].puts "Input is " + (repository.valid? ? "" : "in") + "valid"
         end,

lib/rdf/model/literal.rb

@@ -49,7 +49,7 @@ module RDF
   #   RDF::Literal.new(123).datatype                 #=> XSD.integer
   #   RDF::Literal.new(9223372036854775807).datatype #=> XSD.integer
   #   RDF::Literal.new(3.1415).datatype              #=> XSD.double
-  #   RDF::Literal.new(Time.now).datatype            #=> XSD.time
+  #   RDF::Literal.new(Time.now).datatype            #=> XSD.dateTime
   #   RDF::Literal.new(Date.new(2010)).datatype      #=> XSD.date
   #   RDF::Literal.new(DateTime.new(2010)).datatype  #=> XSD.dateTime
   #
@@ -119,8 +119,8 @@ def self.new(value, language: nil, datatype: nil, lexical: nil, validate: false,
           when ::Float      then RDF::Literal::Double
           when ::BigDecimal then RDF::Literal::Decimal
           when ::DateTime   then RDF::Literal::DateTime
+          when ::Time       then RDF::Literal::DateTime
           when ::Date       then RDF::Literal::Date
-          when ::Time       then RDF::Literal::Time # FIXME: Ruby's Time class can represent datetimes as well
           when ::Symbol     then RDF::Literal::Token
           else self
         end
@@ -360,7 +360,7 @@ def has_datatype?
     # @return [Boolean] `true` or `false`
     # @since  0.2.1
     def valid?
-      return false if language? && language.to_s !~ /^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/
+      return false if language? && language.to_s !~ /^[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*$/
       return false if datatype? && datatype.invalid?
       grammar = self.class.const_get(:GRAMMAR) rescue nil
       grammar.nil? || value.match?(grammar)

lib/rdf/model/uri.rb

@@ -431,7 +431,9 @@ def join(*uris)
           joined_parts[:query] = uri.query
         else
           # Merge path segments from section 5.2.3
-          base_path = path.to_s.sub(/\/[^\/]*$/, '/')
+          # Note that if the path includes no segments, the entire path is removed
+          #  > return a string consisting of the reference's path component appended to all but the last segment of the base URI's path (i.e., excluding any characters after the right-most "/" in the base URI path, or excluding the entire base URI path if it does not contain any "/" characters).
+          base_path = path.to_s.include?('/') ? path.to_s.sub(/\/[^\/]*$/, '/') : ''
           joined_parts[:path] = self.class.normalize_path(base_path + uri.path)
           joined_parts[:query] = uri.query
         end

lib/rdf/util/file.rb

@@ -32,6 +32,7 @@ class HttpAdapter
       # @return [Hash] A hash of HTTP request headers
       def self.headers headers: {}
         headers['Accept'] ||= default_accept_header
+        headers['User-Agent'] ||= default_user_agent
         headers
       end
 
@@ -40,14 +41,24 @@ def self.headers headers: {}
       def self.default_accept_header
         (RDF::Format.accept_types + %w(*/*;q=0.1)).join(", ")
       end
-      
+
+      ##
+      # @return [String] the default User-Agent used when fetching resources.
+      def self.default_user_agent
+        "Ruby RDF.rb/#{RDF::VERSION}"
+      end
+
       ##
       # @abstract
       # @param [String] base_uri to open
       # @param [String] proxy
       #   HTTP Proxy to use for requests.
       # @param [Array, String] headers ({})
       #   HTTP Request headers
+      #
+      #   Defaults `Accept` header based on available reader content types to allow for content negotiation based on available readers.
+      #
+      #   Defaults  `User-Agent` header, unless one is specified.
       # @param [Boolean] verify_none (false)
       #   Don't verify SSL certificates
       # @param  [Hash{Symbol => Object}] options
@@ -249,19 +260,13 @@ def http_adapter(use_net_http = false)
     ##
     # Open the file, returning or yielding {RemoteDocument}.
     #
-    # Adds Accept header based on available reader content types to allow
-    # for content negotiation based on available readers.
-    #
     # Input received as non-unicode, is transformed to UTF-8. With Ruby >= 2.2, all UTF is normalized to [Unicode Normalization Form C (NFC)](http://unicode.org/reports/tr15/#Norm_Forms).
     #
     # HTTP resources may be retrieved via proxy using the `proxy` option. If `RestClient` is loaded, they will use the proxy globally by setting something like the following:
     #     `RestClient.proxy = "http://proxy.example.com/"`.
     # When retrieving documents over HTTP(S), use the mechanism described in [Providing and Discovering URI Documentation](http://www.w3.org/2001/tag/awwsw/issue57/latest/) to pass the appropriate `base_uri` to the block or as the return.
     #
-    # Applications needing HTTP caching may consider
-    # [Rest Client](https://rubygems.org/gems/rest-client) and
-    # [REST Client Components](https://rubygems.org/gems/rest-client-components)
-    # allowing the use of `Rack::Cache` as a local file cache.
+    # Applications needing HTTP caching may consider [Rest Client](https://rubygems.org/gems/rest-client) and [REST Client Components](https://rubygems.org/gems/rest-client-components) allowing the use of `Rack::Cache` as a local file cache.
     #
     # @example using a local HTTP cache
     #    require 'restclient/components'
@@ -275,6 +280,11 @@ def http_adapter(use_net_http = false)
     #   HTTP Proxy to use for requests.
     # @param [Array, String] headers ({})
     #   HTTP Request headers
+    #
+    #   Defaults `Accept` header based on available reader content types to allow for content negotiation based on available readers.
+    #
+    #   Defaults  `User-Agent` header, unless one is specified.
+    #
     # @param [Boolean] verify_none (false)
     #   Don't verify SSL certificates
     # @param  [Hash{Symbol => Object}] options

rdf.gemspec

@@ -11,7 +11,11 @@ Gem::Specification.new do |gem|
   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.metadata           = {
-    "documentation_uri" => "https://rubydoc.info/github/ruby-rdf/rdf"
+    "documentation_uri" => "https://rubydoc.info/github/ruby-rdf/rdf",
+    "bug_tracker_uri"   => "https://github.com/ruby-rdf/rdf/issues",
+    "homepage_uri"      => "https://ruby-rdf.github.io/rdf",
+    "mailing_list_uri"  => "https://lists.w3.org/Archives/Public/public-rdf-ruby/",
+    "source_code_uri"   => "https://github.com/ruby-rdf/rdf",
   }
 
   gem.authors            = ['Arto Bendiken', 'Ben Lavender', 'Gregg Kellogg']

spec/model_literal_spec.rb

@@ -25,7 +25,6 @@ def self.literal(selector)
     when :date        then [Date.new(2010)]
     when :datetime    then [DateTime.new(2011)]
     when :time        then [Time.parse('01:02:03Z')]
-    when :date        then [Date.new(2010)]
     else
       raise("unexpected literal: :#{selector}")
     end
@@ -138,7 +137,7 @@ def self.literals(*selector)
       3.1415 => "double",
       Date.new(2010) => "date",
       DateTime.new(2011) => "dateTime",
-      Time.parse("01:02:03Z") => "time"
+      Time.parse("01:02:03Z") => "dateTime"
     }.each_pair do |value, type|
       it "returns xsd.#{type} for #{value.inspect} #{value.class}" do
         expect(RDF::Literal.new(value).datatype).to eq XSD[type]
@@ -217,7 +216,7 @@ def self.literals(*selector)
       literal(:double)   => "3.1415",
       literal(:date)     => "2010-01-01",
       literal(:datetime) => "2011-01-01T00:00:00Z",
-      literal(:time)     => "01:02:03Z"
+      literal(:time)     => "#{Date.today}T01:02:03Z"
     }.each_pair do |args, rep|
       it "returns #{rep} for #{args.inspect}" do
         literal = RDF::Literal.new(*args)

spec/model_uri_spec.rb

@@ -606,6 +606,8 @@
       %w(http://a/bb/ccc/.. g#s) => "<http://a/bb/ccc/g#s>",
 
       %w(file:///a/bb/ccc/d;p?q g) => "<file:///a/bb/ccc/g>",
+      # merging rootless base URL paths (json-ld-api 397f48b959c4517fef55a7b2623ad432e923240c)
+      %w(tag:example a) => "<tag:a>",
     }.each_pair do |(lhs, rhs), result|
       it "creates #{result} from <#{lhs}> and '#{rhs}'" do
         expect(RDF::URI.new(lhs).join(rhs.to_s).to_base).to eq result

spec/util_file_spec.rb

@@ -51,6 +51,11 @@
         expect(subject).to include "application/xhtml+xml;q=0.7"
       end
     end
+
+    describe ".default_user_agent" do
+      subject {RDF::Util::File::HttpAdapter.default_user_agent}
+      specify {is_expected.to eq "Ruby RDF.rb/#{RDF::VERSION}"}
+    end
   end
 
   describe RDF::Util::File::FaradayAdapter do
@@ -103,7 +108,7 @@
         to_return(body: File.read(File.expand_path("../../etc/doap.nt", __FILE__)),
                   status: 200,
                   headers: { 'Content-Type' => RDF::NTriples::Format.content_type.first})
-      r = RDF::Util::File.open_file(uri) do |f|
+        r = RDF::Util::File.open_file(uri) do |f|
         expect(f).to respond_to(:read)
         expect(f.content_type).to eq RDF::NTriples::Format.content_type.first
         expect(f.code).to eq 200