rdf-aggregate-repo 2.2.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 772f464dbf7d2599f6f34aef82f9a5661b304209
-  data.tar.gz: 624935663a57a2c03ecc4b4d11d37fb1df51eea4
+SHA256:
+  metadata.gz: 4718bd42949d458fc3c0e67e827d119ff756d7985863549670f1788c1de243dd
+  data.tar.gz: 1bd9a28963fe1dd106bcc53c2389a5ff59882a4596c3e0efe8f361ef9a7a1759
 SHA512:
-  metadata.gz: 0c49f562261a2c575524a4f3e6dee6401262fd0404d92f97db4c847eddd0a6cafeb3dd90b2747e1ca533390ba263acc365984a679e583d925521e6b3b7db638b
-  data.tar.gz: d4107dae6f30bfc8c5211dcae7426b6c5113e4974dfaaac88c6f359b8531f71152e0667dba8a586e2a5b3554f2963145560a7af26657cbe10336867d4a38e3bd
+  metadata.gz: f1379ab7b442af08cb5eea60976850b7db7c675b342ebb249fe135c37362427c439bd36a9ea0683ad82d45fb34cbe446aadffbe85f3fe9083cda85dd70aa3263
+  data.tar.gz: 719c6a816f3726a4fc8d81a4dffa93a00b855df231781419f99062aea000e2f0883d809dc3a1283f7c04b26a4d37342baab92eb9fb7540058a910988278b5150

data/README.md

@@ -29,8 +29,8 @@ Maps named graphs from one or more `RDF::Queryable` instances into a single data
 
 ## Dependencies
 
-* [Ruby](http://ruby-lang.org/) (>= 2.2.2)
-* [RDF.rb][] (>= 2.0)
+* [Ruby](http://ruby-lang.org/) (>= 2.4)
+* [RDF.rb][] (~> 3.1)
 
 ## Mailing List
 

data/VERSION

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

data/lib/rdf/aggregate_repo.rb

@@ -52,7 +52,7 @@ module RDF
     ##
     # Create a new aggregation instance.
     #
-    # @overload initialize(queryable = [], options = {})
+    # @overload initialize(queryable = [], **options)
     #   @param [Array<RDF::Queryable>] queryable ([])
     #   @param [Hash{Symbol => Object}] options ({})
     #   @yield aggregation
@@ -297,26 +297,26 @@ module RDF
     # @yieldreturn [void] ignored
     # @return [void] ignored
     # @see RDF::Queryable#query_pattern
-    def query_pattern(pattern, options = {}, &block)
-      return enum_for(:query_pattern, pattern, options) unless block_given?
+    def query_pattern(pattern, **options, &block)
+      return enum_for(:query_pattern, pattern, **options) unless block_given?
       case pattern.graph_name
       when nil
         # Query against all graphs
-        each_graph {|graph| graph.send(:query_pattern, pattern, options, &block)}
+        each_graph {|graph| graph.send(:query_pattern, pattern, **options, &block)}
       when FalseClass
         # Query against default graph only
-        default_graph.send(:query_pattern, pattern, options, &block)
+        default_graph.send(:query_pattern, pattern, **options, &block)
       when RDF::Query::Variable
         # Query against all named graphs
         each_graph do |graph|
           source  = sources.reverse.detect {|s| s.has_graph?(graph.graph_name)}
-          RDF::Graph.new(graph_name: graph.graph_name, data: source).send(:query_pattern, pattern, options, &block)
+          RDF::Graph.new(graph_name: graph.graph_name, data: source).send(:query_pattern, pattern, **options, &block)
         end
       else
         # Query against a specific graph
         if @named_graphs.include?(pattern.graph_name)
           source  = sources.reverse.detect {|s| s.has_graph?(pattern.graph_name)}
-          RDF::Graph.new(graph_name: pattern.graph_name, data: source).send(:query_pattern, pattern, options, &block)
+          RDF::Graph.new(graph_name: pattern.graph_name, data: source).send(:query_pattern, pattern, **options, &block)
         end
       end
     end

data/lib/rdf/aggregate_repo/merge_graph.rb

@@ -40,16 +40,14 @@ module RDF
     ##
     # Create a new aggregation instance.
     #
-    # @overload initialize(queryable = [], options = {})
-    #   @param [Hash{Symbol => Object}] options ({})
-    #   @option options [RDF::Resource] :graph_name
-    #   @option options [RDF::Resource] :name alias for :graph_name
-    #   @yield merger
-    #   @yieldparam [RDF::MergeGraph] self
-    #   @yieldreturn [void] ignored
-    def initialize(options = {}, &block)
+    # @param [RDF::Resource] :graph_name
+    # @param [RDF::Resource] :name alias for :graph_name
+    # @yield merger
+    # @yieldparam [RDF::MergeGraph] self
+    # @yieldreturn [void] ignored
+    def initialize(graph_name: nil, name: nil, &block)
       @sources = []
-      @graph_name = options[:graph_name] || options[:name]
+      @graph_name = graph_name || name
 
       if block_given?
         case block.arity
@@ -186,12 +184,12 @@ module RDF
     ##
     # @private
     # @see RDF::Queryable#query_pattern
-    def query_pattern(pattern, options = {}, &block)
-      return enum_for(:query_pattern, pattern, options) unless block_given?
+    def query_pattern(pattern, **options, &block)
+      return enum_for(:query_pattern, pattern, **options) unless block_given?
       pattern = pattern.dup
       sources.each do |(source, gn)|
         pattern.graph_name = gn
-        source.send(:query_pattern, pattern, options, &block)
+        source.send(:query_pattern, pattern, **options, &block)
       end
     end
   end

metadata

@@ -1,117 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: rdf-aggregate-repo
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Gregg Kellogg
 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-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-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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        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: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.20
 description: A gem extending RDF.rb with SPARQL dataset construction semantics.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -138,15 +120,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: An aggregate RDF::Repository supporting a subset of named graphs and zero