orientdb 0.0.15-jruby → 0.0.16-jruby

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/lib/orientdb.rb

@@ -16,6 +16,7 @@ module OrientDB
 end
 
 require 'orientdb/ext'
+require 'orientdb/rid'
 require 'orientdb/constants'
 require 'orientdb/version'
 require 'orientdb/user'

data/lib/orientdb/oclass.rb

@@ -3,25 +3,33 @@ module OrientDB
   class OClass
 
     def type_for(value)
+      value = value.oclass if value.respond_to?(:oclass)
       type = case value
-        when OrientDB::SchemaType, OrientDB::OClass
-          value
-        when Symbol
-          FIELD_TYPES[value]
-        else
-          FIELD_TYPES[value.to_s.to_sym]
-        end
-      raise "Uknown schema type for [#{value}]" unless type
+               when OrientDB::SchemaType, OrientDB::OClass
+                 value
+               when String
+                 if schema.exists_class?(value)
+                   schema.get_class(value)
+                 else
+                   FIELD_TYPES[value.to_sym]
+                 end
+               when Symbol
+                 FIELD_TYPES[value]
+               else
+                 FIELD_TYPES[value.to_s.to_sym]
+             end
+      raise "Uknown schema type for [#{value}] (#{value.class.name})" unless type
       type
     end
 
-    def add(property_name, type, options = {})
+    def add(property_name, type, options = { })
       property_name = property_name.to_s
       if exists_property(property_name)
         puts "We already have that property name [#{property_name}]"
         return false
       end
 
+      type = type.oclass if type.respond_to?(:oclass)
       case type
         when SchemaType
           prop = create_property property_name, type
@@ -73,7 +81,7 @@ module OrientDB
 
     class << self
 
-      def create(db, name, fields = {})
+      def create(db, name, fields = { })
         name        = name.to_s
         add_cluster = fields.delete :add_cluster
         add_cluster = true if add_cluster.nil?
@@ -83,12 +91,12 @@ module OrientDB
           klass = db.get_class name
         else
           if use_cluster
-            klass   = db.schema.create_class name, use_cluster
+            klass = db.schema.create_class name, use_cluster
           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
           else
-            klass   = db.schema.create_class name
+            klass = db.schema.create_class name
           end
         end
 
@@ -104,7 +112,7 @@ module OrientDB
                 klass.add property_name, type
               when Hash
                 options = type.dup
-                type = options.delete :type
+                type    = options.delete :type
                 klass.add property_name, type, options
               else
                 raise "Unknown field options [#{type.inspect}]"

data/lib/orientdb/rid.rb

@@ -0,0 +1,46 @@
+class OrientDB::RID
+
+  attr_reader :cluster_id, :document_id
+
+  def initialize(rid_str = '-1:-1')
+    idx = rid_str.index(':')
+    if idx
+      self.cluster_id  = rid_str[0, idx]
+      self.document_id = rid_str[idx+1..-1]
+    else
+      raise "Unknown parameters #{args.inspect}"
+    end
+  end
+
+  def cluster_id=(value)
+    @cluster_id = value.to_s.strip.to_i
+  end
+
+  def document_id=(value)
+    @document_id = value.to_s.strip.to_i
+  end
+
+  def inspect
+    "#{cluster_id}:#{@document_id}"
+  end
+
+  def unsaved?
+    to_s == '-1:-1'
+  end
+
+  def saved?
+    cluster_id > 0 && document_id >= 0
+  end
+
+  def valid?
+    saved? || unsaved?
+  end
+
+  alias :to_s :inspect
+end
+
+class String
+  def valid_orientdb_rid?
+    OrientDB::RID.new(self).valid?
+  end
+end

data/orientdb.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orientdb}
-  s.version = "0.0.15"
+  s.version = "0.0.16"
   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-26}
+  s.date = %q{2011-02-01}
   s.default_executable = %q{orientdb_console}
   s.description = %q{Simple JRuby wrapper for the OrientDB.}
   s.email = ["aemadrid@gmail.com"]
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
     "lib/orientdb/oclass.rb",
     "lib/orientdb/property.rb",
     "lib/orientdb/record.rb",
+    "lib/orientdb/rid.rb",
     "lib/orientdb/schema.rb",
     "lib/orientdb/sql.rb",
     "lib/orientdb/sql/common.rb",

data/spec/document_spec.rb

@@ -2,6 +2,34 @@ require File.expand_path("../spec_helper", __FILE__)
 
 describe "OrientDB" do
 
+  describe "RID" do
+    it "should create valid empty" do
+      rid = OrientDB::RID.new
+      rid.to_s == '-1:-1'
+      rid.valid?.should == true
+    end
+
+    it "should create valid saved" do
+      rid = OrientDB::RID.new '5:40'
+      rid.to_s == '5:40'
+      rid.valid?.should == true
+      rid.saved?.should == true
+      rid.unsaved?.should == false
+      rid.cluster_id.should == 5
+      rid.document_id.should == 40
+    end
+
+    it "should create valid unsaved" do
+      rid = OrientDB::RID.new '-1:-1'
+      rid.to_s == '5:40'
+      rid.valid?.should == true
+      rid.saved?.should == false
+      rid.unsaved?.should == true
+      rid.cluster_id.should == -1
+      rid.document_id.should == -1
+    end
+  end
+
   describe "Document" do
 
     before :all do

metadata

@@ -2,7 +2,7 @@
 name: orientdb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.15
+  version: 0.0.16
 platform: jruby
 authors: 
   - Adrian Madrid
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -07:00
+date: 2011-02-01 00:00:00 -07:00
 default_executable: orientdb_console
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
   - lib/orientdb/oclass.rb
   - lib/orientdb/property.rb
   - lib/orientdb/record.rb
+  - lib/orientdb/rid.rb
   - lib/orientdb/schema.rb
   - lib/orientdb/sql.rb
   - lib/orientdb/sql/common.rb