rdf 2.1.1 → 2.2.0.pre.rc1

data/lib/rdf/vocabulary.rb

@@ -154,7 +154,7 @@ module RDF
       #     Shortcut for `rdf:type`, values are String interpreted as a {URI}.
       #   @return [RDF::Vocabulary::Term]
       #
-      # @note If the ontology URI has the vocabulary namespace URI as a prefix, it may also be defined using {#property} or {#term}
+      # @note If the ontology URI has the vocabulary namespace URI as a prefix, it may also be defined using `#property` or `#term`
       def ontology(*args)
         case args.length
         when 0
@@ -564,16 +564,18 @@ module RDF
       attr_accessor :attributes
 
       ##
-      # @overload URI(uri, options = {})
+      # @overload URI(uri, **options)
       #   @param  [URI, String, #to_s]    uri
+      #   @param [Hash{Symbol,Resource => Term, #to_s}] attributes
+      #     Attributes of this vocabulary term, used for finding `label` and `comment` and to serialize the term back to RDF
       #   @param  [Hash{Symbol => Object}] options
       #   @option options [Boolean] :validate (false)
       #   @option options [Boolean] :canonicalize (false)
-      #   @option options [Hash{Symbol,Resource => Term, #to_s}] :attributes
-      #     Attributes of this vocabulary term, used for finding `label` and `comment` and to serialize the term back to RDF
       #
-      # @overload URI(options = {})
+      # @overload URI(**options)
       #   @param  [Hash{Symbol => Object}] options
+      #   @param [Hash{Symbol,Resource => Term, #to_s}] attributes
+      #     Attributes of this vocabulary term, used for finding `label` and `comment` and to serialize the term back to RDF
       #   @option options options [Boolean] :validate (false)
       #   @option options options [Boolean] :canonicalize (false)
       #   @option options [Vocabulary] :vocab The {Vocabulary} associated with this term.
@@ -591,14 +593,10 @@ module RDF
       #   @option options [String, #to_s] :path The path component.
       #   @option options [String, #to_s] :query The query component.
       #   @option options [String, #to_s] :fragment The fragment component.
-      #   @option options [Hash{Symbol,Resource => Term, #to_s}] :attributes
-      #     Attributes of this vocabulary term, used for finding `label` and `comment` and to serialize the term back to RDF
-      def initialize(*args, **options)
-        @attributes = options.fetch(:attributes)
+      def initialize(*args, attributes:, **options)
+        @attributes = attributes
         if RUBY_ENGINE == "rbx"
-          # FIXME: Somehow, this gets messed up in Rubinius
-          args << options
-          super(*args)
+          super(*args, **options)
         else
           super
         end

data/lib/rdf/writer.rb

@@ -79,7 +79,7 @@ module RDF
     #   @param  [String] filename
     #   @return [Class]
     #
-    # @overload for(options = {})
+    # @overload for(**options)
     #   Finds an RDF writer class based on various options.
     #
     #   @param  [Hash{Symbol => Object}] options
@@ -154,26 +154,29 @@ module RDF
     #   the graph or repository to dump
     # @param  [IO, File, String] io
     #   the output stream or file to write to
+    # @param [Encoding, String, Symbol] encoding
+    #   the encoding to use on the output stream.
+    #   Defaults to the format associated with `content_encoding`.
     # @param  [Hash{Symbol => Object}] options
     #   passed to {RDF::Writer#initialize} or {RDF::Writer.buffer}
     # @return [void]
-    def self.dump(data, io = nil, options = {})
+    def self.dump(data, io = nil, encoding: nil, **options)
       if io.is_a?(String)
         io = File.open(io, 'w')
       elsif io.respond_to?(:external_encoding) && io.external_encoding
-        options = {encoding: io.external_encoding}.merge(options)
+        encoding ||= io.external_encoding
       end
-      io.set_encoding(options[:encoding]) if io.respond_to?(:set_encoding) && options[:encoding]
+      io.set_encoding(encoding) if io.respond_to?(:set_encoding) && encoding
       method = data.respond_to?(:each_statement) ? :each_statement : :each
       if io
-        new(io, options) do |writer|
+        new(io, encoding: encoding, **options) do |writer|
           data.send(method) do |statement|
             writer << statement
           end
           writer.flush
         end
       else
-        buffer(options) do |writer|
+        buffer(encoding: encoding, **options) do |writer|
           data.send(method) do |statement|
             writer << statement
           end
@@ -184,19 +187,23 @@ module RDF
     ##
     # Buffers output into a string buffer.
     #
+    # @param [Encoding, String, Symbol] encoding
+    #   the encoding to use on the output stream.
+    #   Defaults to the format associated with `content_encoding`.
+    # @param  [Hash{Symbol => Object}] options
+    #   passed to {RDF::Writer#initialize}
     # @yield  [writer]
     # @yieldparam  [RDF::Writer] writer
     # @yieldreturn [void]
     # @return [String]
     # @raise [ArgumentError] if no block is provided
-    def self.buffer(*args, &block)
-      options = args.last.is_a?(Hash) ? args.last : {}
-      options[:encoding] ||= Encoding::UTF_8 if RUBY_PLATFORM == "java"
+    def self.buffer(*args, encoding: nil, **options, &block)
+      encoding ||= Encoding::UTF_8 if RUBY_PLATFORM == "java"
       raise ArgumentError, "block expected" unless block_given?
 
       StringIO.open do |buffer|
-        buffer.set_encoding(options[:encoding]) if options[:encoding]
-        self.new(buffer, *args) { |writer| block.call(writer) }
+        buffer.set_encoding(encoding) if encoding
+        self.new(buffer, *args, encoding: encoding, **options) { |writer| block.call(writer) }
         buffer.string
       end
     end
@@ -205,16 +212,19 @@ module RDF
     # Writes output to the given `filename`.
     #
     # @param  [String, #to_s] filename
+    # @param [Encoding, String, Symbol] encoding
+    #   the encoding to use on the output stream.
+    #   Defaults to the format associated with `content_encoding`.
+    # @param [Symbol] format (nil)
     # @param  [Hash{Symbol => Object}] options
     #   any additional options (see {RDF::Writer#initialize} and {RDF::Format.for})
-    # @option options [Symbol] :format (nil)
     # @return [RDF::Writer]
-    def self.open(filename, options = {}, &block)
+    def self.open(filename, encoding: nil, format: nil, **options, &block)
       File.open(filename, 'wb') do |file|
-        file.set_encoding(options[:encoding]) if options[:encoding]
+        file.set_encoding(encoding) if encoding
         format_options = options.dup
         format_options[:file_name] ||= filename
-        self.for(options[:format] || format_options).new(file, options, &block)
+        self.for(format || format_options).new(file, encoding: encoding, **options, &block)
       end
     end
 
@@ -256,7 +266,7 @@ module RDF
     # @yield  [writer] `self`
     # @yieldparam  [RDF::Writer] writer
     # @yieldreturn [void]
-    def initialize(output = $stdout, options = {}, &block)
+    def initialize(output = $stdout, **options, &block)
       @output, @options = output, options.dup
       @nodes, @node_id, @node_id_map  = {}, 0, {}
 
@@ -421,7 +431,7 @@ module RDF
 
       # Make sure BNodes in statement use unique identifiers
       if statement.node?
-        terms = statement.to_quad.map do |term|
+        statement.to_quad.map do |term|
           if term.is_a?(RDF::Node)
             term = term.original while term.original
             @nodes[term] ||= begin
@@ -480,7 +490,7 @@ module RDF
     # @param  [RDF::Term] term
     # @return [String]
     # @since  0.3.0
-    def format_term(term, options = {})
+    def format_term(term, **options)
       case term
         when String       then format_literal(RDF::Literal(term, options), options)
         when RDF::List    then format_list(term, options)
@@ -499,7 +509,7 @@ module RDF
     # @return [String]
     # @raise  [NotImplementedError] unless implemented in subclass
     # @abstract
-    def format_node(value, options = {})
+    def format_node(value, **options)
       raise NotImplementedError.new("#{self.class}#format_node") # override in subclasses
     end
 
@@ -509,7 +519,7 @@ module RDF
     # @return [String]
     # @raise  [NotImplementedError] unless implemented in subclass
     # @abstract
-    def format_uri(value, options = {})
+    def format_uri(value, **options)
       raise NotImplementedError.new("#{self.class}#format_uri") # override in subclasses
     end
 
@@ -519,7 +529,7 @@ module RDF
     # @return [String]
     # @raise  [NotImplementedError] unless implemented in subclass
     # @abstract
-    def format_literal(value, options = {})
+    def format_literal(value, **options)
       raise NotImplementedError.new("#{self.class}#format_literal") # override in subclasses
     end
 
@@ -529,7 +539,7 @@ module RDF
     # @return [String]
     # @abstract
     # @since  0.2.3
-    def format_list(value, options = {})
+    def format_list(value, **options)
       format_term(value.subject, options)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0.pre.rc1
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-11 00:00:00.000000000 Z
+date: 2016-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
@@ -150,14 +150,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -293,9 +293,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rdf
 rubygems_version: 2.6.8