orientdb 0.0.7-jruby → 0.0.8-jruby

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/orientdb.rb

@@ -21,7 +21,9 @@ require 'orientdb/version'
 require 'orientdb/user'
 require 'orientdb/property'
 require 'orientdb/schema'
+require 'orientdb/storage'
 require 'orientdb/database'
+require 'orientdb/record'
 require 'orientdb/document'
 require 'orientdb/sql_query'
 require 'orientdb/oclass'

data/lib/orientdb/constants.rb

@@ -1,22 +1,29 @@
 module OrientDB
 
-  ClusterType   = com.orientechnologies.orient.core.storage.OStorage::CLUSTER_TYPE
-  Database      = com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx
-  DatabasePool  = com.orientechnologies.orient.core.db.document.ODatabaseDocumentPool
-  Document      = com.orientechnologies.orient.core.record.impl.ODocument
-  IndexType     = com.orientechnologies.orient.core.metadata.schema.OProperty::INDEX_TYPE
-  OClass        = com.orientechnologies.orient.core.metadata.schema.OClass
-  Property      = com.orientechnologies.orient.core.metadata.schema.OProperty
-  Schema        = com.orientechnologies.orient.core.metadata.schema.OSchema
-  SchemaType    = com.orientechnologies.orient.core.metadata.schema.OType
-  SQLQuery      = com.orientechnologies.orient.core.sql.query.OSQLSynchQuery
-  SQLCommand    = com.orientechnologies.orient.core.sql.OCommandSQL
-  User          = com.orientechnologies.orient.core.metadata.security.OUser
+  ClusterType    = com.orientechnologies.orient.core.storage.OStorage::CLUSTER_TYPE
+  Database       = com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx
+  DatabasePool   = com.orientechnologies.orient.core.db.document.ODatabaseDocumentPool
+  Document       = com.orientechnologies.orient.core.record.impl.ODocument
+  IndexType      = com.orientechnologies.orient.core.metadata.schema.OProperty::INDEX_TYPE
+  OClass         = com.orientechnologies.orient.core.metadata.schema.OClass
+  LocalStorage   = com.orientechnologies.orient.core.storage.impl.local.OStorageLocal
+  LocalCluster   = com.orientechnologies.orient.core.storage.impl.local.OClusterLocal
+  LogicalCluster = com.orientechnologies.orient.core.storage.impl.local.OClusterLogical
+  Property       = com.orientechnologies.orient.core.metadata.schema.OProperty
+  RecordList     = com.orientechnologies.orient.core.db.record.ORecordTrackedList
+  RecordMap      = com.orientechnologies.orient.core.db.record.ORecordTrackedMap
+  RecordSet      = com.orientechnologies.orient.core.db.record.ORecordTrackedSet
+  RemoteStorage  = com.orientechnologies.orient.client.remote.OStorageRemote
+  Schema         = com.orientechnologies.orient.core.metadata.schema.OSchema
+  SchemaType     = com.orientechnologies.orient.core.metadata.schema.OType
+  SQLQuery       = com.orientechnologies.orient.core.sql.query.OSQLSynchQuery
+  SQLCommand     = com.orientechnologies.orient.core.sql.OCommandSQL
+  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 }
-  INDEX_TYPES   = %w{ FULLTEXT NOTUNIQUE UNIQUE }.inject({}) { |h, s| h[s.downcase.to_sym] = IndexType.const_get s; h }
+  STORAGE_TYPES  = %w{ LOGICAL MEMORY PHYSICAL }.inject({}) { |h, s| h[s.downcase.to_sym] = ClusterType.const_get s; h }
+  INDEX_TYPES    = %w{ FULLTEXT NOTUNIQUE UNIQUE }.inject({}) { |h, s| h[s.downcase.to_sym] = IndexType.const_get s; h }
 
-  FIELD_TYPES   = {
+  FIELD_TYPES    = {
     :binary        => "BINARY",
     :bool          => "BOOLEAN",
     :boolean       => "BOOLEAN",

data/lib/orientdb/database.rb

@@ -105,8 +105,8 @@ class OrientDB::Database
     OrientDB::OClass.create self, klass_name.to_s, fields
   end
 
-  def get_or_create_class(klass_name)
-    get_class(klass_name) || create_class(klass_name)
+  def get_or_create_class(klass_name, fields = {})
+    get_class(klass_name) || create_class(klass_name, fields)
   end
 
   alias :each_in_class :browseClass

data/lib/orientdb/document.rb

@@ -29,8 +29,7 @@ module OrientDB
     end
 
     def method_missing(method_name, *args, &blk)
-      return self[method_name] if contains_field(method_name.to_s)
-      return nil if schema_class.exists_property?(method_name.to_s)
+      return self[method_name] if field?(method_name)
 
       match = method_name.to_s.match(/(.*?)([?=!]?)$/)
       case match[2]

data/lib/orientdb/oclass.rb

@@ -10,17 +10,12 @@ module OrientDB
           FIELD_TYPES[value]
         else
           FIELD_TYPES[value.to_s.to_sym]
-      end
+             end
       raise "Uknown schema type for [#{value}]" unless type
       type
     end
 
     def add(property_name, type, options = {})
-      if type.is_a?(Hash)
-        real_type = type.delete(:type)
-        return add(property_name, real_type, type)
-      end
-
       property_name = property_name.to_s
       if exists_property(property_name)
         puts "We already have that property name [#{property_name}]"
@@ -28,14 +23,15 @@ module OrientDB
       end
 
       case type
+        when SchemaType
+          prop = create_property property_name, type
         when Symbol
           prop = create_property property_name, type_for(type)
-        when OrientDB::OClass
+        when OClass
           prop = create_property property_name, type_for(:link), type
         when Array
-          type[0] = type_for(type[0]) if type[0].is_a?(Symbol)
-          type[1] = type_for(type[1]) if type[1].is_a?(Symbol)
-          prop = create_property property_name, *type
+          type, sub_type = type_for(type.first), type_for(type.last)
+          prop = create_property property_name, type, sub_type
         else
           raise "ERROR! Unknown type [ #{property_name} | #{type} : #{type.class.name} ]"
       end
@@ -78,19 +74,28 @@ module OrientDB
     class << self
 
       def create(db, name, fields = {})
+        puts "create [#{name}], #{fields.inspect}"
         name        = name.to_s
         add_cluster = fields.delete :add_cluster
         add_cluster = true if add_cluster.nil?
+        use_cluster = fields.delete :use_cluster
+        puts "use_cluster : #{use_cluster}"
 
         if db.schema.exists_class? name
           klass = db.get_class name
         else
-          if add_cluster && !db.storage.cluster_names.include?(name.downcase)
+          if use_cluster
+            cluster = db.storage.get_cluster use_cluster
+            klass   = db.schema.create_class name, use_cluster
+            puts "created and used cluster [#{cluster}] for [#{klass}]"
+          elsif add_cluster && !db.storage.cluster_names.include?(name.downcase)
             cluster = db.storage.add_cluster name.downcase, STORAGE_TYPES[:physical]
             klass   = db.schema.create_class name, cluster
+            puts "created and added cluster [#{cluster}] for [#{klass}]"
           else
             klass   = db.schema.create_class name
-            cluster = db.storage.get_cluster_by_name name.downcase
+            cluster = db.storage.get_cluster klass.cluster_ids.first
+            puts "created and got cluster [#{cluster}] for [#{klass}]"
           end
         end
 
@@ -101,7 +106,16 @@ module OrientDB
 
         unless fields.empty?
           fields.each do |property_name, type|
-            klass.add property_name, type
+            case type
+              when Symbol, Array, OrientDB::OClass
+                klass.add property_name, type
+              when Hash
+                options = type.dup
+                type = options.delete :type
+                klass.add property_name, type, options
+              else
+                raise "Unknown field options [#{type.inspect}]"
+            end
           end
           db.schema.save
         end

data/lib/orientdb/record.rb

@@ -0,0 +1,30 @@
+module OrientDB
+
+  class RecordList
+    def jruby_value
+      map
+    end
+
+    def inspect
+      "#<OrientDB::RecordList:#{toString}>"
+    end
+
+    alias :to_s :inspect
+  end
+
+  class RecordMap
+    def inspect
+      "#<OrientDB::RecordMap:#{toString}>"
+    end
+
+    alias :to_s :inspect
+  end
+
+  class RecordSet
+    def inspect
+      "#<OrientDB::RecordSet:#{toString}>"
+    end
+
+    alias :to_s :inspect
+  end
+end

data/lib/orientdb/schema.rb

@@ -2,6 +2,12 @@ module OrientDB
 
   class Schema
 
+    def inspect
+      "#<OrientDB::Schema:#{toString}>"
+    end
+
+    alias :to_s :inspect
+
   end
 
 end

data/lib/orientdb/storage.rb

@@ -0,0 +1,61 @@
+module OrientDB
+
+  class LocalStorage
+
+    def get_cluster(name_or_id)
+      case name_or_id
+        when Integer
+          getClusterById name_or_id
+        else
+          getClusterByName name_or_id.to_s
+      end
+    end
+
+    def inspect
+      "#<OrientDB::LocalStorage:#{hashCode}>"
+    end
+
+    alias :to_s :inspect
+
+  end
+
+  class RemoteStorage
+
+    def get_cluster(name_or_id)
+      case name_or_id
+        when Integer
+          getClusterById name_or_id
+        else
+          getClusterByName name_or_id.to_s
+      end
+    end
+
+    def inspect
+      "#<OrientDB::RemoteStorage:#{hashCode}>"
+    end
+
+    alias :to_s :inspect
+
+  end
+
+  class LocalCluster
+
+    def inspect
+      "#<OrientDB::LocalCluster:#{getId} name=#{getName.inspect}>"
+    end
+
+    alias :to_s :inspect
+
+  end
+
+  class LogicalCluster
+
+    def inspect
+      "#<OrientDB::LogicalCluster:#{getId} name=#{getName.inspect}>"
+    end
+
+    alias :to_s :inspect
+
+  end
+
+end

data/orientdb.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orientdb}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
   s.platform = %q{jruby}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Madrid"]
-  s.date = %q{2011-01-13}
+  s.date = %q{2011-01-14}
   s.default_executable = %q{orientdb_console}
   s.description = %q{Simple JRuby wrapper for the OrientDB.}
   s.email = ["aemadrid@gmail.com"]
@@ -43,8 +43,10 @@ Gem::Specification.new do |s|
     "lib/orientdb/ext.rb",
     "lib/orientdb/oclass.rb",
     "lib/orientdb/property.rb",
+    "lib/orientdb/record.rb",
     "lib/orientdb/schema.rb",
     "lib/orientdb/sql_query.rb",
+    "lib/orientdb/storage.rb",
     "lib/orientdb/user.rb",
     "lib/orientdb/version.rb",
     "orientdb.gemspec",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 7
-  version: 0.0.7
+    - 8
+  version: 0.0.8
 platform: jruby
 authors: 
   - Adrian Madrid
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 -07:00
+date: 2011-01-14 00:00:00 -07:00
 default_executable: orientdb_console
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -76,8 +76,10 @@ files:
   - lib/orientdb/ext.rb
   - lib/orientdb/oclass.rb
   - lib/orientdb/property.rb
+  - lib/orientdb/record.rb
   - lib/orientdb/schema.rb
   - lib/orientdb/sql_query.rb
+  - lib/orientdb/storage.rb
   - lib/orientdb/user.rb
   - lib/orientdb/version.rb
   - orientdb.gemspec