orientdb4r 0.3.1 → 0.3.2

data/changelog.txt

@@ -1,3 +1,7 @@
+0.3.2 2012-11-02
+- Enhancement #13 : configurable User-Agent request header
+- Enhancement #16 : configurable Recovery Time in Load Balancing
+
 0.3.1 2012-08-27
 - Timeout for reuse of dirty (already failed) nodes in load balancing
 - Bug Fix #14, #15

data/lib/orientdb4r/bin/client.rb

@@ -0,0 +1,97 @@
+require 'socket'
+require 'bindata'
+
+module Orientdb4r
+
+  ###
+  # This client implements the binary protocol.
+  class BinClient < Client
+
+
+    def initialize(options) #:nodoc:
+      super()
+      options_pattern = {
+        :host => 'localhost', :port => 2424
+      }
+      verify_and_sanitize_options(options, options_pattern)
+
+      @host = options[:host]
+      @port = options[:port]
+    end
+
+
+    # --------------------------------------------------------------- CONNECTION
+
+    def connect options #:nodoc:
+      options_pattern = { :database => :mandatory, :user => :mandatory, :password => :mandatory }
+      verify_and_sanitize_options(options, options_pattern)
+      @database = options[:database]
+      @user = options[:user]
+      @password = options[:password]
+
+      socket = TCPSocket.open(@host, @port)
+      protocol = BinData::Int16be.read(socket)
+
+      Orientdb4r::logger.info "Binary protocol number: #{protocol}"
+
+      command = DbOpen.new
+      command.version = protocol
+      command.database = 'temp'
+      command.user = 'admin'
+      command.password = 'admin'
+      command.write(socket)
+
+      resp = BinData::Int8.read(socket).to_i
+      puts "EE #{resp}"
+
+      socket.close
+    end
+
+
+    def disconnect #:nodoc:
+    end
+
+
+    def server(options={})
+      raise NotImplementedError, 'this should be overridden by concrete client'
+    end
+
+class ProtocolString < BinData::Primitive
+        endian    :big
+
+        int32   :len,   :value => lambda { data.length }
+        string  :data,  :read_length => :len
+
+        def get;   self.data; end
+        def set(v) self.data = v; end
+      end
+class DbOpen < BinData::Record
+          endian :big
+
+          int8            :operation,       :value => 3  #DB_OPEN
+          int32           :session,         :value => -1 #NEW_SESSION
+
+          protocol_string :driver,          :value => 'Orientdb4r Ruby Client'
+          protocol_string :driver_version,  :value => Orientdb4r::VERSION
+          int16           :version
+          protocol_string :client_id
+          protocol_string :database
+          protocol_string :user
+          protocol_string :password
+        end
+class Connect < BinData::Record
+          endian :big
+
+          int8            :operation,       :value => 2
+          int32           :session,         :value => -1 #NEW_SESSION
+          protocol_string :driver,          :value => 'Orientdb4r Ruby Client'
+          protocol_string :driver_version,  :value => Orientdb4r::VERSION
+          int16           :version
+          protocol_string :client_id
+          protocol_string :user
+          protocol_string :password
+        end
+
+  end
+
+end

data/lib/orientdb4r/load_balancing.rb

@@ -4,16 +4,18 @@ module Orientdb4r
   # Base class for implementation of load balancing strategy.
   class LBStrategy
 
-    # If occures a new try to communicate from node can be tested [s].
-    RECOVERY_TIMEOUT = 30
+    # After what time [s] can be a failed node reused in load balancing.
+    DEFAULT_RECOVER_TIME = 30
 
-    attr_reader :nodes_count, :bad_nodes
+    attr_reader   :nodes_count, :bad_nodes
+    attr_accessor :recover_time
 
     ###
     # Constructor.
     def initialize nodes_count
       @nodes_count = nodes_count
       @bad_nodes = {}
+      @recover_time = DEFAULT_RECOVER_TIME
     end
 
     ###
@@ -56,7 +58,7 @@ module Orientdb4r
             failure_time = @bad_nodes[candidate]
             now = Time.now
             # timeout candidate
-            if (now - failure_time) > RECOVERY_TIMEOUT
+            if (now - failure_time) > recover_time
               timeout_candidate = candidate
               Orientdb4r::logger.debug "node timeout recovery, idx=#{candidate}"
               good_one(candidate)

data/lib/orientdb4r/rest/client.rb

@@ -17,7 +17,9 @@ module Orientdb4r
         :nodes => :optional,
         :connection_library => :restclient,
         :load_balancing => :sequence,
-        :proxy => :optional
+        :proxy => :optional,
+        :user_agent => :optional,
+        :lb_recover_time => :optional
       }
       verify_and_sanitize_options(options, options_pattern)
 
@@ -48,6 +50,10 @@ module Orientdb4r
         when :round_robin then Orientdb4r::RoundRobin.new nodes.size
         else raise ArgumentError, "unknow load balancing type: #{load_balancing}"
       end
+      # recover time
+      recover_time = options[:lb_recover_time]
+      @lb_strategy.recover_time = recover_time.to_i unless recover_time.nil?
+
 
       # proxy
       @proxy = options[:proxy]
@@ -58,6 +64,12 @@ module Orientdb4r
         end
       end
 
+      # user-agent
+      agent = options[:user_agent]
+      unless agent.nil?
+        nodes.each { |node| node.user_agent = agent }
+      end
+
       Orientdb4r::logger.info "client initialized with #{@nodes.size} node(s) "
       Orientdb4r::logger.info "connection_library=#{options[:connection_library]}, load_balancing=#{load_balancing}"
     end

data/lib/orientdb4r/rest/excon_node.rb

@@ -96,6 +96,7 @@ module Orientdb4r
         rslt = {'Authorization' => basic_auth_header(options[:user], options[:password])}
         rslt['Cookie'] = "#{SESSION_COOKIE_NAME}=#{session_id}" unless session_id.nil?
         rslt['Content-Type'] = options[:content_type] if options.include? :content_type
+        rslt['User-Agent'] = user_agent unless user_agent.nil?
         rslt
       end
 

data/lib/orientdb4r/rest/node.rb

@@ -9,6 +9,8 @@ module Orientdb4r
     SESSION_COOKIE_NAME = 'OSESSIONID'
 
     attr_reader :ssl
+    # HTTP header 'User-Agent'
+    attr_accessor :user_agent
 
     ###
     # Constructor.

data/lib/orientdb4r/rest/restclient_node.rb

@@ -22,8 +22,10 @@ module Orientdb4r
       data = '' if data.nil? and :post == opts[:method] # POST has to have data
       opts[:payload] = data unless data.nil?
 
-      # headers
+      # cookies
       opts[:cookies] = { SESSION_COOKIE_NAME => session_id} unless session_id.nil?
+      # headers
+      opts[:headers] = { 'User-Agent' => user_agent } unless user_agent.nil?
 
       begin
         response = ::RestClient::Request.new(opts).execute

data/lib/orientdb4r/version.rb

@@ -2,6 +2,7 @@ module Orientdb4r
 
   # Version history.
   VERSION_HISTORY = [
+    ['0.3.2',   '2012-11-02', "Feature #13 (User-Agent), #16 (configurable Recover Time in Load Balancing)"],
     ['0.3.1',   '2012-08-27', "Timeout for reuse of dirty nodes in load balancing; BF #14, BF #15"],
     ['0.3.0',   '2012-08-01', "Added support for cluster of distributed servers + load balancing"],
     ['0.2.10',  '2012-07-21', "Experimental support for Excon HTTP library with Keep-Alive connection"],

data/lib/orientdb4r.rb

@@ -11,6 +11,7 @@ module Orientdb4r
   autoload :Utils,          'orientdb4r/utils'
   autoload :Client,         'orientdb4r/client'
   autoload :RestClient,     'orientdb4r/rest/client'
+  autoload :BinClient,      'orientdb4r/bin/client'
   autoload :Rid,            'orientdb4r/rid'
   autoload :HashExtension,  'orientdb4r/rest/model'
   autoload :OClass,         'orientdb4r/rest/model'
@@ -37,6 +38,7 @@ module Orientdb4r
 
       Thread.exclusive {
         Thread.current[:orientdb_client] ||= RestClient.new options
+        #Thread.current[:orientdb_client] ||= BinClient.new options
       }
     end
 

data/test/test_ddo.rb

@@ -40,7 +40,7 @@ class TestDdo < Test::Unit::TestCase
     assert !clazz.properties.empty?
     assert_nothing_thrown do clazz.property(:password); end
     assert_raise ArgumentError do clazz.property(:unknown_prop); end
-    assert_equal '', clazz.super_class
+    assert_equal 'OIdentity', clazz.super_class
     assert_instance_of Array, clazz.clusters
     assert !clazz.clusters.empty?
     assert_not_nil clazz.default_cluster

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orientdb4r
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -51,6 +51,7 @@ files:
 - fstudy/study_case.rb
 - fstudy/technical_feasibility.rb
 - lib/orientdb4r.rb
+- lib/orientdb4r/bin/client.rb
 - lib/orientdb4r/chained_error.rb
 - lib/orientdb4r/client.rb
 - lib/orientdb4r/load_balancing.rb
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Ruby binding for Orient DB.