orientdb4r 0.2.3 → 0.2.4

data/lib/orientdb4r/client.rb

@@ -3,7 +3,9 @@ module Orientdb4r
   class Client
     include Utils
 
+    # Server version used if no concrete version identified.
     DEFAULT_SERVER_VERSION = '1.0.0--'
+
     SERVER_VERSION_PATTERN = /^\d+\.\d+\.\d+/
 
     attr_reader :server_version

data/lib/orientdb4r/rest/client.rb

@@ -3,10 +3,13 @@ module Orientdb4r
   class RestClient < Client
     include Aop2
 
+    # Name of cookie that represents a session.
+    SESSION_COOKIE_NAME = 'OSESSIONID'
+
     before [:create_database, :get_class, :query, :command], :assert_connected
     around [:query, :command], :time_around
 
-    attr_reader :host, :port, :ssl, :user, :password
+    attr_reader :host, :port, :ssl, :user, :password, :database, :session_id
 
 
     def initialize(options) #:nodoc:
@@ -26,12 +29,17 @@ module Orientdb4r
       @user = options[:user]
       @password = options[:password]
 
-      @resource = ::RestClient::Resource.new(url, :user => user, :password => password)
 
       begin
-        response = @resource["connect/#{@database}"].get
+        response = ::RestClient::Request.new(:method => :get, :url => "#{url}/connect/#{@database}", \
+            :user => user, :password => password).execute
+        @session_id = response.cookies[SESSION_COOKIE_NAME]
         rslt = process_response(response, :mode => :strict)
 
+        # resource used for all request
+        @resource = ::RestClient::Resource.new(url, \
+            :user => user, :password => password, :cookies => { SESSION_COOKIE_NAME => session_id})
+
         decorate_classes_with_model(rslt['classes'])
 
         # try to read server version
@@ -41,11 +49,18 @@ module Orientdb4r
           @server_version = DEFAULT_SERVER_VERSION
         end
         raise OrientdbError, "bad version format, version=#{server_version}" unless server_version =~ SERVER_VERSION_PATTERN
-        Orientdb4r::logger.debug "successfully connected to server, version=#{server_version}"
+        Orientdb4r::logger.debug "successfully connected to server, version=#{server_version}, session=#{session_id}"
 
         @connected = true
+        @session_id = response.cookies[SESSION_COOKIE_NAME]
       rescue
         @connected = false
+        @session_id = nil
+        @server_version = nil
+        @user = nil
+        @password = nil
+        @database = nil
+        @resource = nil
         raise ConnectionError
       end
       rslt
@@ -63,8 +78,12 @@ module Orientdb4r
         # It always returns 401 because some browsers intercept this and avoid to reuse the same session again.
       ensure
         @connected = false
+        @server_version = nil
+        @session_id = nil
         @user = nil
         @password = nil
+        @database = nil
+        @resource = nil
         Orientdb4r::logger.debug 'disconnected from server'
       end
     end
@@ -144,7 +163,7 @@ module Orientdb4r
         response = @resource["command/#{@database}/sql/#{CGI::escape(sql)}"].post ''
         rslt = process_response(response)
         rslt
-#puts "RESP #{response.code}"
+puts "RESP #{response.body}"
       rescue
         raise OrientdbError
       end
@@ -152,10 +171,11 @@ module Orientdb4r
 
 
     def server(options={}) #:nodoc:
+      # 'server' does NOT use the RestClient Resource to construct the HTTP request
+
       options_pattern = { :user => :optional, :password => :optional }
       verify_options(options, options_pattern)
 
-
       u = options.include?(:user) ? options[:user] : user
       p = options.include?(:password) ? options[:password] : password
       resource = ::RestClient::Resource.new(url, :user => u, :password => p)
@@ -274,7 +294,6 @@ module Orientdb4r
 
       def decorate_classes_with_model(classes)
         classes.each do |clazz|
-#puts "OOO #{classes}"
           clazz.extend Orientdb4r::HashExtension
           clazz.extend Orientdb4r::OClass
             unless clazz['properties'].nil? # there can be a class without properties

data/lib/orientdb4r/version.rb

@@ -2,9 +2,11 @@ module Orientdb4r
 
   # Version history.
   VERSION_HISTORY = [
+    # v-- https://groups.google.com/forum/?fromgroups#!topic/orient-database/5MAMCvFavTc
+    ['0.2.4', '2012-06-26', "Added session management"],
     ['0.2.3', '2012-06-24', "Documents received by a query are kind of Orientdb4r::DocumentMetadata"],
-    # https://groups.google.com/forum/?fromgroups#!topic/orient-database/jK4EZd068AE
-    # https://groups.google.com/forum/?fromgroups#!topic/orient-database/nJOAsgwSnKI
+    # v-- https://groups.google.com/forum/?fromgroups#!topic/orient-database/jK4EZd068AE
+    # v-- https://groups.google.com/forum/?fromgroups#!topic/orient-database/nJOAsgwSnKI
     ['0.2.2', '2012-06-23', "Added support for server version detection [r5913]"],
     ['0.2.1', '2012-06-19', "Fixed linked property definition"],
     ['0.2.0', '2012-06-12', "Introduces document's CRUD operations"],

data/test/test_database.rb

@@ -22,6 +22,14 @@ class TestDatabase < Test::Unit::TestCase
     assert_instance_of Hash, rslt
     assert rslt.size > 0
     assert rslt.include? 'classes'
+
+    assert_equal 'localhost', @client.host
+    assert_equal 2480, @client.port
+    assert_equal false, @client.ssl
+    assert_equal 'admin', @client.user
+    assert_equal 'admin', @client.password
+    assert_equal 'temp', @client.database
+    assert_not_nil @client.session_id
     assert_not_nil @client.server_version
 
     # connection refused
@@ -50,6 +58,15 @@ class TestDatabase < Test::Unit::TestCase
     assert !@client.connected?
     # unable to query after disconnect
     assert_raise Orientdb4r::ConnectionError do @client.query 'SELECT FROM OUser'; end
+
+    assert_equal 'localhost', @client.host
+    assert_equal 2480, @client.port
+    assert_equal false, @client.ssl
+    assert_nil @client.user
+    assert_nil @client.password
+    assert_nil @client.database
+    assert_nil @client.session_id
+    assert_nil @client.server_version
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orientdb4r
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-24 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client