rdf-sesame 0.3.0 → 1.1.0

data/lib/rdf/sesame/server.rb

@@ -6,9 +6,14 @@ module RDF::Sesame
   # one or more readable and/or writable RDF {Repository repositories}.
   #
   # @example Connecting to a Sesame server
-  #   url    = RDF::URI("http://localhost:8080/openrdf-sesame")
+  #   url    = URI.parse("http://localhost:8080/openrdf-sesame")
   #   server = RDF::Sesame::Server.new(url)
   #
+  # @example Connecting to a Sesame server using Basic Auth & local proxy
+  #   server = RDF::Sesame::Server.new("http://localhost:8080/openrdf-sesame", {:user=> 'username', :pass => 'password',
+  #       :proxy_host => 'localhost', :proxy_port => 8888})
+  #   repo = server.repositories['repositoryname']
+  #
   # @example Retrieving the server's protocol version
   #   server.protocol                 #=> 4
   #
@@ -37,15 +42,21 @@ module RDF::Sesame
   class Server
     include Enumerable
 
-    ACCEPT_JSON = {'Accept' => 'application/sparql-results+json'}
-    ACCEPT_XML  = {'Accept' => 'application/sparql-results+xml'}
-    ACCEPT_BOOL = {'Accept' => 'text/boolean'}
-
-    # @return [RDF::URI]
-    attr_reader :url
-
-    # @return [Hash{Symbol => Object}]
-    attr_reader :options
+    ACCEPT_JSON = {'Accept' => 'application/sparql-results+json'}.freeze
+    ACCEPT_NTRIPLES = {'Accept' => 'text/plain'}.freeze
+    ACCEPT_XML  = {'Accept' => 'application/sparql-results+xml'}.freeze
+    ACCEPT_BOOL = {'Accept' => 'text/boolean'}.freeze
+    ACCEPT_XML_PURE =  {'Accept' => 'application/rdf+xml' }.freeze
+    ACCEPT_TURTLE =  {'Accept' => 'application/x-turtle'}.freeze
+    ACCEPT_N3 =  {'Accept' => 'text/rdf+n3'}.freeze
+    ACCEPT_TRIX =  {'Accept' => 'application/trix'}.freeze
+    ACCEPT_TRIG =  {'Accept' => 'application/x-trig'}.freeze
+    ACCEPT_BINARY =  {'Accept' => 'application/x-binary-rdf'}.freeze
+    ACCEPT_BINARY_TABLE = {'Accept' => 'application/x-binary-rdf-results-table'}.freeze
+
+    RESULT_BOOL = 'text/boolean'.freeze
+    RESULT_JSON = 'application/sparql-results+json'.freeze
+    RESULT_XML = 'application/sparql-results+xml'.freeze
 
     # @return [Connection]
     attr_reader :connection
@@ -53,21 +64,13 @@ module RDF::Sesame
     ##
     # Initializes this `Server` instance.
     #
-    # @param  [RDF::URI]               url
+    # @param  [URI, #to_s]               url
     # @param  [Hash{Symbol => Object}] options
     # @option options [Connection] :connection (nil)
     # @yield  [connection]
     # @yieldparam [Server]
     def initialize(url, options = {}, &block)
-      require 'addressable/uri' unless defined?(Addressable)
-      @url = case url
-        when Addressable::URI then url
-        else Addressable::URI.parse(url.to_s)
-      end
-      @url = RDF::URI.new(@url)
-
-      @connection = options.delete(:connection) || Connection.new(@url)
-      @options    = options
+      @connection = options.delete(:connection) || Connection.new(url, options)
 
       if block_given?
         case block.arity
@@ -81,15 +84,15 @@ module RDF::Sesame
     # Returns the URL for the given server-relative `path`.
     #
     # @example Getting a Sesame server's URL
-    #   server.url            #=> RDF::URI("http://localhost:8080/openrdf-sesame")
+    #   server.url            #=> "http://localhost:8080/openrdf-sesame"
     #
     # @example Getting a Sesame server's protocol URL
-    #   server.url(:protocol) #=> RDF::URI("http://localhost:8080/openrdf-sesame/protocol")
+    #   server.url(:protocol) #=> "http://localhost:8080/openrdf-sesame/protocol"
     #
     # @param  [String, #to_s] path
-    # @return [RDF::URI]
+    # @return [String]
     def url(path = nil)
-      path ? RDF::URI.new("#{@url}/#{path}") : @url # FIXME
+      self.connection.url(path)
     end
 
     alias_method :uri, :url
@@ -97,9 +100,9 @@ module RDF::Sesame
     ##
     # Returns the URL of this server.
     #
-    # @return [RDF::URI]
+    # @return [URI]
     def to_uri
-      url
+      URI.parse(url)
     end
 
     ##
@@ -107,7 +110,7 @@ module RDF::Sesame
     #
     # @return [String]
     def to_s
-      url.to_s
+      url
     end
 
     ##
@@ -127,14 +130,9 @@ module RDF::Sesame
     # @return [Integer]
     # @see    http://www.openrdf.org/doc/sesame2/system/ch08.html#d0e180
     def protocol
-      get(url(:protocol)) do |response|
-        case response
-          when Net::HTTPSuccess
-            version = response.body
-            version.to_i rescue 0
-          else 0
-        end
-      end
+      response = get(:protocol)
+      version = response.body
+      version.to_i rescue 0
     end
 
     alias_method :protocol_version, :protocol
@@ -185,42 +183,69 @@ module RDF::Sesame
     def repositories
       require 'json' unless defined?(::JSON)
 
-      get(url(:repositories), ACCEPT_JSON) do |response|
-        case response
-          when Net::HTTPSuccess
-            json = ::JSON.parse(response.body)
-            json['results']['bindings'].inject({}) do |repositories, binding|
-              repository = Repository.new({
-                :server   => self,
-                :uri      => (uri   = RDF::URI.new(binding['uri']['value'])),
-                :id       => (id    = binding['id']['value']),
-                :title    => (title = binding['title']['value']),
-                :readable => binding['readable']['value'].to_s == 'true',
-                :writable => binding['writable']['value'].to_s == 'true',
-              })
-              repositories.merge({id => repository})
-            end
-          else [] # FIXME
-        end
+      response = get(:repositories, ACCEPT_JSON)
+
+      json = ::JSON.parse(response.body)
+      json['results']['bindings'].inject({}) do |repositories, binding|
+        repository_id = binding['id']['value']
+        repository = Repository.new(:server   => self,
+                                    :uri      => RDF::URI.new(binding['uri']['value']),
+                                    :id       => repository_id,
+                                    :title    => binding['title']['value'],
+                                    :readable => binding['readable']['value'].to_s == 'true',
+                                    :writable => binding['writable']['value'].to_s == 'true')
+        repositories.merge!(repository_id => repository)
       end
     end
 
-    def get(path, headers = {}, &block) # @private
+    def get(path, headers = {})
       self.connection.open do
-        self.connection.get(path, headers, &block)
+        process_response self.connection.get(path, headers)
       end
     end
 
-    def post(path, data, headers = {}, &block) # @private
+    def post(path, data, headers = {})
       self.connection.open do
-        self.connection.post(path, data, headers, &block)
+        process_response self.connection.post(path, data, headers)
       end
     end
 
-    def delete(path, headers = {}, &block) # @private
+    def put(path, data, headers = {})
       self.connection.open do
-        self.connection.delete(path, headers, &block)
+        process_response self.connection.put(path, data, headers)
       end
     end
+
+    def delete(path, headers = {})
+      self.connection.open do
+        process_response self.connection.delete(path, headers)
+      end
+    end
+
+    ##
+    # Executes a SPARQL query and returns the Net::HTTP::Response of the result.
+    #
+    # @param [String, #to_s] url
+    # @param [Hash{Symbol => Object}] options
+    # @option options [String] :content_type
+    # @return [String]
+    def process_response(response, options = {})
+      @headers['Accept'] = options[:content_type] if options[:content_type]
+      if response.is_a?(Net::HTTPSuccess)
+        response
+      else
+        case response
+        when Net::HTTPBadRequest # 400 Bad Request
+          raise MalformedQuery.new(response.body)
+        when Net::HTTPClientError # 4xx
+          raise ClientError.new(response.body)
+        when Net::HTTPServerError # 5xx
+          raise ServerError.new(response.body)
+        else
+          raise ServerError.new(response.body)
+        end
+      end
+    end
+
   end # class Server
 end # module RDF::Sesame

data/lib/rdf/sesame/version.rb

@@ -1,7 +1,7 @@
 module RDF; module Sesame
   module VERSION
-    MAJOR = 0
-    MINOR = 3
+    MAJOR = 1
+    MINOR = 1
     TINY  = 0
     EXTRA = nil
 

metadata

@@ -1,142 +1,140 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rdf-sesame
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Arto Bendiken
+- Slava Kravchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-27 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-09-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json_pure
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 2
-        version: 1.4.2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
   name: rdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rdf-spec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rdf-spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: RDF.rb plugin providing a Sesame 2.0 storage adapter.
 email: public-rdf-ruby@w3.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - AUTHORS
 - CREDITS
 - README
 - UNLICENSE
 - VERSION
+- lib/rdf/sesame.rb
 - lib/rdf/sesame/connection.rb
+- lib/rdf/sesame/exceptions.rb
 - lib/rdf/sesame/repository.rb
 - lib/rdf/sesame/server.rb
 - lib/rdf/sesame/version.rb
-- lib/rdf/sesame.rb
-has_rdoc: false
 homepage: http://rdf.rubyforge.org/sesame/
-licenses: 
+licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 1
+    - !ruby/object:Gem::Version
       version: 1.8.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rdf
-rubygems_version: 1.3.6
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Sesame 2.0 adapter for RDF.rb.
 test_files: []
-
+has_rdoc: false