rdf 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ecf8b966bcaf7510f41e9abcfa06b9fc2ba8bf6f135452055d4070374d8d277
-  data.tar.gz: 040d4fd90f753fb7775de4faa323dbdf611b72b106c2d739fe49da2782654bf2
+  metadata.gz: 3024b8471983ae96eef2df1b95ef2fc1d72bba082d43e3567c9e8c30970cb6db
+  data.tar.gz: 3104532cffa328bb403fe3403deb30188ceb00a119b8f4e1dbccc7c01fd69712
 SHA512:
-  metadata.gz: 6fef455fbd5119f38c8591b88efd49856fb595ad2a1a35d0aa8124d7ca42f19e30a2e655829b633e362e5fba9723acbb2bb171aa6f0e2176ddd721a18e147ce7
-  data.tar.gz: ff5f59ab46447637a367f3355aadd005944457c6832264130ab9b9d6566f0ca0eff6a71245562d68de05e46e7cc6a97d74e447df1ff9918b0f4135d3e402f350
+  metadata.gz: 2b62e3081278305f44f09c7aa77d3143a5110779bd1963e702ffde2ffacae8fa4ee0abcb861441675ea70c409f33270e7f4a2e0cf45c66c4956188bebef6ae80
+  data.tar.gz: 23674e4180517963dd92f26ac4d40c7c3eea672be96e64f8d719ff94c084ef229e5e21473d1d4dd0336fbb8ae3ad2c3b200ff1f7da6b7a352ead2ff98d4dd83c

data/VERSION

@@ -1 +1 @@
-3.1.4
+3.1.5

data/bin/rdf

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
+$:.unshift(File.expand_path("../../lib", __FILE__))
 require 'rubygems'
-require 'rdf/cli'
+require 'rdf'
 
 options = RDF::CLI.options(ARGV)
 

data/lib/rdf.rb

@@ -76,6 +76,9 @@ module RDF
   # Utilities
   autoload :Util,        'rdf/util'
 
+  # CLI
+  autoload :CLI,         'rdf/cli'
+
   ##
   # Alias for `RDF::Resource.new`.
   #

data/lib/rdf/cli.rb

@@ -8,7 +8,7 @@ begin
   require 'linkeddata'
 rescue LoadError
   # Silently load without linkeddata, but try some others
-  %w(reasoner rdfa rdfxml turtle vocab json/ld ld/patch).each do |ser|
+  %w(microdata n3 rdfa rdfxml reasoner tabular trig trix turtle vocab xsd json/ld ld/patch).each do |ser|
     begin
       require ser.include?('/') ? ser : "rdf/#{ser}"
     rescue LoadError
@@ -296,6 +296,12 @@ module RDF
         control: :none,
         on: ["-o", "--output FILE"],
         description: "File to write output, defaults to STDOUT") {|arg| File.open(arg, "w")},
+      RDF::CLI::Option.new(
+        symbol: :ordered,
+        control: :checkbox,
+        datatype: TrueClass,
+        on: ["--ordered"],
+        description: "Use order preserving repository"),
       RDF::CLI::Option.new(
         symbol: :format,
         control: :select,
@@ -495,14 +501,16 @@ module RDF
       options[:format] = options[:format].to_sym if options[:format]
       options[:output_format] = options[:output_format].to_sym if options[:output_format]
 
-      @repository = RDF::Repository.new
+      @repository = options[:ordered] ?
+        [].extend(RDF::Enumerable, RDF::Queryable) :
+        RDF::Repository.new
 
       # Parse input files if any command requires it
       if cmds.any? {|c| COMMANDS[c.to_sym][:parse]}
         start = Time.new
         count = 0
         self.parse(args, **options) do |reader|
-          @repository << reader
+          reader.each_statement {|st| @repository << st}
         end
         secs = Time.new - start
         options[:logger].info "Parsed #{repository.count} statements with #{@readers.join(', ')} in #{secs} seconds @ #{count/secs} statements/second."

data/lib/rdf/model/uri.rb

@@ -902,7 +902,7 @@ module RDF
     # Normalized version of user
     # @return [String]
     def normalized_user
-      URI.encode(CGI.unescape(user), /[^#{IUNRESERVED}|#{SUB_DELIMS}]/) if user
+      URI.encode(CGI.unescape(user), /[^#{IUNRESERVED}|#{SUB_DELIMS}]/).force_encoding(Encoding::UTF_8) if user
     end
 
     ##
@@ -928,7 +928,7 @@ module RDF
     # Normalized version of password
     # @return [String]
     def normalized_password
-      URI.encode(CGI.unescape(password), /[^#{IUNRESERVED}|#{SUB_DELIMS}]/) if password
+      URI.encode(CGI.unescape(password), /[^#{IUNRESERVED}|#{SUB_DELIMS}]/).force_encoding(Encoding::UTF_8) if password
     end
 
     HOST_FROM_AUTHORITY_RE = /(?:[^@]+@)?([^:]+)(?::.*)?$/.freeze
@@ -1295,7 +1295,7 @@ module RDF
         value = value.dup.force_encoding(Encoding::UTF_8)
         decoded = CGI.unescape(value)
         decoded.downcase! if downcase
-        URI.encode(decoded, /[^(?:#{expr})]/)
+        URI.encode(decoded, /[^(?:#{expr})]/).force_encoding(Encoding::UTF_8)
       end
     end
 

data/lib/rdf/util/file.rb

@@ -14,7 +14,7 @@ module RDF; module Util
   # allowing the use of `Rack::Cache` to avoid network access.
   #
   # To use other HTTP clients, consumers can subclass 
-  # {RDF::Util::File::HttpAdapter} and set the {RDF::Util::File.http_adapter}.
+  # {RDF::Util::File::HttpAdapter} and set the {RDF::Util::File.}.
   #
   # Also supports the file: scheme for access to local files.
   #
@@ -121,8 +121,8 @@ module RDF; module Util
 
         redirect_count = 0
         max_redirects = 5
-        parsed_url = ::URI.parse(base_uri)
-        parsed_proxy = ::URI.parse(proxy.to_s)
+        parsed_url = RDF::URI.parse(base_uri)
+        parsed_proxy = RDF::URI.parse(proxy.to_s)
         base_uri = parsed_url.to_s
         remote_document = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header