orientdb4r 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d475ea55280ea01281cefdee2731f1441d141095
-  data.tar.gz: 59f012f6c7a58d90af9650a9c27a85a691a65c74
+  metadata.gz: 837cd8b67b6cae12cd3cbba07a03cfa444c7b4f2
+  data.tar.gz: d53bade090415bee1e561c15d90c410a18095635
 SHA512:
-  metadata.gz: 2f0fb1f707050138c665237b963d64001b60ffcc460f6c6ded6009d2e2675977d504e225472399ad8ab66863adf54b68fce83df7f3687e2b2cfe3a0a6d98fd31
-  data.tar.gz: b6b538be7c8c18eb4352bec64be2b33979522f432e0a2e007d6abbb88c8eb3bf1ad654c5c7255c4d9f18f4069422c3967ff2d626b516128fa15ead84d324ae94
+  metadata.gz: bc1e3a22f4af160726b1a2fc6d320e08abc1330b544b338f4224c9e4a60c6d4f4fad6ce58877331bf350d9d11b50089c9f89892a837303e44573f78a09bad06e
+  data.tar.gz: 9c8f9a858f9d5d88d461bc8edd277290f845cb2c5af9a3f0a0c9298f6c53a8841b9c2cb523437ac3ee05d635cb4cffcef2944dec90cb346b514ca7a30391e5d9

data/README.rdoc

@@ -24,7 +24,7 @@ see Wiki page for more sample at https://github.com/veny/orientdb4r/wiki
   client.database_exists? :database => DB, :user => 'admin', :password => 'admin'
   => false
 
-  client.create_database :database => DB, :type => :memory, :user => 'root', :password => 'root'
+  client.create_database :database => DB, :storage => :memory, :user => 'root', :password => 'root'
   => false
 
   client.connect :database => DB, :user => 'admin', :password => 'admin'

data/lib/orientdb4r/client.rb

@@ -68,6 +68,9 @@ module Orientdb4r
     # Creates a new database.
     # You can provide an additional authentication to the server with 'database.create' resource
     # or the current one will be used.
+    # *options
+    #   *storage - 'memory' (by default) or 'local'
+    #   *type - 'document' (by default) or 'graph'
     def create_database(options)
       raise NotImplementedError, 'this should be overridden by concrete client'
     end
@@ -240,7 +243,7 @@ module Orientdb4r
       raise ArgumentError, "property name is blank" if blank?(property)
       opt_pattern = {
         :mandatory => :optional , :notnull => :optional, :min => :optional, :max => :optional,
-        :regexp =>  :optional, :custom => :optional, :linked_class => :optional
+        :readonly =>  :optional, :linked_class => :optional
       }
       verify_options(options, opt_pattern)
 

data/lib/orientdb4r/rest/client.rb

@@ -148,12 +148,13 @@ module Orientdb4r
 
     def create_database(options) #:nodoc:
       options_pattern = {
-        :database => :mandatory, :type => :memory,
+        :database => :mandatory, :storage => :memory, :type => :document,
         :user => :optional, :password => :optional
       }
       verify_and_sanitize_options(options, options_pattern)
+      verify_options(options.select {|k,v| k === :storage or k === :type}, {:storage => [:memory, :local], :type => [:document, :graph]})
 
-      params = { :method => :post, :uri => "database/#{options[:database]}/#{options[:type].to_s}" }
+      params = { :method => :post, :uri => "database/#{options[:database]}/#{options[:storage].to_s}/#{options[:type].to_s}" }
       params[:no_session] = true # out of existing session which represents an already done authentication
 
       # additional authentication allowed, overriden in 'call_server' if not defined

data/lib/orientdb4r/rest/model.rb

@@ -98,6 +98,12 @@ module Orientdb4r
       get_mandatory_attribute :notNull
     end
 
+    ###
+    # Gets the 'read-only' flag.
+    def read_only
+      get_mandatory_attribute :readonly
+    end
+
     ###
     # Gets linked class if the property is a link.
     def linked_class

data/lib/orientdb4r/version.rb

@@ -2,6 +2,7 @@ module Orientdb4r
 
   # Version history.
   VERSION_HISTORY = [
+    ['0.4.1',   '2013-09-03', "Enh #24 (read-only class), #26 (type of new database), #27 (license in gemspec)"],
     ['0.4.0',   '2013-08-14', "Closed gap between this driver and OrientDB v1.4.0+; Enh #20, BF #25"],
     ['0.3.3',   '2012-12-16', "Enh #18 ('abstract' option into creating a new class), Enh #19 (GET - List Databases)"],
     ['0.3.2',   '2012-11-02', "Enh #13 (User-Agent), Enh #16 (configurable Recover Time in Load Balancing)"],

data/orientdb4r.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby binding for Orient DB.}
+  s.license = 'Apache License, v2.0'
 
   s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
 #  s.add_development_dependency(%q<json>, ["~> 1.5.1"])

data/test/test_database.rb

@@ -67,6 +67,10 @@ class TestDatabase < Test::Unit::TestCase
   ###
   # CREATE DATABASE
   def test_create_database
+    # bad options
+    assert_raise ArgumentError do @client.create_database(:database => 'UniT', :storage => :foo); end
+    assert_raise ArgumentError do @client.create_database(:database => 'UniT', :type => :foo); end
+
     assert_nothing_thrown do
       @client.create_database :database => 'UniT', :user => 'root', :password => 'root'
     end
@@ -88,6 +92,12 @@ class TestDatabase < Test::Unit::TestCase
       @client.connect :database => 'UniT', :user => 'admin', :password => 'admin'
     end
     @client.delete_database({:database => 'UniT', :user => 'root', :password => 'root'})
+
+    # create non-default DB: storage=local;type=graph
+    assert_nothing_thrown do
+      @client.create_database :database => 'UniT', :user => 'root', :password => 'root', :storage => :local, :type => :graph
+      @client.delete_database :database => 'UniT', :user => 'root', :password => 'root'
+    end
   end
 
 

data/test/test_ddo.rb

@@ -110,7 +110,6 @@ class TestDdo < Test::Unit::TestCase
     assert_raise Orientdb4r::NotFoundError do @client.get_class(CLASS); end # no info more
     # the class is not visible in class list delivered by connect
     db_info = @client.get_database
-puts db_info['classes'].class
     assert db_info['classes'].select { |i| i.name == CLASS }.empty?
 
     # CLASS extends super_class
@@ -163,7 +162,7 @@ puts db_info['classes'].class
     assert_nothing_thrown do
       @client.create_class(CLASS) do |c|
         c.property 'prop1', :integer
-        c.property 'prop2', :string, :mandatory => true, :notnull => true, :min => 1, :max => 99
+        c.property 'prop2', :string, :mandatory => true, :notnull => true, :readonly => true, :min => 1, :max => 99
         c.link     'user',  :linkset, 'OUser', :mandatory => true
       end
     end
@@ -175,6 +174,7 @@ puts db_info['classes'].class
     assert_equal 'INTEGER', prop1.type
     assert !prop1.mandatory
     assert !prop1.not_null
+    assert !prop1.read_only
     assert_nil prop1.min
     assert_nil prop1.max
     assert_nil prop1.linked_class
@@ -183,6 +183,7 @@ puts db_info['classes'].class
     assert_equal 'STRING', prop2.type
     assert prop2.mandatory
     assert prop2.not_null
+    assert prop2.read_only
     assert_equal '1', prop2.min
     assert_equal '99',  prop2.max
     assert_nil prop2.linked_class
@@ -191,6 +192,7 @@ puts db_info['classes'].class
     assert_equal 'LINKSET', user.type
     assert user.mandatory
     assert !user.not_null
+    assert !user.read_only
     assert_nil user.min
     assert_nil user.max
     assert_equal 'OUser', user.linked_class

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orientdb4r
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Vaclav Sykora
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -71,7 +71,8 @@ files:
 - test/test_loadbalancing.rb
 - test/test_utils.rb
 homepage: http://github.com/veny/orientdb4r
-licenses: []
+licenses:
+- Apache License, v2.0
 metadata: {}
 post_install_message: 
 rdoc_options: