rdf-sesame 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a88c42c531cc2ed3697a7abed35f8f60a4aee584
-  data.tar.gz: bd05b706a08e5aeb539de43f5db7904c14dd3c00
+  metadata.gz: dbe9c97f53c462f991525db0effc51a5b1293012
+  data.tar.gz: 935fadb4ab956da298a4e51c942498b31bc2f518
 SHA512:
-  metadata.gz: 79d2d1e1aa62f38b2d7e0ceff28d89e8e9752dc54b95af1ba5cae73ee85d62091f2fe5b7eb1fd957135f16e6496d0590808b46cd4e1743b19bcc457cb5dbd76d
-  data.tar.gz: 91fddf50755fb1c58b86f5e72b30a5fd79877a9f7ab904702e6238038fa12fe81ce6d1ba3ce09657a3b2426ac4edc2ab631297e66d608ab83d66fb85b4c809e2
+  metadata.gz: 2779d4893d1d44f9ef133b48d386271ab4791911900a56da78490c332a3a56c5e4275bcd266277c3690457bea1b9a4f69f84fc5803b58ada8dcdd30868d4ce67
+  data.tar.gz: e2abaff8e9f58fcf0418edc9035bb41cde8d3b1bc795271390938339a1d37ce80357417427585996a47545d8bb5467fc3a702567897088cb2883d8b592ba1404

data/VERSION

@@ -1 +1 @@
-1.1.2
+2.0.0

data/lib/rdf/sesame/repository.rb

@@ -115,11 +115,11 @@ module RDF::Sesame
           when RDF::Statement
             writer = RDF::NTriples::Writer.new
             q  = {
-              :subj    => writer.format_value(query.subject),
-              :pred    => writer.format_value(query.predicate),
-              :obj     => writer.format_value(query.object)
+              :subj    => writer.format_term(query.subject),
+              :pred    => writer.format_term(query.predicate),
+              :obj     => writer.format_term(query.object)
             }
-            q.merge!(:context => writer.format_value(query.context)) if query.has_context?
+            q.merge!(:context => writer.format_term(query.graph_name)) if query.has_graph?
             url.query_values = q
           when Hash
             url.query_values = query unless query.empty?
@@ -141,7 +141,7 @@ module RDF::Sesame
     # @see RDF::Repository#supports?
     def supports?(feature)
       case feature.to_sym
-        when :context then true # statement contexts / named graphs
+        when :graph_name then true # statement contexts / named graphs
         else super
       end
     end
@@ -171,6 +171,23 @@ module RDF::Sesame
       end
     end
 
+    ##
+    # Returns all namespaces on this Sesame repository.
+    #
+    # @return [Hash{Symbol => RDF::URI}]
+    # @see    #repository
+    # @see    #each_repository
+    # @see    http://www.openrdf.org/doc/sesame2/system/ch08.html#d0e204
+    def namespaces
+      require 'json' unless defined?(::JSON)
+
+      response = server.get(path(:namespaces), Server::ACCEPT_JSON)
+      json = ::JSON.parse(response.body)
+      json['results']['bindings'].each_with_object({}) do |binding, namespaces|
+        namespaces[binding['prefix']['value'].to_sym] = RDF::URI.new(binding['namespace']['value'])
+      end
+    end
+
     ##
     # @see RDF::Enumerable#has_triple?
     def has_triple?(triple)
@@ -180,7 +197,7 @@ module RDF::Sesame
     ##
     # @see RDF::Enumerable#has_quad?
     def has_quad?(quad)
-      has_statement?(RDF::Statement.new(quad[0], quad[1], quad[2], :context => quad[3]))
+      has_statement?(RDF::Statement.new(quad[0], quad[1], quad[2], :graph_name => quad[3]))
     end
 
     ##
@@ -228,12 +245,12 @@ module RDF::Sesame
       # This is for performance. Otherwise only one query with TriG::Reader will be
       # necessary
 
-      ['null', *enum_context].uniq.each do |context|
+      ['null', *graph_names].uniq.each do |context|
         query = {}
         query.merge!(:context => serialize_context(context)) if context
         response = server.get(path(:statements, query), 'Accept' => 'text/plain')
         RDF::NTriples::Reader.new(response.body).each_statement do |statement|
-          statement.context = context
+          statement.graph_name = context
           yield statement
         end
       end
@@ -242,22 +259,15 @@ module RDF::Sesame
     alias_method :each, :each_statement
 
     ##
-    # @see RDF::Enumerable#each_context
-    def each_context
-      return enum_context unless block_given?
-
-      require 'json' unless defined?(::JSON)
-      response = server.get(path(:contexts), Server::ACCEPT_JSON)
-      json = ::JSON.parse(response.body)
-      json['results']['bindings'].map { |binding| binding['contextID'] }.each do |context_id|
-        context = case context_id['type'].to_s.to_sym
-                  when :bnode then RDF::Node.new(context_id['value'])
-                  when :uri   then RDF::URI.new(context_id['value'])
-                  else
-                    nil
-                  end
-        yield context if context
-      end
+    # Returns all unique RDF graph names, other than the default graph.
+    #
+    # @param  unique (true)
+    # @return [Array<RDF::Resource>]
+    # @see    #each_graph
+    # @see    #enum_graph
+    # @since 2.0
+    def graph_names(unique: true)
+      fetch_graph_names
     end
 
     # Run a raw SPARQL query.
@@ -371,13 +381,12 @@ module RDF::Sesame
     # @option options [String] :subject Match a specific subject
     # @option options [String] :predicate Match a specific predicate
     # @option options [String] :object Match a specific object
-    # @option options [String] :context Match a specific graph name.
+    # @option options [String] :graph_name Match a specific graph name.
     # @return [void]
-    def clear(options={})
+    def clear(options = {})
       parameters = {}
-      { :subject => :subj, :predicate => :pred, :object => :obj, :context => :context }.each do |option_key, parameter_key|
-        value = options[option_key]
-        parameters.merge! parameter_key => RDF::NTriples.serialize(RDF::URI.new(value)) if value
+      { :subject => :subj, :predicate => :pred, :object => :obj, :graph_name => :context }.each do |option_key, parameter_key|
+        parameters.merge! parameter_key => RDF::NTriples.serialize(RDF::URI.new(options[option_key])) if options.has_key?(option_key)
       end
       response = server.delete(path(:statements, statements_options.merge(parameters)))
       response.code == "204"
@@ -388,20 +397,21 @@ module RDF::Sesame
     ##
     # @private
     # @see RDF::Queryable#query
-    def query_pattern(pattern)
+    def query_pattern(pattern, options = {}, &block)
       writer = RDF::NTriples::Writer.new
       query = {}
-      query.merge!(:context => writer.format_value(pattern.context)) if pattern.has_context?
-      query.merge!(:subj => writer.format_value(pattern.subject)) unless pattern.subject.is_a?(RDF::Query::Variable) || pattern.subject.nil?
-      query.merge!(:pred => writer.format_value(pattern.predicate)) unless pattern.predicate.is_a?(RDF::Query::Variable) || pattern.predicate.nil?
-      query.merge!(:obj => writer.format_value(pattern.object)) unless pattern.object.is_a?(RDF::Query::Variable) || pattern.object.nil?
+      query.merge!(:context => writer.format_term(pattern.graph_name)) if pattern.has_graph?
+      query.merge!(:subj => writer.format_term(pattern.subject)) unless pattern.subject.is_a?(RDF::Query::Variable) || pattern.subject.nil?
+      query.merge!(:pred => writer.format_term(pattern.predicate)) unless pattern.predicate.is_a?(RDF::Query::Variable) || pattern.predicate.nil?
+      query.merge!(:obj => writer.format_term(pattern.object)) unless pattern.object.is_a?(RDF::Query::Variable) || pattern.object.nil?
       response = server.get(path(:statements, query), Server::ACCEPT_NTRIPLES)
       RDF::NTriples::Reader.new(response.body).each_statement do |statement|
-        statement.context = pattern.context
-        yield statement
+        statement.graph_name = pattern.graph_name
+        yield statement if block_given?
       end
     end
 
+
     #--------------------------------------------------------------------
     # @group RDF::Mutable methods
 
@@ -432,6 +442,16 @@ module RDF::Sesame
       response.code == "204"
     end
 
+    ##
+    # @private
+    # @see RDF::Mutable#delete
+    #
+    # Optimization to remove multiple statements in one query
+    def delete_statements(statements)
+      data = "DELETE DATA { #{statements_to_text_plain(statements)} }"
+      write_query data, 'sparql', {}
+    end
+
   private
 
     # Convert a list of statements to a text-plain-compatible text.
@@ -588,5 +608,29 @@ module RDF::Sesame
       options[:context] = @context if @context
       options
     end
+
+    # @private
+    #
+    # Fetch the graph names from SESAME API
+    def fetch_graph_names
+      require 'json' unless defined?(::JSON)
+
+      response = server.get(path(:contexts), Server::ACCEPT_JSON)
+      json = ::JSON.parse(response.body)
+
+      json['results']['bindings'].map do |binding|
+        binding['contextID']
+      end
+      .map do |context_id|
+        case context_id['type'].to_s.to_sym
+        when :bnode
+          RDF::Node.new(context_id['value'])
+        when :uri
+          RDF::URI.new(context_id['value'])
+        else
+          nil
+        end
+      end.compact
+    end
   end # class Repository
 end # module RDF::Sesame

data/lib/rdf/sesame/version.rb

@@ -1,8 +1,8 @@
 module RDF; module Sesame
   module VERSION
-    MAJOR = 1
-    MINOR = 1
-    TINY  = 2
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 0
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-sesame
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Arto Bendiken
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 description: RDF.rb plugin providing a Sesame 2.0 storage adapter.
 email: public-rdf-ruby@w3.org
 executables: []