rdf-trig 1.1.5.1 → 1.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca2a72f7cb04a1d5e849f9255f9352b199d064de
-  data.tar.gz: 786a29f56d45192f6f5925290e7a4398b1e51139
+  metadata.gz: fc8d552177ba636020bf4802cde8700625ae6430
+  data.tar.gz: 7cbfeac9cfe170cf2b0203e29885cad5a711b106
 SHA512:
-  metadata.gz: e4bee71adff6065aea202a96ae9b64496b75e89a091d046d5c522baa3d469101ad19471529aaa9fbecae17c1ad53b67b85995c40c498b4183117307dc2c8a086
-  data.tar.gz: be1c09ea8310797f8b7794d2d236a2343784645703478fdae686e96596294502487228afe63bb474cc444453e0c61b7e46b98acaa1ffd3c91806bbb26891c663
+  metadata.gz: ea8fc1b9f68e6ef7cf62455828060b9b58ab2620494482f9184b608491bff3bad50f54146c530dbe5c5700259c61d29f0d896f00e8e8ecd6607e5e4d8e6c553f
+  data.tar.gz: 39cc3dbe3ecef648ba547e262635432c4b66a5e8d4aa7e30e9737a0575900d21377d8245f5e61f28625bd3c3487b5dae110f0d2b6904fd0e8769ba1943e8872f

data/VERSION

@@ -1 +1 @@
-1.1.5.1
+1.99.0

data/lib/rdf/trig/format.rb

@@ -5,18 +5,18 @@ module RDF::TriG
   # @example Obtaining an TriG format class
   #     RDF::Format.for("etc/foaf.trig")
   #     RDF::Format.for(:file_name      => "etc/foaf.trig")
-  #     RDF::Format.for(:file_extension => "trig")
+  #     RDF::Format.for(file_extension: "trig")
   #     RDF::Format.for(:content_type   => "application/trig")
   #
   # @example Obtaining serialization format MIME types
   #     RDF::Format.content_types      #=> {"application/trig" => [RDF::TriG::Format]}
   #
   # @example Obtaining serialization format file extension mappings
-  #     RDF::Format.file_extensions    #=> {:trig => "application/trig"}
+  #     RDF::Format.file_extensions    #=> {trig: "application/trig"}
   #
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
   class Format < RDF::Format
-    content_type     'application/trig',  :extension => :trig, :alias => 'application/x-trig'
+    content_type     'application/trig',  extension: :trig, alias: 'application/x-trig'
     content_encoding 'utf-8'
 
     reader { RDF::TriG::Reader }

data/lib/rdf/trig/reader.rb

@@ -65,11 +65,11 @@ module RDF::TriG
     ##
     # Iterates the given block for each RDF quad in the input.
     #
-    # @yield  [subject, predicate, object, context]
+    # @yield  [subject, predicate, object, graph_name]
     # @yieldparam [RDF::Resource] subject
     # @yieldparam [RDF::URI]      predicate
     # @yieldparam [RDF::Value]    object
-    # @yieldparam [RDF::URI]      context
+    # @yieldparam [RDF::URI]      graph_name
     # @return [void]
     def each_quad(&block)
       if block_given?
@@ -88,7 +88,7 @@ module RDF::TriG
     # @raise [RDF::ReaderError] Checks parameter types and raises if they are incorrect if parsing mode is _validate_.
     def add_statement(production, statement)
       error("Statement is invalid: #{statement.inspect.inspect}", production: produciton) if validate? && statement.invalid?
-      statement.context = @graph_name if @graph_name
+      statement.graph_name = @graph_name if @graph_name
       @callback.call(statement) if statement.subject &&
                                    statement.predicate &&
                                    statement.object &&

data/lib/rdf/trig/streaming_writer.rb

@@ -8,12 +8,12 @@ module RDF::TriG
     # `subject` and `predicate` to create more compact output
     # @return [void] `self`
     def stream_statement(statement)
-      if statement.context != @streaming_context
+      if statement.graph_name != @streaming_graph
         stream_epilogue
-        if statement.context
-          @output.write "#{format_term(statement.context, options)} {"
+        if statement.graph_name
+          @output.write "#{format_term(statement.graph_name, options)} {"
         end
-        @streaming_context, @streaming_subject, @streaming_predicate = statement.context, statement.subject, statement.predicate
+        @streaming_graph, @streaming_subject, @streaming_predicate = statement.graph_name, statement.subject, statement.predicate
         @output.write "#{format_term(statement.subject, options)} "
         @output.write "#{format_term(statement.predicate, options)} "
       elsif statement.subject != @streaming_subject
@@ -38,7 +38,7 @@ module RDF::TriG
     def stream_epilogue
       case
       when @previous_statement.nil? ;
-      when @streaming_context then @output.puts " }"
+      when @streaming_graph then @output.puts " }"
       else @output.puts " ."
       end
     end

data/lib/rdf/trig/writer.rb

@@ -13,7 +13,7 @@ module RDF::TriG
   #   RDF::Writer.for(:trig)         #=> RDF::TriG::Writer
   #   RDF::Writer.for("etc/test.trig")
   #   RDF::Writer.for(:file_name      => "etc/test.trig")
-  #   RDF::Writer.for(:file_extension => "trig")
+  #   RDF::Writer.for(file_extension: "trig")
   #   RDF::Writer.for(:content_type   => "application/trig")
   #
   # @example Serializing RDF repo into an TriG file
@@ -36,7 +36,7 @@ module RDF::TriG
   #   end
   #
   # @example Serializing RDF statements to a string in streaming mode
-  #   RDF::TriG::Writer.buffer(:stream => true) do |writer|
+  #   RDF::TriG::Writer.buffer(stream: true) do |writer|
   #     repo.each_statement do |statement|
   #       writer << statement
   #     end
@@ -45,9 +45,9 @@ module RDF::TriG
   # The writer will add prefix definitions, and use them for creating @prefix definitions, and minting QNames
   #
   # @example Creating @base and @prefix definitions in output
-  #   RDF::TriG::Writer.buffer(:base_uri => "http://example.com/", :prefixes => {
+  #   RDF::TriG::Writer.buffer(base_uri: "http://example.com/", prefixes: {
   #       nil => "http://example.com/ns#",
-  #       :foaf => "http://xmlns.com/foaf/0.1/"}
+  #       foaf: "http://xmlns.com/foaf/0.1/"}
   #   ) do |writer|
   #     repo.each_statement do |statement|
   #       writer << statement
@@ -59,27 +59,27 @@ module RDF::TriG
     include StreamingWriter
     format RDF::TriG::Format
     
-    class ContextFilteredRepo
+    class GraphFilteredRepo
       include RDF::Queryable
 
-      def initialize(repo, context)
+      def initialize(repo, graph_name)
         @repo = repo
-        @context = context
+        @graph_name = graph_name
       end
       
-      # Filter statements in repository to those having the specified context
-      # Returns each statement having the specified context, `false` for default context
+      # Filter statements in repository to those having the specified graph_name
+      # Returns each statement having the specified graph_name, `false` for default graph
       # @yield statement
       # @yieldparam [RDF::Statement] statement
       # @return [void]
       # @see [RDF::Queryable]
       def each
         @repo.each_statement do |st|
-          case @context
+          case @graph_name
           when false
-            yield st if !st.context
+            yield st if !st.graph_name
           else
-            yield st if st.context == @context
+            yield st if st.graph_name == @graph_name
           end
         end
       end
@@ -88,7 +88,7 @@ module RDF::TriG
       # Proxy Repository#query_pattern
       # @see RDF::Repository#query_pattern
       def query_pattern(pattern, &block)
-        pattern.context = @context || false
+        pattern.graph_name = @graph_name || false
         @repo.send(:query_pattern, pattern, &block)
       end
     end
@@ -125,8 +125,8 @@ module RDF::TriG
       reset
       super do
         # Set both @repo and @graph to a new repository.
-        # When serializing a context, @graph is changed
-        # to a ContextFilteredRepo
+        # When serializing a named graph, @graph is changed
+        # to a GraphFilteredRepo
         @repo = @graph = RDF::Repository.new
         if block_given?
           case block.arity
@@ -183,8 +183,8 @@ module RDF::TriG
         preprocess
         start_document
 
-        order_contexts.each do |ctx|
-          debug {"context: #{ctx.inspect}"}
+        order_graphs.each do |ctx|
+          debug {"graph_name: #{ctx.inspect}"}
           reset
           @depth = ctx ? 2 : 0
 
@@ -192,10 +192,10 @@ module RDF::TriG
             @output.write("\n#{format_term(ctx)} {")
           end
 
-          # Restrict view to the particular context
-          @graph = ContextFilteredRepo.new(@repo, ctx)
+          # Restrict view to the particular graph
+          @graph = GraphFilteredRepo.new(@repo, ctx)
 
-          # Pre-process statements again, but in the specified context
+          # Pre-process statements again, but in the specified graph
           @graph.each {|st| preprocess_statement(st)}
           order_subjects.each do |subject|
             unless is_done?(subject)
@@ -210,31 +210,31 @@ module RDF::TriG
 
     protected
 
-    # Add additional constraint that the resource must be in a single context
+    # Add additional constraint that the resource must be in a single graph
     def blankNodePropertyList?(subject)
-      super && resource_in_single_context?(subject)
+      super && resource_in_single_graph?(subject)
     end
 
-    # Add additional constraint that the resource must be in a single context
+    # Add additional constraint that the resource must be in a single graph
     def p_squared?(resource, position)
-      super && resource_in_single_context?(resource)
+      super && resource_in_single_graph?(resource)
     end
 
-    def resource_in_single_context?(resource)
-      contexts = @repo.query(:subject => resource).map(&:context)
-      contexts += @repo.query(:object => resource).map(&:context)
-      contexts.uniq.length <= 1
+    def resource_in_single_graph?(resource)
+      graph_names = @repo.query(subject: resource).map(&:graph_name)
+      graph_names += @repo.query(object: resource).map(&:graph_name)
+      graph_names.uniq.length <= 1
     end
 
-    # Order contexts for output
-    def order_contexts
-      debug("order_contexts") {@repo.contexts.to_a.inspect}
-      contexts = @repo.contexts.to_a.sort
+    # Order graphs for output
+    def order_graphs
+      debug("order_graphs") {@repo.graph_names.to_a.inspect}
+      graph_names = @repo.graph_names.to_a.sort
       
-      # include default context, if necessary
-      contexts.unshift(nil) unless @repo.query(:context => false).to_a.empty?
+      # include default graph, if necessary
+      graph_names.unshift(nil) unless @repo.query(graph_name: false).to_a.empty?
       
-      contexts
+      graph_names
     end
 
     # Perform any statement preprocessing required. This is used to perform reference counts and determine required
@@ -242,7 +242,7 @@ module RDF::TriG
     # @param [Statement] statement
     def preprocess_statement(statement)
       super
-      get_pname(statement.context) if statement.has_context?
+      get_pname(statement.graph_name) if statement.has_graph?
     end
   end
 end

metadata

@@ -1,26 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rdf-trig
 version: !ruby/object:Gem::Version
-  version: 1.1.5.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.1.11
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
   type: :runtime
@@ -28,12 +22,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.11
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
 - !ruby/object:Gem::Dependency
@@ -66,9 +54,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -79,9 +64,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
@@ -89,9 +71,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -99,9 +78,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -137,9 +113,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -147,9 +120,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -169,9 +139,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
   type: :development
@@ -179,9 +146,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
@@ -227,7 +191,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:
   - - ">="