orientdb 0.0.6-jruby → 0.0.7-jruby

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/orientdb/constants.rb

@@ -27,8 +27,11 @@ module OrientDB
     :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",

data/lib/orientdb/document.rb

@@ -16,6 +16,18 @@ module OrientDB
       field field_name.to_s, value
     end
 
+    def field?(name)
+      contains_field(name.to_s) || schema_class.exists_property?(name.to_s)
+    end
+
+    def respond_to?(method_name)
+      return true if field?(method_name.to_s)
+      match = method_name.to_s.match(/(.*?)([?=!]?)$/)
+      return true if match[2] == '='
+      return true if match[2] == '?' && field?(match[1])
+      super
+    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)
@@ -25,7 +37,7 @@ module OrientDB
         when "="
           self[match[1]] =  args.first
         when "?"
-          !!self[match[1]]
+          field(match[1]) ? !!self[match[1]] : super
         else
           super
       end

data/lib/orientdb/oclass.rb

@@ -2,7 +2,25 @@ module OrientDB
 
   class OClass
 
-    def add(property_name, type)
+    def type_for(value)
+      type = case value
+        when SchemaType
+          value
+        when Symbol
+          FIELD_TYPES[value]
+        else
+          FIELD_TYPES[value.to_s.to_sym]
+      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}]"
@@ -11,31 +29,26 @@ module OrientDB
 
       case type
         when Symbol
-          create_property property_name, FIELD_TYPES[type]
+          prop = create_property property_name, type_for(type)
         when OrientDB::OClass
-          create_property property_name, FIELD_TYPES[:link], type
+          prop = create_property property_name, type_for(:link), type
         when Array
-          type[0] = FIELD_TYPES[type[0]] if type[0].is_a?(Symbol)
-          type[1] = FIELD_TYPES[type[1]] if type[1].is_a?(Symbol)
-          create_property property_name, *type
-        when Hash
-          raise "Missing property type for [#{property_name}]" unless type[:type]
-          if type[:type].is_a?(OrientDB::OClass)
-            prop = create_property property_name, FIELD_TYPES[:link], type[:type]
-          else
-            prop = create_property property_name, FIELD_TYPES[type[:type]]
-          end
-          prop.set_min type[:min].to_s unless type[:min].nil?
-          prop.set_max type[:max].to_s unless type[:max].nil?
-          prop.set_mandatory !!type[:mandatory] unless type[:mandatory].nil?
-          prop.set_not_null type[:not_null] unless type[:not_null].nil?
-          unless type[:index].nil?
-            index_type = type[:index] == true ? INDEX_TYPES[:notunique] : INDEX_TYPES[type[:index]]
-            prop.createIndex index_type
-          end
+          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
         else
-          puts "ERROR! Unknown type [ #{property_name} | #{type} : #{type.class.name} ]"
+          raise "ERROR! Unknown type [ #{property_name} | #{type} : #{type.class.name} ]"
       end
+
+      prop.set_min options[:min].to_s unless options[:min].nil?
+      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
+
       self
     end
 

data/orientdb.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orientdb}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
   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-12}
+  s.date = %q{2011-01-13}
   s.default_executable = %q{orientdb_console}
   s.description = %q{Simple JRuby wrapper for the OrientDB.}
   s.email = ["aemadrid@gmail.com"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 6
-  version: 0.0.6
+    - 7
+  version: 0.0.7
 platform: jruby
 authors: 
   - Adrian Madrid
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -07:00
+date: 2011-01-13 00:00:00 -07:00
 default_executable: orientdb_console
 dependencies: 
   - !ruby/object:Gem::Dependency