rdf-sesame 0.0.1 → 0.1.0

data/README

@@ -1,7 +1,11 @@
 RDF::Sesame: Sesame 2.0 Adapter for RDF.rb
 ==========================================
 
-This is a Sesame 2.0 adapter for [RDF.rb](http://rdf.rubyforge.org/).
+This is an [RDF.rb](http://rdf.rubyforge.org/) plugin that adds support for
+Sesame 2.0-compatible RDF repositories accessed using Sesame's
+[HTTP API](http://www.openrdf.org/doc/sesame2/system/ch08.html).
+
+* <http://github.com/bendiken/rdf-sesame>
 
 ### About Sesame
 
@@ -10,13 +14,13 @@ This is a Sesame 2.0 adapter for [RDF.rb](http://rdf.rubyforge.org/).
 Documentation
 -------------
 
-* [`RDF::Sesame`](http://rdf.rubyforge.org/RDF/Sesame.html)
+* {RDF::Sesame}
 
 Dependencies
 ------------
 
-* [RDF.rb](http://rdf.rubyforge.org/) (>= 0.0.6)
-* [JSON](http://flori.github.com/json/) (>= 1.2.0)
+* [RDF.rb](http://gemcutter.org/gems/rdf) (>= 0.0.9)
+* [JSON](http://gemcutter.org/gems/json_pure) (>= 1.2.0)
 
 Installation
 ------------

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/lib/rdf/sesame.rb

@@ -7,8 +7,8 @@ module RDF
   # Dependencies
   # ------------
   #
-  # * [RDF.rb](http://rdf.rubyforge.org/) (>= 0.0.6)
-  # * [JSON](http://flori.github.com/json/) (>= 1.2.0)
+  # * [RDF.rb](http://gemcutter.org/gems/rdf) (>= 0.0.9)
+  # * [JSON](http://gemcutter.org/gems/json_pure) (>= 1.2.0)
   #
   # Installation
   # ------------

data/lib/rdf/sesame/connection.rb

@@ -92,7 +92,7 @@ module RDF::Sesame
 
       # Preserve only those URI components that we actually require for
       # establishing a connection to the HTTP server in question:
-      @url = RDF::URI.new(Addressable::URI.new(to_hash))
+      @url = RDF::URI.new(to_hash)
 
       @headers   = options.delete(:headers) || {}
       @options   = options
@@ -307,12 +307,20 @@ module RDF::Sesame
     # Performs an HTTP POST request for the given Sesame `path`.
     #
     # @param  [String, #to_s]          path
+    # @param  [String, #to_s]          data
     # @param  [Hash{String => String}] headers
     # @yield  [response]
     # @yieldparam [Net::HTTPResponse] response
     # @return [Net::HTTPResponse]
-    def post(path, headers = {}, &block)
-      # TODO
+    def post(path, data, headers = {}, &block)
+      Net::HTTP.start(host, port) do |http|
+        response = http.post(path.to_s, data.to_s, @headers.merge(headers))
+        if block_given?
+          block.call(response)
+        else
+          response
+        end
+      end
     end
 
     ##
@@ -336,7 +344,14 @@ module RDF::Sesame
     # @yieldparam [Net::HTTPResponse] response
     # @return [Net::HTTPResponse]
     def delete(path, headers = {}, &block)
-      # TODO
+      Net::HTTP.start(host, port) do |http|
+        response = http.delete(path.to_s, @headers.merge(headers))
+        if block_given?
+          block.call(response)
+        else
+          response
+        end
+      end
     end
   end
 end

data/lib/rdf/sesame/repository.rb

@@ -6,22 +6,20 @@ module RDF::Sesame
   # servers.
   #
   # @example Opening a Sesame repository (1)
-  #   url    = "http://localhost:8080/openrdf-sesame/repositories/SYSTEM"
-  #   db     = RDF::Sesame::Repository.new(url)
+  #   url = "http://localhost:8080/openrdf-sesame/repositories/SYSTEM"
+  #   repository = RDF::Sesame::Repository.new(url)
   #
   # @example Opening a Sesame repository (2)
   #   server = RDF::Sesame::Server.new("http://localhost:8080/openrdf-sesame")
-  #   db     = RDF::Sesame::Repository.new(:server => server, :id => :SYSTEM)
+  #   repository = RDF::Sesame::Repository.new(:server => server, :id => :SYSTEM)
   #
   # @example Opening a Sesame repository (3)
   #   server = RDF::Sesame::Server.new("http://localhost:8080/openrdf-sesame")
-  #   db     = server.repository(:SYSTEM)
+  #   repository = server.repository(:SYSTEM)
   #
   # @see RDF::Sesame
   # @see http://www.openrdf.org/doc/sesame2/system/ch08.html
   class Repository < RDF::Repository
-    include Enumerable
-
     # @return [RDF::URI]
     attr_reader :url
     alias_method :uri, :url
@@ -55,18 +53,19 @@ module RDF::Sesame
       case url_or_options
         when String
           initialize(RDF::URI.new(url_or_options), &block)
+
         when RDF::URI
-          require 'addressable/uri' unless defined?(Addressable)
           require 'pathname' unless defined?(Pathname)
           @uri     = url_or_options
-          @server  = Server.new(RDF::URI.new(Addressable::URI.new({
+          @server  = Server.new(RDF::URI.new({
             :scheme   => @uri.scheme,
             :userinfo => @uri.userinfo,
             :host     => @uri.host,
             :port     => @uri.port,
             :path     => Pathname.new(@uri.path).parent.parent.to_s, # + '../..'
-          })))
+          }))
           @options = {}
+
         when Hash
           raise ArgumentError.new("missing options[:server]") unless url_or_options.has_key?(:server)
           raise ArgumentError.new("missing options[:id]")     unless url_or_options.has_key?(:id)
@@ -75,6 +74,7 @@ module RDF::Sesame
           @id      = @options.delete(:id)
           @uri     = @options.delete(:uri) || server.url("repositories/#{@id}")
           @title   = @options.delete(:title)
+
         else
           raise ArgumentError.new("wrong argument type #{url_or_options.class} (expected String, RDF::URI or Hash)")
       end
@@ -90,21 +90,53 @@ module RDF::Sesame
     ##
     # Returns the URL for the given repository-relative `path`.
     #
-    # @param  [String, #to_s] path
+    # @param  [String, #to_s]        path
+    # @param  [Hash, RDF::Statement] query
     # @return [RDF::URI]
-    def url(path = nil)
-      path ? RDF::URI.new("#{@uri}/#{path}") : @uri # FIXME
+    def url(path = nil, query = {})
+      url = path ? RDF::URI.new("#{@uri}/#{path}") : @uri.dup # FIXME
+      unless query.nil?
+        case query
+          when RDF::Statement
+            writer = RDF::NTriples::Writer.new
+            query  = {
+              :subj => writer.format_value(query.subject),
+              :pred => writer.format_value(query.predicate),
+              :obj  => writer.format_value(query.object),
+            }
+            url.query_values = query
+          when Hash then query
+            url.query_values = query unless query.empty?
+        end
+      end
+      return url
     end
 
     alias_method :uri, :url
 
+    ##
+    # Returns `true` to indicate that this repository is durable.
+    #
+    # @return [Boolean]
+    def durable?
+      true # FIXME
+    end
+
+    ##
+    # Returns `true` if this repository contains no RDF statements.
+    #
+    # @return [Boolean]
+    def empty?
+      count.zero?
+    end
+
     ##
     # Returns the number of RDF statements in this repository.
     #
     # @return [Integer] 
     # @see    http://www.openrdf.org/doc/sesame2/system/ch08.html#d0e569
-    def size
-      get(:size) do |response|
+    def count
+      server.get(url(:size)) do |response|
         case response
           when Net::HTTPSuccess
             size = response.body
@@ -114,21 +146,83 @@ module RDF::Sesame
       end
     end
 
-    protected
-
-      ##
-      # Performs an HTTP GET request for the given Sesame repository `path`.
-      #
-      # @param  [String, #to_s]          path
-      # @param  [Hash{String => String}] headers
-      # @yield  [response]
-      # @yieldparam [Net::HTTPResponse] response
-      # @return [Net::HTTPResponse]
-      def get(path, headers = {}, &block)
-        @server.connection.open do
-          @server.connection.get(url(path), headers, &block)
+    ##
+    # Returns `true` if this repository contains the given RDF statement.
+    #
+    # @param  [RDF::Statement] statement
+    # @return [Boolean]
+    # @see    http://www.openrdf.org/doc/sesame2/system/ch08.html#d0e304
+    def has_statement?(statement)
+      server.get(url(:statements, statement), 'Accept' => 'text/plain') do |response|
+        case response
+          when Net::HTTPSuccess
+            reader = RDF::NTriples::Reader.new(response.body)
+            reader.include?(statement)
+          else false
         end
       end
+    end
 
+    ##
+    # Enumerates each RDF statement in this repository.
+    #
+    # @yield  [statement]
+    # @yieldparam [RDF::Statement] statement
+    # @return [Enumerator]
+    # @see    http://www.openrdf.org/doc/sesame2/system/ch08.html#d0e304
+    def each(&block)
+      server.get(url(:statements), 'Accept' => 'text/plain') do |response|
+        case response
+          when Net::HTTPSuccess
+            reader = RDF::NTriples::Reader.new(response.body)
+            reader.each_statement(&block)
+        end
+      end
+    end
+
+    ##
+    # Inserts the given RDF statement into this repository.
+    #
+    # @param  [RDF::Statement] statement
+    # @return [Boolean]
+    # @see    http://www.openrdf.org/doc/sesame2/system/ch08.html#d0e304
+    def insert_statement(statement)
+      data = RDF::NTriples::Writer.buffer { |writer| writer << statement } # FIXME for RDF.rb 0.1.0
+      server.post(url(:statements), data, 'Content-Type' => 'text/plain') do |response|
+        case response
+          when Net::HTTPSuccess then true
+          else false
+        end
+      end
+    end
+
+    ##
+    # Deletes the given RDF statement from this repository.
+    #
+    # @param  [RDF::Statement] statement
+    # @return [Boolean]
+    # @see    http://www.openrdf.org/doc/sesame2/system/ch08.html#d0e304
+    def delete_statement(statement)
+      server.delete(url(:statements, statement)) do |response|
+        case response
+          when Net::HTTPSuccess then true
+          else false
+        end
+      end
+    end
+
+    ##
+    # Deletes all RDF statements from this repository.
+    #
+    # @return [Boolean]
+    # @see    http://www.openrdf.org/doc/sesame2/system/ch08.html#d0e304
+    def clear_statements
+      server.delete(url(:statements)) do |response|
+        case response
+          when Net::HTTPSuccess then true
+          else false
+        end
+      end
+    end
   end
 end

data/lib/rdf/sesame/server.rb

@@ -128,7 +128,7 @@ module RDF::Sesame
     # @return [Integer]
     # @see    http://www.openrdf.org/doc/sesame2/system/ch08.html#d0e180
     def protocol
-      get(:protocol) do |response|
+      get(url(:protocol)) do |response|
         case response
           when Net::HTTPSuccess
             version = response.body
@@ -186,7 +186,7 @@ module RDF::Sesame
     def repositories
       require 'json' unless defined?(JSON)
 
-      get(:repositories, ACCEPT_JSON) do |response|
+      get(url(:repositories), ACCEPT_JSON) do |response|
         case response
           when Net::HTTPSuccess
             json = JSON.parse(response.body)
@@ -206,21 +206,22 @@ module RDF::Sesame
       end
     end
 
-    protected
-
-      ##
-      # Performs an HTTP GET request for the given Sesame server `path`.
-      #
-      # @param  [String, #to_s]          path
-      # @param  [Hash{String => String}] headers
-      # @yield  [response]
-      # @yieldparam [Net::HTTPResponse] response
-      # @return [Net::HTTPResponse]
-      def get(path, headers = {}, &block)
-        @connection.open do
-          @connection.get(url(path), headers, &block)
-        end
+    def get(path, headers = {}, &block) # @private
+      self.connection.open do
+        self.connection.get(path, headers, &block)
       end
+    end
 
+    def post(path, data, headers = {}, &block) # @private
+      self.connection.open do
+        self.connection.post(path, data, headers, &block)
+      end
+    end
+
+    def delete(path, headers = {}, &block) # @private
+      self.connection.open do
+        self.connection.delete(path, headers, &block)
+      end
+    end
   end
 end

data/lib/rdf/sesame/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdf-sesame
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-01 00:00:00 +01:00
+date: 2010-02-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,10 +40,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.6
+        version: 0.0.9
     version: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: json_pure
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -52,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.0
     version: 
-description: RDF::Sesame is a Sesame 2.0 adapter for RDF.rb.
+description: RDF.rb plugin providing a Sesame 2.0 storage adapter.
 email: arto.bendiken@gmail.com
 executables: []