orientdb 0.0.19-jruby → 0.0.20-jruby

data/VERSION

@@ -1 +1 @@
-0.0.19
+0.0.20

data/lib/orientdb/constants.rb

@@ -5,6 +5,7 @@ module OrientDB
   DocumentDatabasePool   = com.orientechnologies.orient.core.db.document.ODatabaseDocumentPool
   DocumentDatabasePooled = com.orientechnologies.orient.core.db.document.ODatabaseDocumentTxPooled
   Document               = com.orientechnologies.orient.core.record.impl.ODocument
+  IndexType              = com.orientechnologies.orient.core.metadata.schema.OClass::INDEX_TYPE
   OClassImpl             = com.orientechnologies.orient.core.metadata.schema.OClassImpl
   LocalStorage           = com.orientechnologies.orient.core.storage.impl.local.OStorageLocal
   LocalCluster           = com.orientechnologies.orient.core.storage.impl.local.OClusterLocal
@@ -20,37 +21,27 @@ module OrientDB
   SQLSynchQuery          = com.orientechnologies.orient.core.sql.query.OSQLSynchQuery
   User                   = com.orientechnologies.orient.core.metadata.security.OUser
 
-  STORAGE_TYPES = %w{ LOGICAL MEMORY PHYSICAL }.inject({ }) { |h, s| h[s.downcase.to_sym] = ClusterType.const_get s; h }
-
-  FIELD_TYPES = {
-    :binary        => "BINARY",
+  INDEX_TYPES   = IndexType.constants.inject({ }) { |h, s| h[s.downcase.to_sym] = IndexType.const_get s; h }
+  STORAGE_TYPES = ClusterType.constants.inject({ }) { |h, s| h[s.downcase.to_sym] = ClusterType.const_get s; h }
+  FIELD_TYPES   = SchemaType.constants.inject({ }) { |h, s| h[s.downcase.to_sym] = SchemaType.const_get s; h }
+  {
     :bool          => "BOOLEAN",
-    :boolean       => "BOOLEAN",
     :double        => "BYTE",
-    :date          => "DATE",
     :datetime      => "DATE",
     :decimal       => "FLOAT",
-    :double        => "DOUBLE",
-    :embedded      => "EMBEDDED",
     :embedded_list => "EMBEDDEDLIST",
     :list          => "EMBEDDEDLIST",
     :embedded_map  => "EMBEDDEDMAP",
     :map           => "EMBEDDEDMAP",
     :embedded_set  => "EMBEDDEDSET",
     :set           => "EMBEDDEDSET",
-    :float         => "FLOAT",
     :int           => "INTEGER",
-    :integer       => "INTEGER",
-    :link          => "LINK",
     :link_list     => "LINKLIST",
     :link_map      => "LINKMAP",
     :link_set      => "LINKSET",
-    :long          => "LONG",
-    :short         => "SHORT",
-    :string        => "STRING",
-  }.inject({ }) do |h, (k, v)|
-    h[k] = SchemaType.const_get v
-    h
+  }.map do |k,v|
+    FIELD_TYPES[k] = SchemaType.const_get(v) unless FIELD_TYPES.key?(k)
   end
 
+
 end

data/lib/orientdb/oclass.rb

@@ -32,10 +32,10 @@ module OrientDB
       prop.set_max options[:max].to_s unless options[:max].nil?
       prop.set_mandatory !!options[:mandatory] unless options[:mandatory].nil?
       prop.set_not_null options[:not_null] unless options[:not_null].nil?
-      #unless options[:index].nil?
-      #  index_type = options[:index] == true ? INDEX_TYPES[:notunique] : INDEX_TYPES[options[:index]]
-      #  prop.createIndex index_type
-      #end
+      unless options[:index].nil?
+        index_type = options[:index] == true ? INDEX_TYPES[:notunique] : INDEX_TYPES[options[:index]]
+        prop.createIndex index_type
+      end
 
       self
     end

data/lib/orientdb/version.rb

@@ -1,3 +1,3 @@
 module OrientDB
-  VERSION = "0.0.19"
+  VERSION = File.read File.expand_path(File.join(OrientDB::GEM_PATH, '..', 'VERSION'))
 end

data/orientdb.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orientdb}
-  s.version = "0.0.19"
+  s.version = "0.0.20"
   s.platform = %q{jruby}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Adrian Madrid}]
-  s.date = %q{2011-12-10}
+  s.date = %q{2011-12-12}
   s.description = %q{Simple JRuby wrapper for the OrientDB.}
   s.email = [%q{aemadrid@gmail.com}]
   s.executables = [%q{orientdb_console}]
@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
     "lib/jars/orientdb-server-1.0rc7.jar",
     "lib/jars/orientdb-tools-1.0rc7.jar",
     "lib/jars/persistence-api-1.0.jar",
-    "lib/old/constants.rb",
     "lib/orientdb.rb",
     "lib/orientdb/constants.rb",
     "lib/orientdb/database.rb",

data/spec/database_spec.rb

@@ -18,7 +18,7 @@ describe "OrientDB" do
     it "should create a valid simple descendant table" do
       exp_class = "#<OrientDB::OClassImpl:customer super=person tab=FLOAT name=STRING>"
       exp_props = [
-        "#<OrientDB::Propery:tab type=decimal indexed=false mandatory=false not_null=false>",
+        "#<OrientDB::Propery:tab type=float indexed=false mandatory=false not_null=false>",
         "#<OrientDB::Propery:name type=string indexed=false mandatory=false not_null=false>"
       ]
       @customer_class.to_s.should == exp_class
@@ -26,12 +26,12 @@ describe "OrientDB" do
     end
 
     it "should create a complex table" do
-      exp_class = "#<OrientDB::OClassImpl:invoice total=FLOAT sold_on=DATE lines=LINKLIST number=INTEGER customer=LINK>"
+      exp_class = "#<OrientDB::OClassImpl:invoice total=FLOAT sold_on=DATE lines=LINKLIST number=INTEGER(idx) customer=LINK>"
       exp_props = [
-        "#<OrientDB::Propery:total type=decimal indexed=false mandatory=false not_null=false>", 
-        "#<OrientDB::Propery:sold_on type=date indexed=false mandatory=false not_null=false>", 
-        "#<OrientDB::Propery:lines type=link_list indexed=false mandatory=false not_null=false>", 
-        "#<OrientDB::Propery:number type=int indexed=false mandatory=true not_null=false>",
+        "#<OrientDB::Propery:total type=float indexed=false mandatory=false not_null=false>",
+        "#<OrientDB::Propery:sold_on type=date indexed=false mandatory=false not_null=false>",
+        "#<OrientDB::Propery:lines type=linklist indexed=false mandatory=false not_null=false>",
+        "#<OrientDB::Propery:number type=integer indexed=true mandatory=true not_null=false>",
         "#<OrientDB::Propery:customer type=link indexed=false mandatory=false not_null=true>"
       ]
       @invoice_class.to_s.should == exp_class

data/spec/spec_helper.rb

@@ -53,15 +53,8 @@ unless defined?(SPEC_HELPER_LOADED)
                                           :number   => {:type => :int, :mandatory => true, :index => true},
                                           :customer => {:type => @customer_class, :not_null => true},
                                           :sold_on  => :date,
-                                          :total    => {:type => :float}, # , :min => java.lang.Float.new('0.01'), :max => java.lang.Float.new('1000.0')
+                                          :total    => {:type => :float},
                                           :lines    => [:link_list, @line_class]
-
-      #@person_class   = DB.recreate_class :person
-      #@customer_class = DB.recreate_class :customer
-      #@employee_class = DB.recreate_class :employee
-      #@product_class  = DB.recreate_class :product
-      #@line_class     = DB.recreate_class :invoice_line
-      #@invoice_class  = DB.recreate_class :invoice
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: orientdb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.19
+  version: 0.0.20
 platform: jruby
 authors: 
   - Adrian Madrid
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-10 00:00:00 Z
+date: 2011-12-12 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: awesome_print
@@ -60,7 +60,6 @@ files:
   - lib/jars/orientdb-server-1.0rc7.jar
   - lib/jars/orientdb-tools-1.0rc7.jar
   - lib/jars/persistence-api-1.0.jar
-  - lib/old/constants.rb
   - lib/orientdb.rb
   - lib/orientdb/constants.rb
   - lib/orientdb/database.rb

data/lib/old/constants.rb

@@ -1,7 +0,0 @@
-module OrientDB
-
-  #IndexType              = com.orientechnologies.orient.core.metadata.schema::OProperty::INDEX_TYPE
-
-  #INDEX_TYPES            = %w{ FULLTEXT NOTUNIQUE UNIQUE }.inject({}) { |h, s| h[s.downcase.to_sym] = IndexType.const_get s; h }
-
-end