rdf-aggregate-repo 1.1.0.1 → 1.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 071df965575f4007e99728b60463dd145accb85c
-  data.tar.gz: 0ffc8849b0d2a324f28d76842bcb7a221bc0bc7f
+  metadata.gz: 3a4dd65e6ddcb82e9abbe6477d60a823ba6a443b
+  data.tar.gz: ee446e02cb255fef1405b856ce582a79b7906ca1
 SHA512:
-  metadata.gz: 874b8cdc42f583f2484d8a50ec2e18706b9c7b633b5755e43817761e373d6b764cb5d1d9cf32ff7737e54802e310d941c373e8c09ad74f992ec4cd90ecccb7e3
-  data.tar.gz: 3f9dbfefca6ae23e173c0a1ea290cfd81751de34d6ec217c8882e500c6f3a1db741c7fa4f1102bf5094cf19de3c491dd5cbe413ce5126135df6ea4864b08757b
+  metadata.gz: 76ea80547ca6e67842191f92a940eb47d4300184ce30a775ae10f05c90b45f75e2631ecc01606491e57a4ea5295d7c7603c4234684e76d8c38e14c81d66edad1
+  data.tar.gz: 721aac81e2d62d5fe0f15121f170bb1b31ed5a740039e159dbf7fbd413dcfa19d781d3889a98fc01b2751705121e753a778b1fe340f570a1ab74f52e70a246a8

data/VERSION

@@ -1 +1 @@
-1.1.0.1
+1.99.0

data/lib/rdf/aggregate_repo.rb

@@ -62,7 +62,7 @@ module RDF
       
       @sources = queryable
       @defaults = []
-      @contexts = []
+      @named_graphs = []
 
       if block_given?
         case block.arity
@@ -100,14 +100,14 @@ module RDF
 
     ##
     # Add a named graph projection. Dynamically binds to the
-    # last `queryable` having a matching context.
+    # last `queryable` having a matching graph.
     #
     # @param [RDF::Resource] name
     # @return [RDF::AggregateRepo] self
     def named(name)
       raise ArgumentError, "name must be an RDF::Resource: #{name.inspect}" unless name.is_a?(RDF::Resource)
-      raise ArgumentError, "name does not exist in loaded sources" unless sources.any?{|s| s.has_context?(name)}
-      @contexts << name
+      raise ArgumentError, "name does not exist in loaded sources" unless sources.any?{|s| s.has_graph?(name)}
+      @named_graphs << name
     end
 
     # Repository overrides
@@ -196,43 +196,16 @@ module RDF
     end
 
     ##
-    # Returns `true` if any constituent grahp contains the given RDF context.
+    # Returns `true` if any constituent grahp contains the given RDF graph.
     #
     # @param  [RDF::Resource, false] value
-    #   Use value `false` to query for the default context
+    #   Use value `false` to query for the default graph
     # @return [Boolean]
-    # @see RDF::Enumerable#has_context?
-    def has_context?(value)
-      @contexts.include?(value)
+    # @see RDF::Enumerable#has_graph?
+    def has_graph?(value)
+      @named_graphs.include?(value)
     end
 
-    ##
-    # Iterates the given block for each unique RDF context, other than the default context.
-    #
-    # If no block was given, returns an enumerator.
-    #
-    # The order in which values are yielded is undefined.
-    #
-    # @overload each_context
-    #   @yield  [context]
-    #     each context term
-    #   @yieldparam  [RDF::Resource] context
-    #   @yieldreturn [void] ignored
-    #   @return [void]
-    #
-    # @overload each_context
-    #   @return [Enumerator]
-    #
-    # @return [void]
-    # @see RDF::Enumerable#each_context
-    def each_context(&block)
-      if block_given?
-        @contexts.each(&block)
-      end
-      enum_context
-    end
-
-
     ##
     # Iterate over each graph, in order, finding named graphs from the most recently added `source`.
     #
@@ -248,18 +221,17 @@ module RDF
     #   @return [void]
     #
     # @overload each_graph
-    #   @return [Enumerator]
+    #   @return [Enumerator<RDF::Graph>]
     #
-    # @return [void]
     # @see RDF::Enumerable#each_graph
     def each_graph(&block)
       if block_given?
-        block.call(default_graph)
+        yield default_graph
 
-        # Send context from appropriate source
-        each_context do |context|
-          source  = sources.reverse.detect {|s| s.has_context?(context)}
-          block.call(RDF::Graph.new(context, :data => source))
+        # 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))
         end
       end
       enum_graph
@@ -277,20 +249,21 @@ module RDF
         case
         when sources.length == 0 || defaults.length == 0
           RDF::Graph.new
-        when defaults.length == 1 && sources.length == 1
-          RDF::Graph.new((defaults.first || nil), :data => sources.first)
+        when defaults == [false] && sources.length == 1
+          # Trivial case
+          RDF::Graph.new(nil, data: sources.first)
         else
-          # Otherwise, create a MergeGraph from the set of pairs of source and context
-          RDF::MergeGraph.new(:name => nil) do |graph|
+          # Otherwise, create a MergeGraph from the set of pairs of source and graph_name
+          RDF::MergeGraph.new(name: nil) do |graph|
             if defaults == [false]
               graph.sources.each do |s|
                 # Add default graph from each source
                 source s, false
               end
             else
-              defaults.each do |context|
+              defaults.each do |graph_name|
                 # add the named graph
-                graph.source sources.reverse.detect {|s| s.has_context?(context)}, context
+                graph.source sources.reverse.detect {|s| s.has_graph?(graph_name)}, graph_name
               end
             end
           end
@@ -312,7 +285,7 @@ module RDF
     # @return [void] ignored
     # @see RDF::Queryable#query_pattern
     def query_pattern(pattern, &block)
-      case pattern.context
+      case pattern.graph_name
       when nil
         # Query against all graphs
         each_graph {|graph| graph.send(:query_pattern, pattern, &block)}
@@ -321,15 +294,15 @@ module RDF
         default_graph.send(:query_pattern, pattern, &block)
       when RDF::Query::Variable
         # Query against all named graphs
-        each_context do |context|
-          source  = sources.reverse.detect {|s| s.has_context?(context)}
-          RDF::Graph.new(context, :data => source).send(:query_pattern, pattern, &block)
+        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)
         end
       else
-        # Query against a specific context
-        if @contexts.include?(pattern.context)
-          source  = sources.reverse.detect {|s| s.has_context?(pattern.context)}
-          RDF::Graph.new(pattern.context, :data => source).send(:query_pattern, pattern, &block)
+        # 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)
         end
       end
     end

data/lib/rdf/aggregate_repo/merge_graph.rb

@@ -35,21 +35,21 @@ module RDF
     # Name of this graph, used for setting the context on returned `Statements`.
     #
     # @return [Array<RDF::URI, false>]
-    attr_reader :context
+    attr_reader :graph_name
 
     ##
     # Create a new aggregation instance.
     #
     # @overload initialize(queryable = [], options = {})
     #   @param [Hash{Symbol => Object}] options ({})
-    #   @option options [RDF::Resource] :context
-    #   @option options [RDF::Resource] :name alias for :context
+    #   @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)
       @sources = []
-      @context = options[:context] || options[:name]
+      @graph_name = options[:graph_name] || options[:name]
 
       if block_given?
         case block.arity
@@ -83,7 +83,7 @@ module RDF
     # @return [Boolean]
     # @note The next release, graphs will not be named, this will return true
     def unnamed?
-      @context.nil?
+      @graph_name.nil?
     end
 
     ##
@@ -98,21 +98,21 @@ module RDF
     # Add a queryable to the set of constituent queryable instances
     #
     # @param [RDF::Queryable] queryable
-    # @param [RDF::Resource] context
+    # @param [RDF::Resource] graph_name
     # @return [RDF::MergeGraph] self
-    def source(queryable, context)
-      @sources << [queryable, context]
+    def source(queryable, graph_name)
+      @sources << [queryable, graph_name]
       self
     end
     alias_method :add, :source
 
     ##
-    # Set the context for statements in this graph
+    # Set the graph_name for statements in this graph
     #
     # @param [RDF::Resource, false] name
     # @return [RDF::MergeGraph] self
     def name(name)
-      @context = name
+      @graph_name = name
       self
     end
 
@@ -145,7 +145,7 @@ module RDF
     def has_statement?(statement)
       sources.any? do |(source, ctx)|
         statement = statement.dup
-        statement.context = ctx
+        statement.graph_name = ctx
         source.has_statement?(statement)
       end
     end
@@ -156,38 +156,27 @@ module RDF
       return enum_for(:each) unless block_given?
 
       # Add everything to a new graph for de-duplication
-      tmp = RDF::Graph.new(@context, :data => RDF::Repository.new)
-      sources.each do |(source, ctx)|
-        tmp << RDF::Graph.new(ctx || nil, :data => source)
+      tmp = RDF::Graph.new(@graph_name, data: RDF::Repository.new)
+      sources.each do |(source, gn)|
+        tmp << RDF::Graph.new(gn || nil, data: source)
       end
       tmp.each(&block)
     end
 
     ##
     # @private
-    # @see RDF::Enumerable#has_context?
-    def has_context?(value)
-      @context == value
+    # @see RDF::Enumerable#has_graph?
+    def has_graph?(value)
+      @graph_name == value
     end
 
-    ##
-    # @private
-    # @see RDF::Enumerable#each_context
-    def each_context(&block)
-      if block_given?
-        block.call(context) if context
-      end
-      enum_context
-    end
-
-
     ##
     # Iterate over each graph, in order, finding named graphs from the most recently added `source`.
     #
     # @see RDF::Enumerable#each_graph
     def each_graph(&block)
       if block_given?
-        block.call(self)
+        yield self
       end
       enum_graph
     end
@@ -199,8 +188,8 @@ module RDF
     # @see RDF::Queryable#query_pattern
     def query_pattern(pattern, &block)
       pattern = pattern.dup
-      sources.each do |(source, ctx)|
-        pattern.context = ctx
+      sources.each do |(source, gn)|
+        pattern.graph_name = gn
         source.send(:query_pattern, pattern, &block)
       end
     end

metadata

@@ -1,23 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rdf-aggregate-repo
 version: !ruby/object:Gem::Version
-  version: 1.1.0.1
+  version: 1.99.0
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
   type: :runtime
@@ -25,9 +22,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
 - !ruby/object:Gem::Dependency
@@ -35,9 +29,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
   type: :development
@@ -45,9 +36,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
 - !ruby/object:Gem::Dependency
@@ -55,9 +43,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
   type: :development
@@ -65,9 +50,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
 - !ruby/object:Gem::Dependency
@@ -76,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="