orientdb4r 0.2.9 → 0.2.10

data/changelog.txt

@@ -3,6 +3,8 @@
 - 'rest-client' replaced by 'excon' for HTTP communication with Keep-Alive
 - introduced support for distributed server
 
+0.2.10 /07/07/21
+- experimental support for Excon HTTP library with Keep-Alive connection
 
 0.2.9 /07/07/18
 - introduced class Rid

data/lib/orientdb4r/node.rb

@@ -18,12 +18,6 @@ module Orientdb4r
     end
 
 
-    ###
-    # Identifies technology backgound of this node implementation.
-    def identification
-      raise NotImplementedError, 'this should be overridden by subclass'
-    end
-
     ###
     # Cleans up resources used by the node.
     def cleanup

data/lib/orientdb4r/rest/client.rb

@@ -9,17 +9,35 @@ module Orientdb4r
     before [:create_document, :get_document, :update_document, :delete_document], :assert_connected
     around [:query, :command], :time_around
 
-    attr_reader :user, :password, :database
+    attr_reader :user, :password, :database, :http_lib
 
 
     def initialize(options) #:nodoc:
       super()
-      options_pattern = { :host => 'localhost', :port => 2480, :ssl => false }
+      options_pattern = { :host => 'localhost', :port => 2480, :ssl => false,
+                          :nodes => :optional,
+                          :connection_library => :restclient}
       verify_and_sanitize_options(options, options_pattern)
 
-      raise ArgumentError, 'no node type defined in context' unless Orientdb4r::context.include? :node_type
-      @nodes << Orientdb4r::context[:node_type].new(options[:host], options[:port], options[:ssl])
-      Orientdb4r::logger.debug "client with communication driver: #{a_node.identification}"
+      # fake nodes for single server
+      unless options[:nodes].nil?
+        options[:nodes] = [{:host => options[:host], :port => options[:port], :ssl => options[:ssl]}]
+      end
+      raise ArgumentError, 'nodes has to be arrray' unless options[:nodes].is_a? Array
+
+      node_clazz = case options[:connection_library]
+        when :restclient then Orientdb4r::RestClientNode
+        when :excon then Orientdb4r::ExconNode
+        else raise ArgumentError, "unknown connection library: #{options[:connection_library]}"
+      end
+      @http_lib = options[:connection_library]
+
+      options[:nodes].each do |node_options|
+        @nodes << node_clazz.new(options[:host], options[:port], options[:ssl])
+        verify_and_sanitize_options(node_options, options_pattern)
+      end
+
+      Orientdb4r::logger.info "client initialized, #{@nodes.size} node(s) with connection library = #{options[:connection_library]}"
     end
 
 
@@ -303,8 +321,8 @@ module Orientdb4r
           raise OrientdbError, "unexpected return code, code=#{response.code}, body=#{compose_error_message(response)}"
         end
 
-        content_type = response.headers[:content_type] if Orientdb4r::context[:node_type] == RestClientNode
-        content_type = response.headers['Content-Type'] if Orientdb4r::context[:node_type] == ExconNode
+        content_type = response.headers[:content_type] if http_lib == :restclient
+        content_type = response.headers['Content-Type'] if http_lib == :excon
         content_type ||= 'text/plain'
 
         rslt = case

data/lib/orientdb4r/rest/excon_node.rb

@@ -7,12 +7,6 @@ module Orientdb4r
   # accessible view REST API and 'excon' library on the client side.
   class ExconNode < RestNode
 
-
-    def identification #:nodoc:
-      'excon'
-    end
-
-
     def oo_request(options) #:nodoc:
       address = "#{url}/#{options[:uri]}"
       headers = {}

data/lib/orientdb4r/rest/restclient_node.rb

@@ -7,12 +7,6 @@ module Orientdb4r
   # accessible view REST API and 'rest-client' library on the client side.
   class RestClientNode < RestNode
 
-
-    def identification #:nodoc:
-      'rest-client'
-    end
-
-
     def oo_request(options) #:nodoc:
       begin
         options[:url] = "#{url}/#{options[:uri]}"

data/lib/orientdb4r/rid.rb

@@ -23,15 +23,19 @@ module Orientdb4r
       self.document_id = ids[1].to_i
     end
 
+    ###
+    # Setter fo cluster ID.
     def cluster_id=(cid)
       @cluster_id = cid.to_i
     end
 
+    ###
+    # Setter fo document ID.
     def document_id=(did)
       @document_id = did.to_i
     end
 
-    def to_s
+    def to_s #:nodoc:
       "##{cluster_id}:#{document_id}"
     end
 

data/lib/orientdb4r/version.rb

@@ -2,22 +2,23 @@ module Orientdb4r
 
   # Version history.
   VERSION_HISTORY = [
-    ['0.2.9', '2012-07-18', "Added feature Client#delete_database, New class Rid"],
-    ['0.2.8', '2012-07-16', "New exception handling, added feature Client#create_class(:properties)"],
-    ['0.2.7', '2012-07-07', "Added method Client#class_exists?"],
-    ['0.2.6', '2012-07-03', "BF #8, BF #6"],
-    ['0.2.5', '2012-07-01', "Added 'get_database' into database CRUD"],
+    ['0.2.10',  '2012-07-21', "Experimental support for Excon HTTP library with Keep-Alive connection"],
+    ['0.2.9',   '2012-07-18', "Added feature Client#delete_database, New class Rid"],
+    ['0.2.8',   '2012-07-16', "New exception handling, added feature Client#create_class(:properties)"],
+    ['0.2.7',   '2012-07-07', "Added method Client#class_exists?"],
+    ['0.2.6',   '2012-07-03', "BF #8, BF #6"],
+    ['0.2.5',   '2012-07-01', "Added 'get_database' into database CRUD"],
     # 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"],
+    ['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"],
     # 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"],
-    ['0.1.2', '2012-06-10', 'Introduces new OClass module'],
-    ['0.1.1', '2012-06-08', 'First working version (including unit tests) released at github.com'],
-    ['0.1.0', '2012-06-02', 'Initial version on Ruby-1.9.3p194 and OrientDB-1.0.0']
+    ['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"],
+    ['0.1.2',   '2012-06-10', 'Introduces new OClass module'],
+    ['0.1.1',   '2012-06-08', 'First working version (including unit tests) released at github.com'],
+    ['0.1.0',   '2012-06-02', 'Initial version on Ruby-1.9.3p194 and OrientDB-1.0.0']
   ]
 
   # Current version.

data/lib/orientdb4r.rb

@@ -44,7 +44,7 @@ module Orientdb4r
       RestClient.proxy = url
     end
 
-    attr_accessor :logger, :context
+    attr_accessor :logger
 
   end
 
@@ -87,12 +87,6 @@ Orientdb4r::logger.info \
     "Orientdb4r #{Orientdb4r::VERSION}, running on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
 
 
-# Configuration of context.
-Orientdb4r::context = {}
-Orientdb4r::context[:node_type] = Orientdb4r::RestClientNode
-#Orientdb4r::context[:node_type] = Orientdb4r::ExconNode
-
-
 #Orientdb4r::logger.level = Logger::DEBUG
 #client = Orientdb4r.client
 #client.connect :database => 'temp', :user => 'admin', :password => 'admin'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orientdb4r
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client