rdf-aggregate-repo 1.99.0 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a4dd65e6ddcb82e9abbe6477d60a823ba6a443b
-  data.tar.gz: ee446e02cb255fef1405b856ce582a79b7906ca1
+  metadata.gz: e19370895a1ec780837044ffeb3d84f2885a518a
+  data.tar.gz: 8b95295c2c31bb85d2afa24d8a7b85fd17037e32
 SHA512:
-  metadata.gz: 76ea80547ca6e67842191f92a940eb47d4300184ce30a775ae10f05c90b45f75e2631ecc01606491e57a4ea5295d7c7603c4234684e76d8c38e14c81d66edad1
-  data.tar.gz: 721aac81e2d62d5fe0f15121f170bb1b31ed5a740039e159dbf7fbd413dcfa19d781d3889a98fc01b2751705121e753a778b1fe340f570a1ab74f52e70a246a8
+  metadata.gz: a5a9bc7835d5309698eab9861068826d39b95288363cc1e0ec364174d28d7c79b3656b0a5e69728bda0824fb299a69c485b3e309c15667440b7951944bede808
+  data.tar.gz: a90fff7aa898442ad167d572251137f226152b8ccbbbcee40edfebf19ba1bf0cf603b6f0c798cb4fba4d11f776a580d1ea60a7ff3086ebf533e4cb1124c9dbbf

data/README.md

@@ -1,13 +1,13 @@
 # RDF::AggregateRepo
 
-An aggregate RDF::Repository supporting a subset of named graphs and zero or more named graphs mapped to the default graph.
+An aggregate RDF::Dataset supporting a subset of named graphs and zero or more named graphs mapped to the default graph.
 
 [![Gem Version](https://badge.fury.io/rb/rdf-aggregate-repo.png)](http://badge.fury.io/rb/rdf-aggregate-repo)
 [![Build Status](https://travis-ci.org/ruby-rdf/rdf-aggregate-repo.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf-aggregate-repo)
 
 ## Description
 
-Maps named graphs from one or more `RDF::Queryable` instances into a single object, allowing a specific set of _named graphs_ to be seen, as well as a _default graph_ made up from one or more _named graphs_. This is used to implement [SPARQL Datasets][].
+Maps named graphs from one or more `RDF::Queryable` instances into a single dataset, allowing a specific set of _named graphs_ to be seen, as well as a _default graph_ made up from one or more _named graphs_. This is used to implement [RDF Datasets][].
 
 ## Examples
 
@@ -29,8 +29,8 @@ Maps named graphs from one or more `RDF::Queryable` instances into a single obje
 
 ## Dependencies
 
-* [Ruby](http://ruby-lang.org/) (>= 1.8.7) or (>= 1.8.1 with [Backports][])
-* [RDF.rb][] (>= 1.0)
+* [Ruby](http://ruby-lang.org/) (>= 2.0)
+* [RDF.rb][] (>= 2.0)
 
 ## Mailing List
 
@@ -64,7 +64,7 @@ This is free and unencumbered public domain software. For more information,
 see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 
 [RDF.rb]:           http://ruby-rdf.github.com/
-[SPARQL Datasets]:  http://www.w3.org/TR/sparql11-query/#rdfDataset
+[RDF Datasets]:     https://www.w3.org/TR/rdf11-concepts/#dfn-rdf-dataset
 [YARD]:             http://yardoc.org/
 [YARD-GS]:          http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
 [PDD]:              http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html

data/VERSION

@@ -1 +1 @@
-1.99.0
+2.0.0.beta1

data/lib/rdf/aggregate_repo/merge_graph.rb

@@ -156,9 +156,9 @@ module RDF
       return enum_for(:each) unless block_given?
 
       # Add everything to a new graph for de-duplication
-      tmp = RDF::Graph.new(@graph_name, data: RDF::Repository.new)
+      tmp = RDF::Graph.new(graph_name: @graph_name, data: RDF::Repository.new)
       sources.each do |(source, gn)|
-        tmp << RDF::Graph.new(gn || nil, data: source)
+        tmp << RDF::Graph.new(graph_name: gn || nil, data: source)
       end
       tmp.each(&block)
     end
@@ -186,11 +186,12 @@ module RDF
     ##
     # @private
     # @see RDF::Queryable#query_pattern
-    def query_pattern(pattern, &block)
+    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, &block)
+        source.send(:query_pattern, pattern, options, &block)
       end
     end
   end

data/lib/rdf/aggregate_repo.rb

@@ -5,7 +5,7 @@ module RDF
   autoload :VERSION, 'rdf/aggregate_repo/version'
 
   ##
-  # An aggregated RDF repository.
+  # An aggregated RDF datset.
   #
   # Aggregates the default and named graphs from one or more instances
   # implementing RDF::Queryable. By default, the aggregate projects
@@ -33,7 +33,7 @@ module RDF
   #   end
   #
   # @todo Allow graph names to reassigned with queryable
-  class AggregateRepo < RDF::Repository
+  class AggregateRepo < RDF::Dataset
     ##
     # The set of aggregated `queryable` instances included in this aggregate
     #
@@ -58,16 +58,15 @@ module RDF
     #   @yieldparam [RDF::AggregateRepo] aggregation
     #   @yieldreturn [void] ignored
     def initialize(*queryable, &block)
-      @options = queryable.last.is_a?(Hash) ? queryable.last.dup : {}
-      
+      @options = queryable.last.is_a?(Hash) ? queryable.pop.dup : {}
       @sources = queryable
       @defaults = []
       @named_graphs = []
 
       if block_given?
         case block.arity
-        when 1 then block.call(self)
-        else instance_eval(&block)
+          when 1 then block.call(self)
+          else instance_eval(&block)
         end
       end
     end
@@ -112,6 +111,17 @@ module RDF
 
     # Repository overrides
 
+    ##
+    # @private
+    # @see RDF::Enumerable#supports?
+    def supports?(feature)
+      case feature.to_sym
+      when :graph_name    then @options[:with_graph_name]
+      when :validity      then @options.fetch(:with_validity, true)
+      else false
+      end
+    end
+
     ##
     # Not writable
     #
@@ -152,7 +162,7 @@ module RDF
     # @return [Boolean]
     # @see RDF::Enumerable#has_statement?
     def has_statement?(statement)
-      each_graph.to_a.any? {|g| g.has_statement?(statement)}
+      each_graph.any? {|g| g.has_statement?(statement) && statement.graph_name == g.graph_name}
     end
 
     ##
@@ -231,7 +241,7 @@ module RDF
         # Send graph from appropriate source
         @named_graphs.each do |graph_name|
           source  = sources.reverse.detect {|s| s.has_graph?(graph_name)}
-          block.call(RDF::Graph.new(graph_name, data: source))
+          block.call(RDF::Graph.new(graph_name: graph_name, data: source))
         end
       end
       enum_graph
@@ -251,7 +261,7 @@ module RDF
           RDF::Graph.new
         when defaults == [false] && sources.length == 1
           # Trivial case
-          RDF::Graph.new(nil, data: sources.first)
+          RDF::Graph.new(data: sources.first)
         else
           # Otherwise, create a MergeGraph from the set of pairs of source and graph_name
           RDF::MergeGraph.new(name: nil) do |graph|
@@ -274,8 +284,9 @@ module RDF
   protected
 
     ##
-    # Queries each constituent graph for RDF statements matching the given `pattern`,
-    # yielding each matched statement to the given block.
+    # Queries each constituent graph for RDF statements matching the given `pattern`, yielding each matched statement to the given block.
+    #
+    # If called without a block, returns an enumerator
     #
     # @param  [RDF::Query::Pattern] pattern
     #   the query pattern to match
@@ -284,25 +295,26 @@ module RDF
     # @yieldreturn [void] ignored
     # @return [void] ignored
     # @see RDF::Queryable#query_pattern
-    def query_pattern(pattern, &block)
+    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, &block)}
+        each_graph {|graph| graph.send(:query_pattern, pattern, options, &block)}
       when FalseClass
         # Query against default graph only
-        default_graph.send(:query_pattern, pattern, &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.graph_name, data: source).send(:query_pattern, pattern, &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(pattern.graph_name, data: source).send(:query_pattern, pattern, &block)
+          RDF::Graph.new(graph_name: pattern.graph_name, data: source).send(:query_pattern, pattern, options, &block)
         end
       end
     end

metadata

@@ -1,57 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: rdf-aggregate-repo
 version: !ruby/object:Gem::Version
-  version: 1.99.0
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +128,7 @@ files:
 - lib/rdf/aggregate_repo/version.rb
 homepage: http://ruby-rdf.github.com/rdf-aggregate-repo
 licenses:
-- Public Domain
+- Unlicense
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -120,15 +138,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An aggregate RDF::Repository supporting a subset of named graphs and zero