rdf-rdfxml 2.2.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d81753595268573c9548865ec607079b1cd45615
-  data.tar.gz: 53c8c95336264bb7d5c8d00f3985b441a369c0b3
+SHA256:
+  metadata.gz: cbadda440064b5a3d6301cd100f9547c91d9c91f7ee2ceb8afe2ac129e260b2e
+  data.tar.gz: 0e50ce2dfa36ecff9559fc4995574512e1565cf2656744a85ba2280662331bc7
 SHA512:
-  metadata.gz: da749430588669efdd59cb16723f112b6f253d170ed10ed510236105be3a7de90530a1b85b2b55d423c1009a24b0ef6435f870e2d76d2eff31b33dd093df8bf3
-  data.tar.gz: bd19366c06009be99e4642f3adfaa6973877c4e0b0fb4d757c9147341778d15aa862202c4296553a7612c7bcda0457b6b00ce47a8dd3524e8539f472ddb979eb
+  metadata.gz: 90bec0d3cbf1dc4bf2b5cabca51552dcc4a7773658ff83dc107b49af1f25fa72314c08f1136ef7af39b8bf150f6733719cf7d853a0ed6b4ce1bf1444bfe61fec
+  data.tar.gz: 57ee2dad4d2fce9e7e123ea7a6d10479e0025fc5f712dbcba4c652ec88ae929d87caca1553b8c3dd35c1eba46cb409dc95af5fbd78fa81de977c6cffcbfaee85

data/README.md

@@ -18,7 +18,7 @@ Install with `gem install rdf-rdfxml`
 
 * 100% free and unencumbered [public domain](http://unlicense.org/) software.
 * Implements a complete parser for [RDF/XML][].
-* Compatible with Ruby >= 2.2.2.
+* Compatible with Ruby >= 2.4.
 
 ## Usage:
 Instantiate a parser and parse source, specifying type and base-URL
@@ -40,8 +40,8 @@ Write a graph to a file:
     end
 
 ## Dependencies
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.0)
-* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.6.0)
+* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.1)
+* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.10)
 
 ## Documentation
 Full documentation available on [Rubydoc.info][RDF/XML doc])

data/VERSION

@@ -1 +1 @@
-2.2.1
+3.1.0

data/lib/rdf/rdfxml/reader.rb

@@ -41,7 +41,7 @@ module RDF::RDFXML
       end
       
       # Clone existing evaluation context adding information from element
-      def clone(element, options = {}, &cb)
+      def clone(element, **options, &cb)
         new_ec = EvaluationContext.new(@base, nil, @graph)
         new_ec.uri_mappings = self.uri_mappings.clone
         new_ec.language = self.language
@@ -136,7 +136,7 @@ module RDF::RDFXML
     # @yieldparam  [RDF::Reader] reader
     # @yieldreturn [void] ignored
     # @raise [Error] Raises RDF::ReaderError if _validate_
-    def initialize(input = $stdin, options = {}, &block)
+    def initialize(input = $stdin, **options, &block)
       super do
         @library = case options[:library]
         when nil
@@ -156,7 +156,7 @@ module RDF::RDFXML
         self.extend(@implementation)
 
         input.rewind if input.respond_to?(:rewind)
-        initialize_xml(input, options) rescue log_fatal($!.message)
+        initialize_xml(input, **options) rescue log_fatal($!.message)
 
         log_error("Empty document") if root.nil?
         log_error("Synax errors") {doc_errors} if !doc_errors.empty?
@@ -427,7 +427,7 @@ module RDF::RDFXML
           else
             literal_opts[:language] = child_ec.language
           end
-          literal = RDF::Literal.new(child.inner_text, literal_opts)
+          literal = RDF::Literal.new(child.inner_text, **literal_opts)
           add_triple(child, subject, predicate, literal)
           reify(id, child, subject, predicate, literal, ec) if id
         elsif parseType == "Resource"

data/lib/rdf/rdfxml/reader/nokogiri.rb

@@ -227,7 +227,7 @@ module RDF::RDFXML
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [void]
-      def initialize_xml(input, options = {})
+      def initialize_xml(input, **options)
         require 'nokogiri' unless defined?(::Nokogiri)
         @doc = case input
         when ::Nokogiri::XML::Document

data/lib/rdf/rdfxml/reader/rexml.rb

@@ -245,7 +245,7 @@ module RDF::RDFXML
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [void]
-      def initialize_xml(input, options = {})
+      def initialize_xml(input, **options)
         require 'rexml/document' unless defined?(::REXML)
         @doc = case input
         when ::REXML::Document

data/lib/rdf/rdfxml/writer.rb

@@ -113,7 +113,7 @@ module RDF::RDFXML
     #   URI to use as @href for output stylesheet processing instruction.
     # @yield  [writer]
     # @yieldparam [RDF::Writer] writer
-    def initialize(output = $stdout, options = {}, &block)
+    def initialize(output = $stdout, **options, &block)
       super
     end
 
@@ -170,7 +170,7 @@ module RDF::RDFXML
     # @return String
     #   The rendered document is returned as a string
     # Return Haml template for document from `haml_template[:subject]`
-    def render_subject(subject, predicates, options = {}, &block)
+    def render_subject(subject, predicates, **options, &block)
       # extract those properties that can be rendered as attributes
       attr_props = if [:untyped, :typed].include?(@attributes)
         options[:property_values].inject({}) do |memo, (prop, values)|
@@ -189,7 +189,7 @@ module RDF::RDFXML
       end
 
       predicates -= attr_props.keys.map {|k| expand_curie(k).to_s}
-      super(subject, predicates, options.merge(attr_props: attr_props), &block)
+      super(subject, predicates, **options.merge(attr_props: attr_props), &block)
     end
     # See if we can serialize as attribute.
     # * untyped attributes that aren't duplicated where xml:lang == @lang
@@ -228,8 +228,8 @@ module RDF::RDFXML
     # @yieldreturn [:ignored]
     # @return String
     #   The rendered document is returned as a string
-    def render_document(subjects, options = {}, &block)
-      super(subjects, options.merge(stylesheet: @options[:stylesheet]), &block)
+    def render_document(subjects, **options, &block)
+      super(subjects, **options.merge(stylesheet: @options[:stylesheet]), &block)
     end
 
     # Render a single- or multi-valued predicate using `haml_template[:property_value]` or `haml_template[:property_values]`. Yields each object for optional rendering. The block should only render for recursive subject definitions (i.e., where the object is also a subject and is rendered underneath the first referencing subject).
@@ -256,7 +256,7 @@ module RDF::RDFXML
     #   The block should only return a string for recursive object definitions.
     # @return String
     #   The rendered document is returned as a string
-    def render_property(predicate, objects, options = {}, &block)
+    def render_property(predicate, objects, **options, &block)
       log_debug {"render_property(#{predicate}): #{objects.inspect}, #{options.inspect}"}
       # If there are multiple objects, and no :property_values is defined, call recursively with
       # each object
@@ -280,7 +280,7 @@ module RDF::RDFXML
 
           log_debug {"list: #{list.inspect} #{list.to_a}"}
           log_depth do
-            render_collection(predicate, list, options) do |object|
+            render_collection(predicate, list, **options) do |object|
               yield(object, true) if block_given?
             end
           end
@@ -290,7 +290,7 @@ module RDF::RDFXML
       if objects.length > 1
         # Render each property using property_value template
         objects.map do |object|
-          log_depth {render_property(predicate, [object], options, &block)}
+          log_depth {render_property(predicate, [object], **options, &block)}
         end.join(" ")
       else
         log_fatal("Missing property template", exception:  RDF::WriterError) if template.nil?
@@ -301,7 +301,7 @@ module RDF::RDFXML
           property:   get_qname(predicate),
           recurse:    log_depth <= @max_depth
         }.merge(options)
-        hamlify(template, options, &block)
+        hamlify(template, **options, &block)
       end
     end
 
@@ -319,7 +319,7 @@ module RDF::RDFXML
     #   The block should only return a string for recursive object definitions.
     # @return String
     #   The rendered collection is returned as a string
-    def render_collection(predicate, list, options = {}, &block)
+    def render_collection(predicate, list, **options, &block)
       template = options[:haml] || haml_template[:collection]
 
       options = {
@@ -328,7 +328,7 @@ module RDF::RDFXML
         property:   get_qname(predicate),
         recurse:    log_depth <= @max_depth,
       }.merge(options)
-      hamlify(template, options) do |object|
+      hamlify(template, **options) do |object|
         yield object
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfxml
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Gregg
@@ -9,68 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rdf-rdfa
+  name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rdf-xsd
+  name: rdf-rdfa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -105,162 +87,118 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: spira
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.12
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.20
 description: RDF::RDFXML is an RDF/XML reader and writer for the RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -295,15 +233,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: RDF/XML reader/writer for RDF.rb.