orientdb4r 0.2.1 → 0.2.2

data/README.rdoc

@@ -15,33 +15,35 @@ see Wiki page for more sample at https://github.com/veny/orientdb4r/wiki
 
   client.connect :database => 'temp', :user => 'admin', :password => 'admin'
 
-
   client.create_class(CLASS) do |c|
-    c.property 'prop1', :integer
-    c.property 'prop2', :string, :mandatory => true, :notnull => :true, :min => 1, :max => 99
+    c.property 'prop1', :integer, :notnull => true, :min => 1, :max => 99
+    c.property 'prop2', :string, :mandatory => true
+    c.link     'users', :linkset, 'OUser' # by default: :mandatory => false, :notnull => false
   end
 
-
-  1.upto(10) { |i| client.command "INSERT INTO #{CLASS} (prop1, prop2) VALUES (#{i}, 'string#{i}')" }
-
+  admin = client.query("SELECT FROM OUser WHERE name = 'admin'")[0]
+  1.upto(5) do |i|
+    # insert link to admin only to first two
+    client.command "INSERT INTO #{CLASS} (prop1, prop2, users) VALUES (#{i}, 'text#{i}', [#{admin['@rid'] if i<3}])"
+  end
 
   puts client.query "SELECT FROM #{CLASS}"
-  > {"@type"=>"d", "@rid"=>"#6:0", "@version"=>0, "@class"=>"testing", "prop1"=>1, "prop2"=>"string1"}
-  > {"@type"=>"d", "@rid"=>"#6:1", "@version"=>0, "@class"=>"testing", "prop1"=>2, "prop2"=>"string2"}
-  > {"@type"=>"d", "@rid"=>"#6:2", "@version"=>0, "@class"=>"testing", "prop1"=>3, "prop2"=>"string3"}
-  > {"@type"=>"d", "@rid"=>"#6:3", "@version"=>0, "@class"=>"testing", "prop1"=>4, "prop2"=>"string4"}
-  > {"@type"=>"d", "@rid"=>"#6:4", "@version"=>0, "@class"=>"testing", "prop1"=>5, "prop2"=>"string5"}
-  > {"@type"=>"d", "@rid"=>"#6:5", "@version"=>0, "@class"=>"testing", "prop1"=>6, "prop2"=>"string6"}
-  > {"@type"=>"d", "@rid"=>"#6:6", "@version"=>0, "@class"=>"testing", "prop1"=>7, "prop2"=>"string7"}
-  > {"@type"=>"d", "@rid"=>"#6:7", "@version"=>0, "@class"=>"testing", "prop1"=>8, "prop2"=>"string8"}
-  > {"@type"=>"d", "@rid"=>"#6:8", "@version"=>0, "@class"=>"testing", "prop1"=>9, "prop2"=>"string9"}
-  > {"@type"=>"d", "@rid"=>"#6:9", "@version"=>0, "@class"=>"testing", "prop1"=>10, "prop2"=>"string10"}
+  > {"@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"=>10, "@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"=>10}
-  puts client.query "SELECT FROM #{CLASS} WHERE prop2 LIKE '%10'"
-  > {"@type"=>"d", "@rid"=>"#6:9", "@version"=>0, "@class"=>"testing", "prop1"=>10, "prop2"=>"string10"}
+  > {"@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"}
 
 
   client.drop_class CLASS
@@ -55,8 +57,9 @@ see Wiki page for more sample at https://github.com/veny/orientdb4r/wiki
 * gem published on http://rubygems.org/gems/orientdb4r
 
 === Important Upgrade Notice
-2012-06-19 [v0.2.1]: Client#create_class - parameter given to a block has new method 'link' to define a linked property
-2012-06-17 [v0.2.0]: Client#get_class raises Orientdb4r::NotFoundError instead of ArgumentError
+
+* 2012-06-19 [v0.2.1]: Client#create_class - parameter given to a block has new method 'link' to define a linked property
+* 2012-06-17 [v0.2.0]: Client#get_class raises Orientdb4r::NotFoundError instead of ArgumentError
 
 
 

data/lib/orientdb4r/client.rb

@@ -3,6 +3,11 @@ module Orientdb4r
   class Client
     include Utils
 
+    DEFAULT_SERVER_VERSION = '1.0.0--'
+    SERVER_VERSION_PATTERN = /^\d+\.\d+\.\d+/
+
+    attr_reader :server_version
+
     ###
     # Constructor.
     def initialize
@@ -155,25 +160,6 @@ module Orientdb4r
     end
 
 
-    ###
-    # Creates links between two or more records of type Document.
-    # You need to create the class before.
-#    def create_link(clazz, options={})
-#      raise ArgumentError, "class name is blank" if blank?(clazz)
-#      opt_pattern = {
-#        :name => :optional, :type => :optional,
-#        :source_property => :mandatory, :destination_class => :mandatory, :destination_property => :mandatory
-#      }
-#      verify_options(options, opt_pattern)
-#
-#      cmd = 'CREATE LINK '
-#      cmd << "#{options[:name]} " if options.include? :name
-#      cmd << "TYPE #{options[:type]} " if options.include? :type
-#      cmd << "FROM #{clazz}.#{options[:source_property]} TO #{options[:destination_class]}.#{options[:destination_property]}"
-#puts cmd
-#      command cmd
-#    end
-
     # ----------------------------------------------------------------- DOCUMENT
 
     ###

data/lib/orientdb4r/rest/client.rb

@@ -3,7 +3,7 @@ module Orientdb4r
   class RestClient < Client
     include Aop2
 
-    before [:query, :command, :get_class], :assert_connected
+    before [:create_database, :get_class, :query, :command], :assert_connected
     around [:query, :command], :time_around
 
     attr_reader :host, :port, :ssl, :user, :password
@@ -34,6 +34,15 @@ module Orientdb4r
 
         decorate_classes_with_model(rslt['classes'])
 
+        # try to read server version
+        if rslt.include? 'server'
+          @server_version = rslt['server']['version']
+        else
+          @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}"
+
         @connected = true
       rescue
         @connected = false
@@ -80,16 +89,24 @@ module Orientdb4r
     def get_class(name) #:nodoc:
       raise ArgumentError, "class name is blank" if blank?(name)
 
-      # there seems to be a bug in REST API, only data are returned
-      #response = @resource["class/#{@database}/#{name}"].get
-      #rslt = process_response(response)
+      if compare_versions(server_version, '1.1.0') >= 0
+        begin
+          response = @resource["class/#{@database}/#{name}"].get
+        rescue
+          raise NotFoundError
+        end
+        rslt = process_response(response, :mode => :strict)
+        classes = [rslt]
+      else
+        # there is bug in REST API [v1.0.0, fixed in r5902], only data are returned
+        # workaround - use metadate delivered by 'connect'
+        response = @resource["connect/#{@database}"].get
+        connect_info = process_response(response, :mode => :strict)
 
-      # workaround - use metadate delivered by 'connect'
-      response = @resource["connect/#{@database}"].get
-      connect_info = process_response(response, :mode => :strict)
+        classes = connect_info['classes'].select { |i| i['name'] == name }
+        raise NotFoundError, "class not found, name=#{name}" unless 1 == classes.size
+      end
 
-      classes = connect_info['classes'].select { |i| i['name'] == name }
-      raise NotFoundError, "class not found, name=#{name}" unless 1 == classes.size
       decorate_classes_with_model(classes)
       clazz = classes[0]
       clazz.extend Orientdb4r::HashExtension
@@ -101,7 +118,6 @@ module Orientdb4r
         end
       end
 
-
       clazz
     end
 
@@ -252,6 +268,7 @@ 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/utils.rb

@@ -46,6 +46,22 @@ module Orientdb4r
       (0...len).map{65.+(rand(25)).chr}.join
     end
 
+    ###
+    # Compares two given versions.
+    # ==== Returns
+    # * 1 if first > second
+    # * 0 if first == second
+    # * -1 if first < second
+    def compare_versions(first, second)
+      raise ArgumentError, "bad version format, version=#{first}" unless first =~ Orientdb4r::Client::SERVER_VERSION_PATTERN
+      raise ArgumentError, "bad version format, version=#{second}" unless second =~ Orientdb4r::Client::SERVER_VERSION_PATTERN
+
+      firstv = /^(?:(\d+)\.)?(?:(\d+)\.)?(\*|\d+)/.match(first)[0]
+      secondv = /^(?:(\d+)\.)?(?:(\d+)\.)?(\*|\d+)/.match(second)[0]
+
+      return 0 if firstv == secondv
+      return firstv > secondv ? 1 : -1
+    end
 
     class Proxy
 

data/lib/orientdb4r/version.rb

@@ -2,6 +2,9 @@ module Orientdb4r
 
   # Version history.
   VERSION_HISTORY = [
+    # https://groups.google.com/forum/?fromgroups#!topic/orient-database/jK4EZd068AE
+    # 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'],

data/test/readme_sample.rb

@@ -0,0 +1,35 @@
+  require 'orientdb4r'
+
+  CLASS = 'myclass'
+
+  client = Orientdb4r.client  # equivalent for :host => 'localhost', :port => 2480, :ssl => false
+
+  client.connect :database => 'temp', :user => 'admin', :password => 'admin'
+
+  client.create_class(CLASS) do |c|
+    c.property 'prop1', :integer, :notnull => true, :min => 1, :max => 99
+    c.property 'prop2', :string, :mandatory => true
+    c.link     'users', :linkset, 'OUser' # by default: :mandatory => false, :notnull => false
+  end
+
+  admin = client.query("SELECT FROM OUser WHERE name = 'admin'")[0]
+  1.upto(5) do |i|
+    # insert link to admin only to first two
+    client.command "INSERT INTO #{CLASS} (prop1, prop2, users) VALUES (#{i}, 'text#{i}', [#{admin['@rid'] if i<3}])"
+  end
+
+  puts client.query "SELECT FROM #{CLASS}"
+  #>
+
+  puts client.query "SELECT count(*) FROM #{CLASS}"
+  #>
+
+  puts client.query "SELECT max(prop1) FROM #{CLASS}"
+  #>
+
+  puts client.query "TRAVERSE any() FROM (SELECT FROM #{CLASS} WHERE prop1 = 1)"
+  #>
+
+
+  client.drop_class CLASS
+  client.disconnect

data/test/test_database.rb

@@ -22,6 +22,7 @@ class TestDatabase < Test::Unit::TestCase
     assert_instance_of Hash, rslt
     assert rslt.size > 0
     assert rslt.include? 'classes'
+    assert_not_nil @client.server_version
 
     # connection refused
     client = Orientdb4r.client :port => 2840, :instance => :new
@@ -43,7 +44,9 @@ class TestDatabase < Test::Unit::TestCase
   ###
   # DISCONNECT
   def test_disconnect
-    @client.disconnect
+    @client.connect :database => 'temp', :user => 'admin', :password => 'admin'
+    assert @client.connected?
+    assert_nothing_thrown do @client.disconnect; end
     assert !@client.connected?
     # unable to query after disconnect
     assert_raise Orientdb4r::ConnectionError do @client.query 'SELECT FROM OUser'; end

data/test/test_dmo.rb

@@ -31,7 +31,7 @@ class TestDmo < Test::Unit::TestCase
 
   ###
   # INSERT INTO
-  def xtest_insert
+  def test_insert
     assert_nothing_thrown do
       1.upto(10) do |i|
         @client.command "INSERT INTO #{CLASS} (prop1, prop2, friends) VALUES (#{i}, '#{random_string}', [#{@admin['@rid']}])"

data/test/test_utils.rb

@@ -27,4 +27,25 @@ class TestDmo < Test::Unit::TestCase
     assert_equal 'B', options[:b]
   end
 
+  def test_compare_versions
+    assert_raise ArgumentError do compare_versions 'foo', 'bar'; end
+    assert_raise ArgumentError do compare_versions nil, 'bar'; end
+    assert_raise ArgumentError do compare_versions 'foo', nil; end
+    assert_raise ArgumentError do compare_versions '1.0.0', 'bar'; end
+    assert_raise ArgumentError do compare_versions 'foo', '1.0.0'; end
+    assert_nothing_thrown do compare_versions '1.0.0', '1.1.0'; end
+
+    assert_equal 0, compare_versions('1.0.0', '1.0.0')
+    assert_equal 0, compare_versions('1.2.0', '1.2.0')
+    assert_equal 0, compare_versions('1.2.3', '1.2.3')
+
+    assert_equal 1, compare_versions('1.0.1', '1.0.0')
+    assert_equal 1, compare_versions('1.1.0', '1.0.0')
+    assert_equal 1, compare_versions('2.0.0', '1.0.0')
+
+    assert_equal -1, compare_versions('1.0.0', '1.0.1')
+    assert_equal -1, compare_versions('1.0.0', '1.1.0')
+    assert_equal -1, compare_versions('1.0.0', '2.0.0')
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orientdb4r
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -48,6 +48,7 @@ files:
 - lib/orientdb4r/utils.rb
 - lib/orientdb4r/version.rb
 - orientdb4r.gemspec
+- test/readme_sample.rb
 - test/test_database.rb
 - test/test_ddo.rb
 - test/test_dmo.rb
@@ -74,11 +75,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby binding for Orient DB.
 test_files:
+- test/readme_sample.rb
 - test/test_database.rb
 - test/test_ddo.rb
 - test/test_dmo.rb