rdf-agraph 0.3.1 → 0.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWJmZDg2YzkwZGE0OTkyZWZkMzYyNjI4NjFjYjkxMjZiZDY2OGQ1MA==
+  data.tar.gz: !binary |-
+    OGRmMjMwZmJiYTc3NTNiMTk5Zjc2MjlhYjhjN2ViNTYwNDdlNjAxNw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YTUxYzNlY2EzOTE2NjY5NDNhZmM2NjgzNjE4YWIyMzk4ZGU0ZGE5N2MyZWNh
+    NDcwZmM4YmI0ZTlhNDIyZjNlMDBhZDQ4ZDY1Yzk3ZWJmOWIwZWIyNDUxN2Vl
+    NDUyYjY0ZjE5Y2M1ZjU3ZTA5NTdiMDJlMTUyMjUxMmY4Njc0YmQ=
+  data.tar.gz: !binary |-
+    ZGYwMjIxOWU4YWM3YzA2MTJhNWI0NmQ4NzMwM2NmNjI5YWFiYTM5NTZjMjgz
+    ZWMyMDUxM2U0NmY1Nzg0ZjMwNzAyZGI3N2FlMDY5YjNjYjA4ZmViNTYzYmM4
+    MWQ4OTU0MmFiYjQ2MjQ5MTU1MjJiNDQ5NTgyYTA4N2M0YzU1YmQ=

data/AUTHORS

@@ -1 +1,2 @@
-* Eric Kidd <git@randomhacks.net>
+* Eric Kidd <https://github.com/emk>
+* Aymeric Brisse <https://github.com/abrisse>

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4

data/lib/rdf/allegro_graph.rb

@@ -1,4 +1,5 @@
 require 'rdf'
+require 'rdf/ntriples'
 require 'agraph'
 require 'enumerator'
 
@@ -6,9 +7,11 @@ require 'enumerator'
 module RDF::AllegroGraph
   autoload :Query, 'rdf/allegro_graph/query'
   autoload :Server, 'rdf/allegro_graph/server'
+  autoload :Catalog, 'rdf/allegro_graph/catalog'
   autoload :AbstractRepository, 'rdf/allegro_graph/abstract_repository'
   autoload :Repository, 'rdf/allegro_graph/repository'
   autoload :SnaGenerator, 'rdf/allegro_graph/sna_generator'
   autoload :Functors, 'rdf/allegro_graph/functors'
+  autoload :Parser, 'rdf/allegro_graph/parser'
   autoload :Session, 'rdf/allegro_graph/session'
 end

data/lib/rdf/allegro_graph/abstract_repository.rb

@@ -23,6 +23,8 @@ module RDF::AllegroGraph
     #
     # We actually stack up pretty well against this list.
 
+    attr_reader :resource, :resource_writable
+    attr_reader :global_query_options
 
     #--------------------------------------------------------------------
     # @group RDF::Repository methods
@@ -32,12 +34,14 @@ module RDF::AllegroGraph
     # @param [AllegroGraph::Resource] resource
     #   The underlying 'agraph'-based implementation to wrap.
     # @private
-    def initialize(resource)
-      @repo = resource
+    def initialize(resource, options={})
+      @resource = resource
+      @resource_writable = options[:writable_repository] || resource
       @blank_nodes = []
       @blank_nodes_to_generate = 8
       @blank_nodes_local_to_server = {}
       @blank_nodes_server_to_local = {}
+      self.global_query_options = options[:query]
     end
 
     # Returns true if `feature` is supported.
@@ -50,7 +54,23 @@ module RDF::AllegroGraph
       else super
       end
     end
-    
+
+    # Set the global query options that will be used at each request.
+    # Current supported options are :offset, :limit and :infer.
+    #
+    # @param [Hash] options the options to set
+    #
+    # http://www.franz.com/agraph/support/documentation/current/http-protocol.html#get-post-repo
+    def global_query_options=(options)
+      @global_query_options = filter_query_options(options)
+    end
+
+    # Returns the amount of statements in the repository, as an integer
+    #
+    # @return [Integer] the number of statements
+    def size
+      @resource.size
+    end
 
     #--------------------------------------------------------------------
     # @group RDF::Transaction support
@@ -85,7 +105,7 @@ module RDF::AllegroGraph
     # @param [RDF::Statement] statement
     # @return [Boolean]
     def has_statement?(statement)
-      found = @repo.statements.find(statement_to_dict(statement))
+      found = @resource.statements.find(statement_to_dict(statement))
       !found.empty?
     end
 
@@ -110,7 +130,7 @@ module RDF::AllegroGraph
 
     # How many statements are in this repository?
     #def count
-    #  @repo.request_http(:get, path(:statements),
+    #  @resource.request_http(:get, path(:statements),
     #                     :headers => { 'Accept' => 'text/integer' },
     #                     :expected_status_code => 200).chomp.to_i
     #end
@@ -137,7 +157,7 @@ module RDF::AllegroGraph
         seen = {}
         dict = statement_to_dict(pattern)
         dict.delete(:context) if dict[:context] == 'null'
-        @repo.statements.find(dict).each do |statement|
+        @resource.statements.find(dict).each do |statement|
           unless seen.has_key?(statement)
             seen[statement] = true
             s,p,o,c = statement.map {|v| unserialize(v) }
@@ -167,7 +187,7 @@ module RDF::AllegroGraph
     # @see    RDF::Queryable#query
     # @see    RDF::Query#execute
     def query_execute(query, &block)
-      query_options = 
+      query_options =
         if query.respond_to?(:query_options)
           query.query_options
         else
@@ -207,6 +227,7 @@ module RDF::AllegroGraph
     #
     # @see #build_query
     def sparql_query(query, query_options={}, &block)
+      query_options[:type] = query.split(' ').first.downcase.to_sym unless query.empty?
       raw_query(:sparql, query, query_options, &block)
     end
 
@@ -241,17 +262,23 @@ module RDF::AllegroGraph
       params = {
         :query => query,
         :queryLn => language.to_s
-      }
-      params[:infer] = query_options[:infer].to_s if query_options[:infer]
+      }.merge!(@global_query_options).merge!(filter_query_options(query_options))
 
       # Run the query and process the results.
-      json = @repo.request_json(:get, path, :parameters => params,
+      json = @resource.request_json(:get, path, :parameters => params,
                                 :expected_status_code => 200)
-      results = json_to_query_solutions(json)
+
+      # Parse the result (depends on the type of the query)
+      if language == :sparql and query_options[:type] == :construct
+        results = json_to_graph(json)
+      else
+        results = json_to_query_solutions(json)
+        results = enum_for(:raw_query, language, query) unless block_given?
+      end
       if block_given?
         results.each {|s| yield s }
       else
-        enum_for(:raw_query, language, query)
+        results
       end
     end
     protected :raw_query
@@ -304,7 +331,7 @@ module RDF::AllegroGraph
       # Note that specifying deleteDuplicates on repository creation doesn't
       # seem to affect this.
       json = statements_to_json(statements)
-      @repo.request_json(:post, path(:statements), :body => json,
+      @resource_writable.request_json(:post, path_writable(:statements), :body => json,
                          :expected_status_code => 204)
     end
     protected :insert_statements
@@ -326,7 +353,7 @@ module RDF::AllegroGraph
     # @return [void]
     def delete_statements(statements)
       json = statements_to_json(statements)
-      @repo.request_json(:post, path('statements/delete'),
+      @resource_writable.request_json(:post, path_writable('statements/delete'),
                          :body => json, :expected_status_code => 204)
     end
     protected :delete_statements
@@ -336,9 +363,14 @@ module RDF::AllegroGraph
 
     # Clear all statements from the repository.
     #
+    # @param [Hash] options
+    # @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.
     # @return [void]
-    def clear
-      @repo.statements.delete
+    def clear(options = {})
+      @resource_writable.statements.delete(options)
     end
 
 
@@ -356,6 +388,7 @@ module RDF::AllegroGraph
     def serialize(value)
       case value
       when RDF::Query::Variable then value.to_s
+      when false then nil
       else RDF::NTriples::Writer.serialize(map_to_server(value))
       end
     end
@@ -380,9 +413,18 @@ module RDF::AllegroGraph
     # Build a repository-relative path.
     def path(relative_path=nil)
       if relative_path
-        "#{@repo.path}/#{relative_path}"
+        "#{@resource.path}/#{relative_path}"
       else
-        @repo.path
+        @resource.path
+      end
+    end
+
+    # Build a repository-relative path for the writable mirror
+    def path_writable(relative_path=nil)
+      if relative_path
+        "#{@resource_writable.path}/#{relative_path}"
+      else
+        @resource_writable.path
       end
     end
 
@@ -406,7 +448,7 @@ module RDF::AllegroGraph
         tuple = [s.subject, s.predicate, s.object]
         tuple << s.context if s.context
         tuple.map {|v| serialize(v) }
-      end        
+      end
     end
 
     # Translate a RDF::Statement into a dictionary the we can pass
@@ -420,7 +462,7 @@ module RDF::AllegroGraph
         # to operate a single statement.  Otherwise, we will operate
         # on all matching s,p,o triples regardless of context.
         :context => serialize(statement.context) || 'null'
-      }
+      }.merge!(@global_query_options)
     end
 
     # Convert a query to SPARQL.
@@ -428,7 +470,7 @@ module RDF::AllegroGraph
       variables = []
       patterns = []
       query.patterns.each do |p|
-        p.variables.each {|_,v| variables << v unless variables.include?(v) }
+        variables.concat(p.variables.values)
         triple = [p.subject, p.predicate, p.object]
         str = triple.map {|v| serialize(v) }.join(" ")
         # TODO: Wrap in graph block for context!
@@ -437,7 +479,7 @@ module RDF::AllegroGraph
         end
         patterns << "#{str} ."
       end
-      "SELECT #{variables.join(" ")}\nWHERE {\n  #{patterns.join("\n  ")} }"
+      "SELECT #{variables.uniq.join(" ")}\nWHERE {\n  #{patterns.join("\n  ")} }"
     end
 
     # Convert a JSON query solution to a list of RDF::Query::Solution
@@ -453,7 +495,15 @@ module RDF::AllegroGraph
           hash[name] = unserialize(match[i]) unless match[i].nil?
         end
         RDF::Query::Solution.new(hash)
-      end      
+      end
+    end
+
+    # Convert a JSON triples list to a RDF::Graph object.
+    def json_to_graph(json)
+      statements = json.map {|t| RDF::Statement.new(unserialize(t[0]), unserialize(t[1]), unserialize(t[2]))}
+      graph = RDF::Graph.new
+      graph.insert_statements(statements)
+      graph
     end
 
     # Return true if this a blank RDF node.
@@ -463,7 +513,7 @@ module RDF::AllegroGraph
 
     # Ask AllegroGraph to generate a series of blank node IDs.
     def generate_blank_nodes(amount)
-      response = @repo.request_http(:post, path(:blankNodes),
+      response = @resource.request_http(:post, path(:blankNodes),
                                     :parameters => { :amount => amount },
                                     :expected_status_code => 200)
       response.chomp.split("\n").map {|i| i.gsub(/^_:/, '') }
@@ -511,5 +561,21 @@ module RDF::AllegroGraph
         value
       end
     end
+
+    # Set queries/statements options that will be used at each request
+    #
+    # @param [Hash] options options to use. Currently :limit and :infer are supported.
+    # @return [Hash] the options
+
+    # @private
+    def filter_query_options(options)
+      options ||= {}
+      filtered_options = {}
+      [ :limit, :infer, :offset ].each do |key|
+        filtered_options.merge! key => options[key] if options.has_key?(key)
+      end
+      filtered_options
+    end
+    protected :filter_query_options
   end
 end

data/lib/rdf/allegro_graph/catalog.rb

@@ -0,0 +1,89 @@
+require 'pathname'
+
+module RDF::AllegroGraph
+  # An AllegroGraph catalog containing several repositories.
+  class Catalog
+    attr_reader :catalog
+
+    # Create a new Catalog object.
+    #
+    # @param [String] url The Sesame URL of the AllegroGraph server.
+    def initialize(url_or_hash, options={})
+      url_or_hash = Parser::parse_uri(url_or_hash) if url_or_hash.is_a?(String)
+      server = url_or_hash[:server].server
+      id = url_or_hash[:id]
+
+      @name = id
+      @catalog = AllegroGraph::Catalog.new(server, id)
+      @catalog.create_if_missing! if options[:create]
+    end
+
+    # Delete this catalog if it exists.
+    #
+    # @return [void]
+    def delete!
+      @catalog.delete!
+    end
+
+    # Return a hash table of all repositories in this catalog.
+    #
+    # @return [Hash<String,Repository>]
+    def repositories
+      result = {}
+      repositories = @catalog.server.request_json(:get, self.path(:repositories),
+        :expected_status_code => 200).each do |repo|
+        result[repo['id']] = Repository.new(:catalog => self, :id => repo['id'])
+      end
+      result
+    end
+
+    # Return true if the specified repository exists in the catalog.
+    #
+    # @param [String] id The name of the repository.
+    # @return [Boolean]
+    def has_repository?(id)
+      repositories.has_key?(id)
+    end
+
+    # Iterate over all repositories.
+    #
+    # @yield repository
+    # @yieldparam [Repository] repository
+    # @yieldreturn [void]
+    # @return [void]
+    def each_repository(&block)
+      repositories.values.each(&block)
+    end
+    alias_method :each, :each_repository
+
+    # Look up a specific repository by name, and optionally create it.
+    #
+    # @param [String] id The name of the repository.
+    # @param [Hash] options
+    # @option options [Boolean] :create
+    #   If true, and the repository does not exist, create it.
+    # @return [Repository,nil]
+    #   The repository, if it exists or was created, or nil otherwise.
+    def repository(id, options={})
+      result = repositories[id]
+      if result.nil? && options[:create]
+        result = Repository.new({:catalog => self, :id => id}, :create => true)
+      end
+      result
+    end
+    alias_method :[], :repository
+
+    protected
+
+    # Generate a path to a resource on the catalog.
+    def path(relativate_path=nil)
+      if relativate_path
+        "/catalogs/#{@name}/#{relativate_path}"
+      else
+        "/catalogs/#{@name}"
+      end
+    end
+
+  end
+
+end

data/lib/rdf/allegro_graph/parser.rb

@@ -0,0 +1,35 @@
+module RDF::AllegroGraph
+  # A module containg the URL parser of AllegroGraph objects such as :
+  # - servers
+  # - catalogs
+  # - repositories
+  module Parser
+
+    # Parse a full URI and extract the server/catalog and the repository ID.
+    #
+    # The parsing uses the default AllegroGraph URI schema :
+    # http://server:port/catalogs/catalog_name/repositories/repository_name
+    # This function can be overwritten to parse a custom URI schema system.
+    #
+    # @param [String] uri the uri the parse
+    # @return [Array]
+    def parse_uri(url)
+      hash = {}
+      url = URI.parse(url)
+      path = Pathname.new(url.path)
+
+      hash[:id] = path.basename.to_s
+      path = path.parent.parent
+      url.path = path.to_s
+
+      if path.parent.basename.to_s == 'catalogs'
+        hash[:catalog] = Catalog.new(url.to_s)
+      else
+        hash[:server] = Server.new(url.to_s)
+      end
+
+      hash
+    end
+    module_function :parse_uri
+  end
+end

data/lib/rdf/allegro_graph/query.rb

@@ -102,10 +102,10 @@ module RDF::AllegroGraph
       functors = []
       patterns.each do |p|
         # Extract any new variables we see in the query.
-        p.variables.each {|_,v| variables << v unless variables.include?(v) }
+        variables.concat(p.variables.values)
         functors << convert_to_functor(p).to_prolog(repository)
       end
-      "(select (#{variables.join(" ")})\n  #{functors.join("\n  ")})"
+      "(select (#{variables.uniq.join(" ")})\n  #{functors.join("\n  ")})"
     end
 
     protected

data/lib/rdf/allegro_graph/repository.rb

@@ -6,11 +6,13 @@ module RDF::AllegroGraph
   # Note that this class does not interoperate well with the Unix `fork`
   # command if you're using blank nodes.  See README.md for details.
   class Repository < AbstractRepository
+
     # Create a new AllegroGraph repository adapter.
     #
     # @overload initialize(options)
     #   @param [Hash{Symbol => Object}] options
     #   @option options [Server]  :server  The server hosting the repository.
+    #   @option options [Catalog] :catalog  The catalog hosting the repository.
     #   @option options [String]  :id      The name of the repository.
     #   @option options [Boolean] :create  Create the repository if necessary?
     #
@@ -18,37 +20,37 @@ module RDF::AllegroGraph
     #   @param [String] url                The URL of the repository.
     #   @param [Hash{Symbol => Object}] options
     #   @option options [Boolean] :create  Create the repository if necessary?
-    def initialize(url_or_options, options={})
-      case url_or_options
-      when String
-        # TODO: Clean this up.
-        url = URI.parse(url_or_options)
-        path = Pathname.new(url.path)
-        url.path = path.parent.parent.to_s
-        server = Server.new(url.to_s).server
-        id = path.basename
+    def initialize(url_or_hash, options={})
+      url_or_hash = Parser::parse_uri(url_or_hash) if url_or_hash.is_a?(String)
+
+      if url_or_hash.has_key?(:catalog)
+        server_or_catalog = url_or_hash[:catalog].catalog
+      elsif url_or_hash.has_key?(:server)
+        server_or_catalog = url_or_hash[:server].server
       else
-        server = url_or_options[:server].server
-        id = url_or_options[:id]
-        options = url_or_options
+        raise ArgumentError.new('Server or Catalog required')
       end
-      super(::AllegroGraph::Repository.new(server, id))
-      @repo.create_if_missing! if options[:create]
+
+      id = url_or_hash[:id]
+      opt_create = options.delete(:create)
+      super(::AllegroGraph::Repository.new(server_or_catalog, id), options)
+      @resource.create_if_missing! if opt_create
     end
 
     # Delete this repository if it exists.
     #
     # @return [void]
     def delete!
-      @repo.delete!
+      @resource.delete!
     end
 
-    # Create a new, persistent AllegroGraph session.  If called without a
-    # block, simply returns the new session (and expects the caller to
-    # close it).  If called with a block, automatically commits or rolls
-    # back the transaction, and closes the session.
+    # Create a new, persistent AllegroGraph session on a given repository.
+    # If called without a block, simply returns the new session (and expects
+    # the caller to close it).  If called with a block, automatically commits
+    # or rolls back the transaction, and closes the session.
     #
     # @overload session
+    #   @param [Repository] the repository on which to open the session
     #   @return [Session] The newly created session.  It's a good idea to
     #     close this manually; doing so frees up server resources.
     #   @see Session#commit
@@ -56,13 +58,14 @@ module RDF::AllegroGraph
     #   @see Session#close
     #
     # @overload session
+    #   @param [Repository] the repository on which to open the session
     #   @yield session
     #   @yieldparam [Session] session
     #   @yieldreturn [Object]
     #   @return [Object] The result returned from the block.
-    def session
+    def self.session(repository, options={})
       if block_given?
-        session = Session.new(@repo)
+        session = Session.new(repository, options)
         begin
           result = yield session
           session.commit
@@ -74,8 +77,29 @@ module RDF::AllegroGraph
           session.close
         end
       else
-        Session.new(@repo)
+        Session.new(repository, options)
       end
     end
+
+    # Create a new, persistent AllegroGraph session.  If called without a
+    # block, simply returns the new session (and expects the caller to
+    # close it).  If called with a block, automatically commits or rolls
+    # back the transaction, and closes the session.
+    #
+    # @overload session
+    #   @return [Session] The newly created session.  It's a good idea to
+    #     close this manually; doing so frees up server resources.
+    #   @see Session#commit
+    #   @see Session#rollback
+    #   @see Session#close
+    #
+    # @overload session
+    #   @yield session
+    #   @yieldparam [Session] session
+    #   @yieldreturn [Object]
+    #   @return [Object] The result returned from the block.
+    def session(options={}, &block)
+      self.class.session self, &block
+    end
   end
 end

data/lib/rdf/allegro_graph/server.rb

@@ -7,7 +7,7 @@ module RDF::AllegroGraph
   #
   # @see RDF::Sesame::Server
   class Server
-    attr_reader :server # @private
+    attr_reader :server
 
     # Create a new Server object.
     #
@@ -15,11 +15,11 @@ module RDF::AllegroGraph
     def initialize(url="http://localhost:10035")
       parsed = URI.parse(url)
       options = {
-        :host => parsed.host, :post => parsed.port,
+        :host => parsed.host, :port => parsed.port,
         :username => parsed.user, :password => parsed.password
       }
       @server = AllegroGraph::Server.new(options)
-      
+
       unless parsed.path.nil? || parsed.path.empty? || parsed.path == "/"
         err = "AllegroGraph URLs with paths not supported: #{url}"
         raise ArgumentError.new(err)
@@ -77,12 +77,128 @@ module RDF::AllegroGraph
     def repository(id, options={})
       result = repositories[id]
       if result.nil? && options[:create]
-        result = Repository.new(:server => self, :id => id, :create => true)
+        result = Repository.new({:server => self, :id => id}, :create => true)
       end
       result
     end
     alias_method :[], :repository
 
+    # Return a hash table of all catalogs on this server.
+    #
+    # @return [Hash<String,Catalog>]
+    def catalogs
+      result = {}
+      @server.request_json(:get, path(:catalogs),
+                           :expected_status_code => 200).each do |catalog|
+        result[catalog['id']] = Catalog.new(:server => self, :id => catalog['id'])
+      end
+      result
+    end
+
+    # Return true if the specified catalog exists on the server.
+    #
+    # @param [String] id The name of the catalog.
+    # @return [Boolean]
+    def has_catalog?(id)
+      catalogs.has_key?(id)
+    end
+
+    # Iterate over all catalogs.
+    #
+    # @yield catalog
+    # @yieldparam [Catalog] catalog
+    # @yieldreturn [void]
+    # @return [void]
+    def each_catalog(&block)
+      catalogs.values.each(&block)
+    end
+
+    # Look up a specific catalog by name, and optionally create it.
+    #
+    # @param [String] id The name of the catalog.
+    # @param [Hash] options
+    # @option options [Boolean] :create
+    #   If true, and the catalog does not exist, create it.
+    # @return [Repository,nil]
+    #   The catalog, if it exists or was created, or nil otherwise.
+    def catalog(id, options={})
+      result = catalogs[id]
+      if result.nil? && options[:create]
+        result = Catalog.new({:server => self, :id => id}, :create => true)
+      end
+      result
+    end
+
+    # An initialization-file can be specified for a server, which is a collection of Common Lisp code
+    # that is executed in every shared back-end as it is created. This retrieves that file.
+    # If no initfile has been defined, nil is returned.
+    #
+    # @return [String] the content of the file
+    def initfile
+      if (content = @server.request_http(:get, '/initfile')) == "No initfile defined."
+        content = nil
+      end
+      content
+    end
+
+    # A set of scripts, which are Common Lisp programs, can be stored in a server.
+    # When a user creates a session, they can choose to load one or more of these scripts into the session.
+    # This service returns a list of names, representing the scripts that are currently present.
+    #
+    # @param [String] path a filter on the subfolder to look scripts into
+    # @return [Array] the scripts list
+    def scripts(path=nil)
+      full_path = "/scripts"
+      full_path = "#{full_path}/#{path}" if path
+
+      @server.request_json(:get, full_path,
+                           :expected_status_code => 200)
+    end
+
+    # Get a script content
+    #
+    # @param [String] path the name of the script
+    # @return [String] the script
+    def script(path)
+      full_path = "/scripts/#{path}"
+
+      begin
+        @server.request_http(:get, full_path,
+                           :expected_status_code => 200)
+      rescue Transport::UnexpectedStatusCodeError => error
+        if /No script '[^']+' found./ =~ error.message
+          nil
+        else
+          raise error
+        end
+      end
+    end
+
+    alias_method :get_script, :script
+
+    # Replace the named script with a new one (or creates a new script).
+    # Scripts whose name ends in .fasl are assumed to be compiled Lisp code (you are responsible for ensuring that it is compatible with the server),
+    # anything else is assumed to be raw Common Lisp code, which the server will compile.
+    #
+    # @param [String] path the name of the script
+    # @param [String] content the script content
+    # @return [void]
+    def save_script(path, content)
+      full_path = "/scripts/#{path}"
+
+      @server.request_http(:put, full_path, :body => content, :expected_status_code => 204)
+    end
+
+    # Delete the script with the given path
+    #
+    # @param [String] path the name of the script
+    # @return [void]
+    def remove_script(path)
+      full_path = "/scripts/#{path}"
+
+      @server.request_http(:delete, full_path, :expected_status_code => 204)
+    end
+
     protected
 
     # Generate a path to a resource on the server.

data/lib/rdf/allegro_graph/session.rb

@@ -9,13 +9,35 @@ module RDF::AllegroGraph
   #
   # @see Repository#session
   class Session < AbstractRepository
-    # Create a new session.  This parameter takes an
-    # ::AllegroGraph::Repository object as an argument, so we've not going
-    # to document it publically.
+    # Create a new session.  This function takes a ::AllegroGraph::Repository or
+    # a ::AllegroGraph::Server object as first argument, and options as second
+    # parameter, which is optional.
     #
     # @private
-    def initialize(agraph_repo)
-      super(::AllegroGraph::Session.create(agraph_repo))
+    def initialize(repository_or_server, options={})
+      # Use of the AllegroGraph wrapped entity
+      agraph_repository_or_server = case repository_or_server
+      when Repository
+        repository_or_server.resource
+      when Server
+        repository_or_server.server
+      else
+        Server.new(repository_or_server.to_s).server
+      end
+      opt_session = options.delete(:session) || {}
+      opt_writable_mirror = options.delete(:writable_mirror)
+
+      if opt_writable_mirror
+        options[:writable_repository] =
+        case opt_writable_mirror
+        when Repository
+          opt_writable_mirror.resource
+         else
+          Repository.new(opt_writable_mirror).resource
+        end
+      end
+
+      super(::AllegroGraph::Session.create(agraph_repository_or_server, opt_session), options)
       @last_unique_id = 0
     end
 
@@ -26,7 +48,7 @@ module RDF::AllegroGraph
     # @see #commit
     # @see #rollback
     def close
-      @repo.request_http(:post, path('session/close'),
+      @resource.request_http(:post, path('session/close'),
                          :expected_status_code => 204)
     end
 
@@ -35,7 +57,7 @@ module RDF::AllegroGraph
     # @return [void]
     # @see #rollback
     def commit
-      @repo.commit
+      @resource.commit
     end
 
     # Roll back the changes made since the last commit.
@@ -43,7 +65,28 @@ module RDF::AllegroGraph
     # @return [void]
     # @see #commit
     def rollback
-      @repo.rollback
+      @resource.rollback
+    end
+
+    # Let the session know you still want to keep it alive. (Any other request to the session will have the same effect.)
+    #
+    # @return [Boolean] returns true if the operation was sucessful
+    def ping
+      @resource.request_http(:get, path('session/ping'),
+                         :expected_status_code => 200) == 'pong'
+    end
+
+    # Returns true if the session is still alive.
+    # Basically it pings the session. If the TCP connection is refused,
+    # it means that the session has been closed.
+    #
+    # @return [Boolean] returns the status of the session
+    def still_alive?
+      begin
+        ping
+      rescue Errno::ECONNREFUSED
+        false
+      end
     end
 
     # Define an SNA generator.
@@ -63,7 +106,7 @@ module RDF::AllegroGraph
     def generator(options)
       id = unique_id
       generator = SnaGenerator.new(self, options)
-      @repo.request_json(:put, path("snaGenerators/#{id}"),
+      @resource.request_json(:put, path("snaGenerators/#{id}"),
                          :parameters => generator.to_params,
                          :expected_status_code => 204)
       Query::PrologLiteral.new(id.to_sym)

metadata

@@ -1,227 +1,174 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rdf-agraph
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: '0.4'
 platform: ruby
-authors: 
+authors:
 - Eric Kidd
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-19 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdf
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
-        version: 0.3.1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: agraph
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 1
-        - 4
-        version: 0.1.4
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: agraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 5
-        - 1
-        version: 0.5.1
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdf-spec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
-        version: 0.3.1
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rdf-spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: BlueCloth
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
-        version: 1.0.1
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 9
-        - 9
-        version: 0.9.9
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+  type: :development
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: An AllegroGraph adapter for use with RDF.rb.
 email: rdf-agraph@kiddsoftware.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - AUTHORS
 - README.md
 - UNLICENSE
 - VERSION
-- lib/rdf-agraph.rb
 - lib/rdf/allegro_graph.rb
-- lib/rdf/allegro_graph/server.rb
-- lib/rdf/allegro_graph/functors.rb
+- lib/rdf/allegro_graph/parser.rb
 - lib/rdf/allegro_graph/functors/sna_functors.rb
-- lib/rdf/allegro_graph/repository.rb
+- lib/rdf/allegro_graph/server.rb
 - lib/rdf/allegro_graph/query.rb
+- lib/rdf/allegro_graph/sna_generator.rb
+- lib/rdf/allegro_graph/catalog.rb
 - lib/rdf/allegro_graph/abstract_repository.rb
 - lib/rdf/allegro_graph/query/functor_expression.rb
 - lib/rdf/allegro_graph/query/prolog_literal.rb
-- lib/rdf/allegro_graph/sna_generator.rb
+- lib/rdf/allegro_graph/repository.rb
 - lib/rdf/allegro_graph/session.rb
-has_rdoc: false
+- lib/rdf/allegro_graph/functors.rb
+- lib/rdf-agraph.rb
 homepage: http://rdf-agraph.rubyforge.org/
-licenses: 
+licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rdf-agraph
-rubygems_version: 1.4.1
+rubygems_version: 2.0.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: AllegroGraph adapter for RDF.rb
 test_files: []
-
+has_rdoc: false