orientdb4r 0.2.5 → 0.2.6

data/README.rdoc

@@ -13,6 +13,9 @@ see Wiki page for more sample at https://github.com/veny/orientdb4r/wiki
 
   client = Orientdb4r.client  # equivalent for :host => 'localhost', :port => 2480, :ssl => false
 
+  client.database_exists? :database => 'temp', :user => 'admin', :password => 'admin'
+  => true
+
   client.connect :database => 'temp', :user => 'admin', :password => 'admin'
 
   client.create_class(CLASS) do |c|
@@ -28,22 +31,22 @@ see Wiki page for more sample at https://github.com/veny/orientdb4r/wiki
   end
 
   puts client.query "SELECT FROM #{CLASS}"
-  > {"@type"=>"d", "@rid"=>"#6:0", "@version"=>0, "@class"=>"myclass", "prop1"=>1, "prop2"=>"text1", "users"=>["#4:0"]}
-  > {"@type"=>"d", "@rid"=>"#6:1", "@version"=>0, "@class"=>"myclass", "prop1"=>2, "prop2"=>"text2", "users"=>["#4:0"]}
-  > {"@type"=>"d", "@rid"=>"#6:2", "@version"=>0, "@class"=>"myclass", "prop1"=>3, "prop2"=>"text3", "users"=>[]}
-  > {"@type"=>"d", "@rid"=>"#6:3", "@version"=>0, "@class"=>"myclass", "prop1"=>4, "prop2"=>"text4", "users"=>[]}
-  > {"@type"=>"d", "@rid"=>"#6:4", "@version"=>0, "@class"=>"myclass", "prop1"=>5, "prop2"=>"text5", "users"=>[]}
+  => {"@type"=>"d", "@rid"=>"#6:0", "@version"=>0, "@class"=>"myclass", "prop1"=>1, "prop2"=>"text1", "users"=>["#4:0"]}
+  => {"@type"=>"d", "@rid"=>"#6:1", "@version"=>0, "@class"=>"myclass", "prop1"=>2, "prop2"=>"text2", "users"=>["#4:0"]}
+  => {"@type"=>"d", "@rid"=>"#6:2", "@version"=>0, "@class"=>"myclass", "prop1"=>3, "prop2"=>"text3", "users"=>[]}
+  => {"@type"=>"d", "@rid"=>"#6:3", "@version"=>0, "@class"=>"myclass", "prop1"=>4, "prop2"=>"text4", "users"=>[]}
+  => {"@type"=>"d", "@rid"=>"#6:4", "@version"=>0, "@class"=>"myclass", "prop1"=>5, "prop2"=>"text5", "users"=>[]}
 
   puts client.query "SELECT count(*) FROM #{CLASS}"
-  > {"@type"=>"d", "@version"=>0, "count"=>5, "@fieldTypes"=>"count=l"}
+  => {"@type"=>"d", "@version"=>0, "count"=>5, "@fieldTypes"=>"count=l"}
 
   puts client.query "SELECT max(prop1) FROM #{CLASS}"
-  > {"@type"=>"d", "@version"=>0, "max"=>5}
+  => {"@type"=>"d", "@version"=>0, "max"=>5}
 
   puts client.query "TRAVERSE any() FROM (SELECT FROM #{CLASS} WHERE prop1 = 1)"
-  > {"@type"=>"d", "@rid"=>"#6:0", "@version"=>0, "@class"=>"myclass", "prop1"=>1, "prop2"=>"text1", "users"=>["#4:0"]}
-  > {"@type"=>"d", "@rid"=>"#4:0", "@version"=>0, "@class"=>"OUser", "name"=>"admin", "password"=>"{SHA-256}8C6976E5B5410415BDE908BD4DEE15DFB167A9C873FC4BB8A81F6F2AB448A918", "status"=>"ACTIVE", "roles"=>["#3:0"]}
-  > {"@type"=>"d", "@rid"=>"#3:0", "@version"=>0, "@class"=>"ORole", "name"=>"admin", "mode"=>1, "rules"=>{}, "@fieldTypes"=>"mode=b"}
+  => {"@type"=>"d", "@rid"=>"#6:0", "@version"=>0, "@class"=>"myclass", "prop1"=>1, "prop2"=>"text1", "users"=>["#4:0"]}
+  => {"@type"=>"d", "@rid"=>"#4:0", "@version"=>0, "@class"=>"OUser", "name"=>"admin", "password"=>"{SHA-256}8C6976E5B5410415BDE908BD4DEE15DFB167A9C873FC4BB8A81F6F2AB448A918", "status"=>"ACTIVE", "roles"=>["#3:0"]}
+  => {"@type"=>"d", "@rid"=>"#3:0", "@version"=>0, "@class"=>"ORole", "name"=>"admin", "mode"=>1, "rules"=>{}, "@fieldTypes"=>"mode=b"}
 
 
   client.drop_class CLASS
@@ -72,6 +75,7 @@ see Wiki page for more sample at https://github.com/veny/orientdb4r/wiki
 Tested on
 * Ruby 1.9.3
 * OrientDB 1.0.0
+* OrientDB 1.0.1
 * OrientDB 1.1.0-SNAPSHOT r5913+
 
 == TESTS

data/lib/orientdb4r/client.rb

@@ -62,17 +62,19 @@ module Orientdb4r
 
     ###
     # Retrieves all the information about a database.
-    def get_database(name)
+    # Client has not to be connected to see databases suitable to connect.
+    def get_database(options)
       raise NotImplementedError, 'this should be overridden by concrete client'
     end
 
 
     ###
     # Checks existence of a given database.
-    def database_exists?(name)
+    # Client has not to be connected to see databases suitable to connect.
+    def database_exists?(options)
       rslt = true
       begin
-        get_database name
+        get_database options
       rescue NotFoundError
         rslt = false
       end
@@ -84,7 +86,7 @@ module Orientdb4r
 
     ###
     # Executes a query against the database.
-    def query(sql)
+    def query(sql, options)
       raise NotImplementedError, 'this should be overridden by concrete client'
     end
 

data/lib/orientdb4r/rest/client.rb

@@ -6,7 +6,9 @@ module Orientdb4r
     # Name of cookie that represents a session.
     SESSION_COOKIE_NAME = 'OSESSIONID'
 
-    before [:create_database, :get_database, :get_class, :query, :command], :assert_connected
+    before [:query, :command], :assert_connected
+    before [:create_class, :get_class, :drop_class, :create_property], :assert_connected
+    before [:create_document, :get_document, :update_document, :delete_document], :assert_connected
     around [:query, :command], :time_around
 
     attr_reader :host, :port, :ssl, :user, :password, :database, :session_id
@@ -130,9 +132,23 @@ module Orientdb4r
     end
 
 
-    def get_database(name) #:nodoc:
+    def get_database(options=nil) #:nodoc:
+      raise ArgumentError, 'options have to be a Hash' if !options.nil? and !options.kind_of? Hash
+
+      if options.nil?
+        # use values from connect
+        raise ConnectionError, 'client has to be connected if no params' unless connected?
+        options = { :database => database, :user => user, :password => password }
+      end
+
+      options_pattern = { :database => :mandatory, :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)
       begin
-        response = @resource["database/#{name}"].get
+        response = resource["database/#{options[:database]}"].get
       rescue
         raise NotFoundError
       end
@@ -142,10 +158,15 @@ module Orientdb4r
 
     # ---------------------------------------------------------------------- SQL
 
-    def query(sql) #:nodoc:
+    def query(sql, options=nil) #:nodoc:
       raise ArgumentError, 'query is blank' if blank? sql
 
-      response = @resource["query/#{@database}/sql/#{CGI::escape(sql)}"].get
+      options_pattern = { :limit => :optional }
+      verify_options(options, options_pattern) unless options.nil?
+
+      limit = ''
+      limit = "/#{options[:limit]}" if !options.nil? and options.include?(:limit)
+      response = @resource["query/#{@database}/sql/#{CGI::escape(sql)}#{limit}"].get
       entries = process_response(response)
       rslt = entries['result']
       # mixin all document entries (they have '@class' attribute)

data/lib/orientdb4r/utils.rb

@@ -78,30 +78,6 @@ module Orientdb4r
 
     end # Proxy
 
-
-    class DataGenerator
-
-      def initialize
-        @words = IO.readlines('/usr/share/dict/words')
-        0.upto(@words.size - 1) do |i|
-          word = @words[i]
-          word.strip!
-          idx = word.index("'")
-          word = word[0..(idx - 1)] unless idx.nil?
-          @words[i] = word
-        end
-        @words.uniq
-        Orientdb4r::logger.info "DataGenerator: #{@words.size} words"
-      end
-
-      ###
-      # Gets a random word.
-      def word
-        @words[rand(@words.size)]
-      end
-
-    end # DataGenerator
-
   end # Utils
 
 

data/lib/orientdb4r/version.rb

@@ -2,6 +2,7 @@ module Orientdb4r
 
   # Version history.
   VERSION_HISTORY = [
+    ['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"],

data/test/test_database.rb

@@ -95,20 +95,25 @@ class TestDatabase < Test::Unit::TestCase
   ###
   # GET DATABASE
   def test_get_database
+    # not connected
+    assert_nothing_thrown do @client.get_database :database => 'temp', :user => 'admin', :password => 'admin' ; end
+    assert_raise Orientdb4r::ConnectionError do @client.get_database; end
+    # connected
     @client.connect :database => 'temp', :user => 'admin', :password => 'admin'
-    assert_nothing_thrown do @client.get_database 'temp'; end
+    assert_nothing_thrown do @client.get_database; end # gets info about connected DB
 
-    rslt = @client.get_database 'temp'
+    rslt = @client.get_database
     assert_not_nil rslt
     assert_instance_of Hash, rslt
     assert rslt.include? 'classes'
-    assert @client.database_exists?('temp')
+    assert @client.database_exists?(:database => 'temp', :user => 'admin', :password => 'admin')
+    assert @client.database_exists?(:database => 'temp') # use credentials of logged in user
 
     # bad databases
-    assert_raise Orientdb4r::NotFoundError do @client.get_database 'UnknownDB'; end
-    assert_raise Orientdb4r::NotFoundError do @client.get_database 'temp/admin'; end
-    assert !@client.database_exists?('UnknownDB')
-    assert !@client.database_exists?('temp/admin')
+    assert_raise Orientdb4r::NotFoundError do @client.get_database :database => 'UnknownDB'; end
+    assert_raise Orientdb4r::NotFoundError do @client.get_database :database => 'temp/admin'; end
+    assert !@client.database_exists?(:database => 'UnknownDB')
+    assert !@client.database_exists?(:database => 'temp/admin')
   end
 
 
@@ -126,4 +131,20 @@ class TestDatabase < Test::Unit::TestCase
     assert_not_nil rslt['connections']
   end
 
+
+  ###
+  # Test of :assert_connected before advice.
+  def test_assert_connected
+    assert_raise Orientdb4r::ConnectionError do @client.query 'SELECT FROM OUser'; end
+    assert_raise Orientdb4r::ConnectionError do @client.query "INSERT INTO OUser(name) VALUES('x')"; end
+    assert_raise Orientdb4r::ConnectionError do @client.create_class 'x'; end
+    assert_raise Orientdb4r::ConnectionError do @client.create_property 'x', 'prop', :boolean; end
+    assert_raise Orientdb4r::ConnectionError do @client.get_class 'x'; end
+    assert_raise Orientdb4r::ConnectionError do @client.drop_class 'x'; end
+    assert_raise Orientdb4r::ConnectionError do @client.create_document({ '@class' => 'x', :prop => 1 }); end
+    assert_raise Orientdb4r::ConnectionError do @client.get_document('#1:0'); end
+    assert_raise Orientdb4r::ConnectionError do @client.update_document({}); end
+    assert_raise Orientdb4r::ConnectionError do @client.delete_document('#1:0'); end
+  end
+
 end

data/test/test_dmo.rb

@@ -14,6 +14,7 @@ class TestDmo < Test::Unit::TestCase
   def setup
     @client = Orientdb4r.client
     @client.connect :database => DB, :user => 'admin', :password => 'admin'
+    @client.drop_class(CLASS) # just to be sure if the previous test failed
     @client.create_class(CLASS) do |c|
       c.property 'prop1', :integer
       c.property 'prop2', :string, :mandatory => true, :notnull => :true, :min => 1, :max => 99
@@ -56,21 +57,27 @@ class TestDmo < Test::Unit::TestCase
   ###
   # SELECT
   def test_query
-    1.upto(10) do |i|
+    1.upto(25) do |i|
       @client.command "INSERT INTO #{CLASS} (prop1, prop2, friends) VALUES (#{i}, 'string#{i}', [#{@admin['@rid']}])"
     end
 
     entries = @client.query("SELECT FROM #{CLASS}")
+    assert_not_nil entries
     assert_instance_of Array, entries
-    assert_equal 10, entries.size
+    assert_equal 20, entries.size # 20 is default limit
     entries.each { |doc| assert doc.kind_of? Orientdb4r::DocumentMetadata }
+    # limit
+    assert_equal 5, @client.query("SELECT FROM #{CLASS} LIMIT 5").size
+    entries = @client.query "SELECT FROM #{CLASS}", :limit => 100
+    assert_equal 25, entries.size
+    assert_raise ArgumentError do @client.query "SELECT FROM #{CLASS}", :unknown => 100; end
 
     assert_equal 1, @client.query("SELECT FROM #{CLASS} WHERE prop1 = 1").size
-    assert_equal 0, @client.query("SELECT FROM #{CLASS} WHERE prop1 = 11").size
+    assert_equal 0, @client.query("SELECT FROM #{CLASS} WHERE prop1 = -1").size
     # graph
     rid = @client.query("SELECT FROM #{CLASS} WHERE prop1 = 1")[0]['@rid']
     gr = @client.query("SELECT FROM (TRAVERSE * FROM #{rid})")
-    assert_equal 3, gr.size # # entries: testing, OUser, ORole
+    assert_equal 3, gr.size # entries: testing, OUser, ORole
     assert_equal 1, gr.select { |e| e if e['@class'] == CLASS }.size
     assert_equal 1, gr.select { |e| e if e['@class'] == 'OUser' }.size
     assert_equal 1, gr.select { |e| e if e['@class'] == 'ORole' }.size

metadata

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