orientdb4r 0.2.8 → 0.2.9

data/changelog.txt

@@ -3,7 +3,13 @@
 - 'rest-client' replaced by 'excon' for HTTP communication with Keep-Alive
 - introduced support for distributed server
 
-0.2.8 /07/07/xx
+
+0.2.9 /07/07/18
+- introduced class Rid
+- added feature Client#delete_database
+
+
+0.2.8 /07/07/16
 - changed and stabilized exception handling
 - added feature Client#create_class(:properties)
 

data/fstudy/flat_class_perf.rb

@@ -3,7 +3,7 @@ require 'study_case'
 # This class tests performance on a simple flat class.
 class FlatClassPerf < FStudy::Case
 
-#  def db; 'perf'; end
+  def db; 'perf'; end
 
   def drop
     client.drop_class 'User'
@@ -35,8 +35,18 @@ class FlatClassPerf < FStudy::Case
     end
   end
 
-  def count
-    puts client.query 'SELECT count(*) FROM User'
+  def product
+    1.upto(500000) do |i|
+      Orientdb4r::logger.info "...done: #{i}" if 0 == (i % 100000)
+      name = dg.word
+      type = (rand(3) == 0) ? 'a' : 'b'
+      begin
+        client.command "insert into product cluster #{type} (name,type) values ('#{name}','#{type}')"
+#        client.command "insert into product_simple (name,type) values ('#{name}','#{type}')"
+      rescue Exception => e
+        Orientdb4r::logger.error e
+      end
+    end
   end
 
 end

data/fstudy/technical_feasibility.rb

@@ -190,7 +190,7 @@ class TechnicalFeasibility < FStudy::Case
       types = [:login, :logout, :likeit, :rated, :saw, :commented]
       limit = users.size * user_coef
       1.upto(limit) do |i|
-        puts "... #{i}" if 0 == i % 100000
+        puts "... #{i} #{Time.now - start}" if 0 == i % 100000
         type = rand(types.size)
         activity = { '@class' => 'Activity', :type => type, :stamp => (Time.now.to_i - rand(3600*23*30)) }
         # random distribution of Users (1) & the same communities as user
@@ -201,7 +201,12 @@ class TechnicalFeasibility < FStudy::Case
         content = (types[type] == :login or types[type] == :logout) ? nil : contents[rand(contents.size)]
         activity[content['@class'].downcase] = content[:rid] unless content.nil?
 
-        client.create_document(activity)
+        begin
+          client.create_document(activity)
+        rescue Exception => e
+          Orientdb4r::logger.error "problem storing index=#{i}, user=#{user.inspect}"
+          Orientdb4r::logger.error e
+        end
       end
       puts "Created Activities: #{limit}, time = #{Time.now - start} [s]"
     end

data/lib/orientdb4r/client.rb

@@ -84,6 +84,13 @@ module Orientdb4r
     end
 
 
+    ###
+    # Drops a database.
+    # Requires additional authentication to the server.
+    def delete_database(options)
+      raise NotImplementedError, 'this should be overridden by concrete client'
+    end
+
     # ---------------------------------------------------------------------- SQL
 
     ###

data/lib/orientdb4r/rest/client.rb

@@ -103,7 +103,7 @@ module Orientdb4r
     def create_database(options) #:nodoc:
       options_pattern = {
         :database => :mandatory, :type => 'memory',
-        :user => :optional, :password => :optional, :ssl => false
+        :user => :optional, :password => :optional
       }
       verify_and_sanitize_options(options, options_pattern)
 
@@ -141,6 +141,22 @@ module Orientdb4r
     end
 
 
+    def delete_database(options) #:nodoc:
+      options_pattern = {
+        :database => :mandatory, :user => :optional, :password => :optional
+      }
+      verify_and_sanitize_options(options, options_pattern)
+
+      u = options.include?(:user) ? options[:user] : user
+      p = options.include?(:password) ? options[:password] : password
+
+      # uses one-off request because of additional authentication to the server
+      response = a_node.oo_request :method => :delete, :user => u, :password => p, \
+          :uri => "database/#{options[:database]}"
+      process_response(response)
+    end
+
+
     # ---------------------------------------------------------------------- SQL
 
     def query(sql, options=nil) #:nodoc:
@@ -212,24 +228,20 @@ module Orientdb4r
 
     # ----------------------------------------------------------------- DOCUMENT
 
-    def create_document(doc)
+    def create_document(doc) #:nodoc:
       response = a_node.request(:method => :post, :uri => "document/#{@database}", \
           :content_type => 'application/json', :data => doc.to_json)
-      rid = process_response(response)  do
+      srid = process_response(response)  do
         raise DataError, 'validation problem' if response.body =~ /OValidationException/
       end
 
-      raise ArgumentError, "invalid RID format, RID=#{rid}" unless rid =~ /^#[0-9]+:[0-9]+/
-      rid
+      Rid.new srid
     end
 
 
     def get_document(rid) #:nodoc:
-      raise ArgumentError, 'blank RID' if blank? rid
-      # remove the '#' prefix
-      rid = rid[1..-1] if rid.start_with? '#'
-
-      response = a_node.request(:method => :get, :uri => "document/#{@database}/#{rid}")
+      rid = Rid.new(rid) unless rid.is_a? Rid
+      response = a_node.request(:method => :get, :uri => "document/#{@database}/#{rid.unprefixed}")
       rslt = process_response(response) do
         raise NotFoundError, 'record not found' if response.body =~ /ORecordNotFoundException/
         raise NotFoundError, 'record not found' if response.body =~ /Record with id .* was not found/ # why after delete?
@@ -245,10 +257,10 @@ module Orientdb4r
       raise ArgumentError, 'document has no RID' if doc.doc_rid.nil?
       raise ArgumentError, 'document has no version' if doc.doc_version.nil?
 
-      rid = doc.delete '@rid'
-      rid = rid[1..-1] if rid.start_with? '#'
+      rid = doc.doc_rid
+      doc.delete '@rid' # will be not updated
 
-      response = a_node.request(:method => :put, :uri => "document/#{@database}/#{rid}", \
+      response = a_node.request(:method => :put, :uri => "document/#{@database}/#{rid.unprefixed}", \
           :content_type => 'application/json', :data => doc.to_json)
       process_response(response) do
         raise DataError, 'concurrent modification' if response.body =~ /OConcurrentModificationException/
@@ -259,11 +271,9 @@ module Orientdb4r
 
 
     def delete_document(rid) #:nodoc:
-      raise ArgumentError, 'blank RID' if blank? rid
-      # remove the '#' prefix
-      rid = rid[1..-1] if rid.start_with? '#'
+      rid = Rid.new(rid) unless rid.is_a? Rid
 
-      response = a_node.request(:method => :delete, :uri => "document/#{@database}/#{rid}")
+      response = a_node.request(:method => :delete, :uri => "document/#{@database}/#{rid.unprefixed}")
       process_response(response) do
         raise NotFoundError, 'record not found' if response.body =~ /ORecordNotFoundException/
       end

data/lib/orientdb4r/rest/model.rb

@@ -126,7 +126,8 @@ module Orientdb4r
     ###
     # Gets the document ID.
     def doc_rid
-      self['@rid']
+      @mixedin_rid = Rid.new(self['@rid']) if @mixedin_rid.nil?
+      @mixedin_rid
     end
 
     ###

data/lib/orientdb4r/rid.rb

@@ -0,0 +1,50 @@
+module Orientdb4r
+
+  ###
+  # This class represents encapsulation of RecordID.
+  class Rid
+    include Utils
+
+    # Format validation regexp.
+    RID_REGEXP_PATTERN = /^#?\d+:\d+$/
+
+    attr_reader :cluster_id, :document_id
+
+    ###
+    # Constructor.
+    def initialize(rid)
+      raise ArgumentError, 'RID cannot be blank' if blank? rid
+      raise ArgumentError, 'RID is not String' unless rid.is_a? String
+      raise ArgumentError, "bad RID format, rid=#{rid}" unless rid =~ RID_REGEXP_PATTERN
+
+      rid = rid[1..-1] if rid.start_with? '#'
+      ids = rid.split ':'
+      self.cluster_id = ids[0].to_i
+      self.document_id = ids[1].to_i
+    end
+
+    def cluster_id=(cid)
+      @cluster_id = cid.to_i
+    end
+
+    def document_id=(did)
+      @document_id = did.to_i
+    end
+
+    def to_s
+      "##{cluster_id}:#{document_id}"
+    end
+
+    ###
+    # Gets RID's string representation with no prefix.
+    def unprefixed
+      "#{cluster_id}:#{document_id}"
+    end
+
+    def ==(another_rid) #:nodoc:
+      self.cluster_id == another_rid.cluster_id and self.document_id == another_rid.document_id
+    end
+
+  end
+
+end

data/lib/orientdb4r/version.rb

@@ -2,6 +2,7 @@ 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"],

data/lib/orientdb4r.rb

@@ -11,6 +11,7 @@ module Orientdb4r
   autoload :Utils,          'orientdb4r/utils'
   autoload :Client,         'orientdb4r/client'
   autoload :RestClient,     'orientdb4r/rest/client'
+  autoload :Rid,            'orientdb4r/rid'
   autoload :HashExtension,  'orientdb4r/rest/model'
   autoload :OClass,         'orientdb4r/rest/model'
   autoload :ChainedError,   'orientdb4r/chained_error'

data/test/test_database.rb

@@ -76,14 +76,16 @@ class TestDatabase < Test::Unit::TestCase
 
   ###
   # CREATE DATABASE
-  # Temporary disabled because of unknown way how to drop a new created datatabse.
+  # Temporary disabled because of dependency to password of 'root' account
   def xtest_create_database
-    @client.create_database :database => 'UniT', :user => 'root', :password => 'root'
+    assert_nothing_thrown do
+      @client.create_database :database => 'UniT', :user => 'root', :password => 'root'
+    end
     assert_nothing_thrown do
       @client.get_database :database => 'UniT', :user => 'admin', :password => 'admin'
     end
     # creating an existing DB
-    assert_raise Orientdb4r::OrientdbError do
+    assert_raise Orientdb4r::ServerError do
       @client.create_database :database => 'UniT', :user => 'root', :password => 'root'
     end
     # insufficient rights
@@ -93,8 +95,10 @@ class TestDatabase < Test::Unit::TestCase
 
     # By convention 3 users are always created by default every time you create a new database.
     # Default users are: admin, reader, writer
-    @client.connect :database => 'UniT', :user => 'admin', :password => 'admin'
-    #@client.command "DROP DATABASE UniT" : NOT WORKING now
+    assert_nothing_thrown do
+      @client.connect :database => 'UniT', :user => 'admin', :password => 'admin'
+    end
+    @client.delete_database({:database => 'UniT', :user => 'root', :password => 'root'})
   end
 
 
@@ -126,6 +130,27 @@ class TestDatabase < Test::Unit::TestCase
   end
 
 
+  ###
+  # DELETE DATABASE
+  # Temporary disabled because of dependency to password of 'root' account
+  def xtest_delete_database
+    @client.create_database :database => 'UniT', :user => 'root', :password => 'root'
+
+    # deleting non-existing DB
+    assert_raise Orientdb4r::ServerError do
+      @client.delete_database :database => 'UniT1', :user => 'root', :password => 'root'
+    end
+    # insufficient rights
+    assert_raise Orientdb4r::OrientdbError do
+      @client.delete_database :database => 'UniT', :user => 'admin', :password => 'admin'
+    end
+
+    assert_nothing_thrown do
+      @client.delete_database({:database => 'UniT', :user => 'root', :password => 'root'})
+    end
+  end
+
+
   ###
   # SERVER info
   # Temporary disabled because of dependency to password of 'root' account

data/test/test_dmo.rb

@@ -77,6 +77,7 @@ class TestDmo < Test::Unit::TestCase
     assert_instance_of Array, entries
     assert_equal 20, entries.size # 20 is default limit
     entries.each { |doc| assert doc.kind_of? Orientdb4r::DocumentMetadata }
+    entries.each { |doc| assert_instance_of Orientdb4r::Rid, doc.doc_rid }
     # limit
     assert_equal 5, @client.query("SELECT FROM #{CLASS} LIMIT 5").size
     entries = @client.query "SELECT FROM #{CLASS}", :limit => 100

data/test/test_document_crud.rb

@@ -32,7 +32,7 @@ class TestDocumentCrud < Test::Unit::TestCase
   def test_create_document
     assert_nothing_thrown do @client.create_document( { '@class' => CLASS, 'prop1' => 99, 'prop2' => 'ipsum lorem' }); end
     rid = @client.create_document({ '@class' => CLASS, 'prop1' => 1, 'prop2' => 'text' })
-    assert rid =~ /#[0-9]+:[0-9]+$/
+    assert_instance_of Orientdb4r::Rid, rid
 
     # no effect if a define the version
     assert_nothing_thrown do
@@ -86,10 +86,10 @@ class TestDocumentCrud < Test::Unit::TestCase
     assert doc.kind_of? Orientdb4r::DocumentMetadata
 
     # not existing RID
-    rid1 = rid.sub(/[0-9]+$/, (rid.split(':')[1].to_i + 1).to_s) # '#6:0' > '#6:1' or '#6:11' > '#6:12'
+    rid1 = Orientdb4r::Rid.new("#{rid.cluster_id}:#{rid.document_id + 1}") # '#6:0' > '#6:1' or '#6:11' > '#6:12'
     assert_raise Orientdb4r::NotFoundError do @client.get_document rid1; end
     # bad RID format
-    assert_raise Orientdb4r::ServerError do @client.get_document('xx'); end
+    assert_raise ArgumentError do @client.get_document('xx'); end
   end
 
   ###
@@ -146,7 +146,7 @@ class TestDocumentCrud < Test::Unit::TestCase
     # not existing RID
     assert_raise Orientdb4r::NotFoundError do @client.delete_document '#4:1111'; end
     # bad RID format
-    assert_raise Orientdb4r::ServerError do @client.delete_document 'xx'; end
+    assert_raise ArgumentError do @client.delete_document 'xx'; end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orientdb4r
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -59,6 +59,7 @@ files:
 - lib/orientdb4r/rest/model.rb
 - lib/orientdb4r/rest/node.rb
 - lib/orientdb4r/rest/restclient_node.rb
+- lib/orientdb4r/rid.rb
 - lib/orientdb4r/utils.rb
 - lib/orientdb4r/version.rb
 - orientdb4r.gemspec