rdf 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0c4f107a087cbcd8828a9db8826cf54e7746ac3
-  data.tar.gz: 8d98e00d3290c1483a19a46c5596fe1e74411f30
+  metadata.gz: d5b0c02b8e9058e426f16a534e9a9f67b0ddab07
+  data.tar.gz: a68b6870879a0eec41e12047561334f7c1173d39
 SHA512:
-  metadata.gz: 9cc293fc0d360d0f936452cf97e759dd86485ba26de3c84087936248d7d2a490a89a53e7c9a6aef1380c340faeb7335124b6d25ffb54426887c549138b59a931
-  data.tar.gz: eba1d1738c875b2d862dfff870eb5ceb714004cc2be9899104641250006e5c86a6bceaf6a91562db6f298addfe8f3c6a8d305e1be5ce1ded16a4d805a51e2b8f
+  metadata.gz: ac36cd538bb75de037dc179f6125e424c701e50667936ee62ef75426f316f53de83b0a56fe464648450445dbaf31ab52b7e91ce8ad7aeb75e7d71840de206fba
+  data.tar.gz: 35ab589fcf5f331c29518f7928fd1bde329c4ba65b67c31e05ef219f2c4ff998e79610a883bfb6d9409b7190fd196807f82527aa5d9f9652391386249a60fba5

data/README.md

@@ -84,7 +84,10 @@ operations on RDF files using available readers and writers.
 * `serialize`: Parse an RDF input and re-serializing to [N-Triples][] or another available format using `--output-format` option.
 * `subjects`: Returns unique subjects from parsed input.
 
-The `serialize` command can also be used to serialize as a vocabulary
+The `serialize` command can also be used to serialize as a vocabulary.
+
+Different RDF gems will augment the `rdf` script with more capabilities, which may require specifying the appropriate `--input-format` option to revel.
+
 ## Examples
 
     require 'rdf'

data/VERSION

@@ -1 +1 @@
-2.2.3
+2.2.4

data/lib/rdf/mixin/enumerable.rb

@@ -122,7 +122,7 @@ module RDF
     # @see    #each_statement
     # @see    #enum_statement
     def statements(**options)
-      Array(enum_statement)
+      enum_statement.to_a
     end
 
     ##
@@ -311,7 +311,7 @@ module RDF
       unless unique
         enum_statement.map(&:subject) # TODO: optimize
       else
-        Array(enum_subject)
+        enum_subject.to_a
       end
     end
 
@@ -376,7 +376,7 @@ module RDF
       unless unique
         enum_statement.map(&:predicate) # TODO: optimize
       else
-        Array(enum_predicate)
+        enum_predicate.to_a
       end
     end
 
@@ -441,7 +441,7 @@ module RDF
       unless unique
         enum_statement.map(&:object) # TODO: optimize
       else
-        Array(enum_object)
+        enum_object.to_a
       end
     end
 
@@ -514,7 +514,7 @@ module RDF
           flatten.
           compact
       else
-        Array(enum_term)
+        enum_term.to_a
       end
     end
 
@@ -759,7 +759,7 @@ module RDF
     # @overload #to_writer
     #   Implements #to_writer for each available instance of {RDF::Writer},
     #   based on the writer symbol.
-    #  
+    #
     #   @return [String]
     #   @see {RDF::Writer.sym}
     def method_missing(meth, *args)
@@ -780,7 +780,7 @@ module RDF
     end
 
     ##
-    # @note this instantiates an writer; it could probably be done more 
+    # @note this instantiates an writer; it could probably be done more
     #   efficiently by refactoring `RDF::Reader` and/or `RDF::Format` to expose
     #   a list of valid format symbols.
     def respond_to_missing?(name, include_private = false)

data/lib/rdf/model/literal/boolean.rb

@@ -6,7 +6,7 @@ module RDF; class Literal
   # @since 0.2.1
   class Boolean < Literal
     DATATYPE = RDF::XSD.boolean
-    GRAMMAR  = /^(true|false|1|0)$/i.freeze
+    GRAMMAR  = /^(true|false|1|0)$/.freeze
     TRUES    = %w(true  1).freeze
     FALSES   = %w(false 0).freeze
 

data/lib/rdf/model/literal/double.rb

@@ -12,7 +12,7 @@ module RDF; class Literal
   # @since 0.2.1
   class Double < Numeric
     DATATYPE = RDF::XSD.double
-    GRAMMAR  = /^(?:NaN|(?:[\+\-]?(?:INF|(?:\d+(\.\d*)?(e[\+\-]?\d+)?))))$/i.freeze
+    GRAMMAR  = /^(?:NaN|\-?INF|[+\-]?(?:\d+(:?\.\d*)?|\.\d+)(?:[eE][\+\-]?\d+)?)$/.freeze
 
     ##
     # @param  [String, Float, #to_f] value
@@ -21,11 +21,11 @@ module RDF; class Literal
       @datatype = RDF::URI(datatype || self.class.const_get(:DATATYPE))
       @string   = lexical || (value if value.is_a?(String))
       @object   = case
-        when value.is_a?(::String) then case value
+        when value.is_a?(::String) then case value.upcase
           when '+INF'  then 1/0.0
           when 'INF'  then 1/0.0
           when '-INF' then -1/0.0
-          when 'NaN'  then 0/0.0
+          when 'NAN'  then 0/0.0
           else Float(value.sub(/\.[eE]/, '.0E')) rescue nil
         end
         when value.is_a?(::Float)     then value

data/lib/rdf/reader.rb

@@ -180,18 +180,37 @@ module RDF
     # @yieldreturn [void] ignored
     # @raise  [RDF::FormatError] if no reader found for the specified format
     def self.open(filename, format: nil, **options, &block)
+      # If we're the abstract reader, and we can figure out a concrete reader from format and options, use that.
+      if self == RDF::Reader && reader = self.for(format || {file_name: filename}.merge(options))
+        return reader.open(filename, format: format, **options, &block)
+      end
+
+      # If we are a concrete reader class or format is not nil, set accept header from our content_types.
+      unless self == RDF::Reader
+        headers = (options[:headers] ||= {})
+        headers['Accept'] ||= (self.format.accept_type + %w(*/*;q=0.1)).join(", ")
+      end
+
       Util::File.open_file(filename, options) do |file|
         format_options = options.dup
         format_options[:content_type] ||= file.content_type if file.respond_to?(:content_type)
         format_options[:file_name] ||= filename
+        reader = if self == RDF::Reader
+          # We are the abstract reader class, find an appropriate reader
+          self.for(format || format_options) do
+            # Return a sample from the input file
+            sample = file.read(1000)
+            file.rewind
+            sample
+          end
+        else
+          # We are a concrete reader class
+          self
+        end
+
         options[:encoding] ||= file.encoding if file.respond_to?(:encoding)
         options[:filename] ||= filename
-        reader = self.for(format || format_options) do
-          # Return a sample from the input file
-          sample = file.read(1000)
-          file.rewind
-          sample
-        end
+
         if reader
           reader.new(file, options, &block)
         else

data/lib/rdf/util/file.rb

@@ -305,7 +305,7 @@ module RDF; module Util
         content_type = format ? format.content_type.first : 'text/plain'
         # Open as a file, passing any options
         begin
-          url_no_frag_or_query = RDF::URI(filename_or_url)
+          url_no_frag_or_query = RDF::URI(filename_or_url).dup
           url_no_frag_or_query.query = nil
           url_no_frag_or_query.fragment = nil
           options[:encoding] ||= Encoding::UTF_8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header