orientdb 0.0.4-jruby → 0.0.5-jruby

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Adrian Madrid
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,10 +1,56 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'rubygems'
+require 'rake'
 
-require 'spec/rake/spectask'
+version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = Dir.glob('spec/**/*_spec.rb')
-  t.spec_opts << '--format specdoc'
-#  t.rcov = true
-end
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name                      = "orientdb"
+    gem.platform                  = "jruby"
+    gem.authors                   = ["Adrian Madrid"]
+    gem.email                     = ["aemadrid@gmail.com"]
+    gem.homepage                  = "http://rubygems.org/gems/orientdb"
+    gem.summary                   = "JRuby wrapper for OrientDB"
+    gem.description               = "Simple JRuby wrapper for the OrientDB."
+
+    gem.required_rubygems_version = ">= 1.3.6"
+    gem.rubyforge_project         = "orientdb"
+
+    gem.add_development_dependency "awesome_print"
+    gem.add_development_dependency "rspec", ">= 2.4"
+
+    gem.files        = `git ls-files`.split("\n")
+    gem.test_files   = Dir["test/test*.rb"]
+    gem.executables  = `git ls-files`.split("\n").map { |f| f =~ /^bin\/(.*)/ ? $1 : nil }.compact
+    gem.require_path = 'lib'
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+desc "Run all examples using rcov"
+RSpec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
+  t.rcov      = true
+  t.rcov_opts = %[-Ilib -Ispec --exclude "spec/*,gems/*" --text-report --sort coverage --aggregate coverage.data]
+end
+
+task :cleanup_rcov_files do
+  rm_rf 'coverage.data'
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = "orientdb #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.0.5

data/bin/orientdb_console

@@ -12,7 +12,7 @@ if ARGV.include?('test:db')
 
   require 'fileutils'
   FileUtils.mkdir_p TEST_DB_PATH
-  @db = OrientDB::Database.new("local:#{TEST_DB_PATH}/test").create
+  DB = OrientDB::Database.new("local:#{TEST_DB_PATH}/test").create
 end
 
 include OrientDB

data/lib/orientdb.rb

@@ -4,7 +4,7 @@ $: << File.dirname(__FILE__)
 $: << File.expand_path('../../jars/', __FILE__)
 
 require 'java'
-require 'orientdb-client-0.9.23'
+require 'orientdb-client-0.9.24'
 
 module OrientDB
 
@@ -16,9 +16,12 @@ module OrientDB
 end
 
 require 'orientdb/ext'
+require 'orientdb/constants'
 require 'orientdb/version'
 require 'orientdb/user'
+require 'orientdb/property'
 require 'orientdb/schema'
 require 'orientdb/database'
 require 'orientdb/document'
+require 'orientdb/sql_query'
 require 'orientdb/oclass'

data/lib/orientdb/constants.rb

@@ -0,0 +1,47 @@
+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
+
+  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   = {
+    :binary        => "BINARY",
+    :bool          => "BOOLEAN",
+    :boolean       => "BOOLEAN",
+    :double        => "BYTE",
+    :date          => "DATE",
+    :datetime      => "DATE",
+    :decimal       => "FLOAT",
+    :double        => "DOUBLE",
+    :embedded      => "EMBEDDED",
+    :embedded_list => "EMBEDDEDLIST",
+    :embedded_map  => "EMBEDDEDMAP",
+    :embedded_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
+  end
+
+end

data/lib/orientdb/database.rb

@@ -1,104 +1,141 @@
-module OrientDB
+class OrientDB::Database
 
-  Database      = com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx
+  def auth(username, password)
+    open username, password
+  end
 
-  SQLQuery      = com.orientechnologies.orient.core.sql.query.OSQLSynchQuery
+  alias_method :native_command, :command
 
-  class Database
+  def command(sql_command = nil)
+    sql_command = prepare_sql_command sql_command
+    exc_cmd     = sql_command.execute
+    native_command exc_cmd
+  end
 
-    def auth(username, password)
-      open username, password
+  def prepare_sql_command(sql_command)
+    return if sql_command.nil?
+    case sql_command
+      when SQLCommand
+        sql_command
+      when String
+        SQLCommand.new sql_command
+      else
+        raise "Unknown command type"
     end
+  end
 
-    alias_method :native_query, :query
+  alias_method :native_query, :query
 
-    def query(sql_query = nil)
-      sql_query = prepare_sql_query sql_query
-      native_query sql_query
-    end
+  def query(sql_query = nil)
+    sql_query = prepare_sql_query sql_query
+    native_query sql_query
+  end
 
-    alias :find :query
+  alias :find :query
+  alias :all :query
 
-    def first(sql_query = nil)
-      sql_query = prepare_sql_query sql_query
-      query(sql_query).setLimit(1).map { |x| x }.first
-    end
+  def first(sql_query = nil)
+    sql_query = prepare_sql_query(sql_query).setLimit(1)
+    query(sql_query).first
+  end
 
-    def prepare_sql_query(sql_query)
-      return if sql_query.nil?
-      case sql_query
-        when SQLQuery
-          sql_query
-        when String
-          SQLQuery.new sql_query
-        when Hash
-          SQLQuery.new sql_query_from_hash(sql_query)
-        else
-          raise "Unknown query type"
-      end
+  def prepare_sql_query(sql_query)
+    return if sql_query.nil?
+    case sql_query
+      when com.orientechnologies.orient.core.sql.query.OSQLSynchQuery
+        sql_query
+      when String
+        com.orientechnologies.orient.core.sql.query.OSQLSynchQuery.new sql_query
+      when Hash
+        com.orientechnologies.orient.core.sql.query.OSQLSynchQuery.new sql_query_from_hash(sql_query)
+      else
+        raise "Unknown query type"
     end
+  end
 
-    def sql_query_from_hash(options = {})
-      klass_name = options.delete :class
-      raise "Missing class name" unless klass_name
-      columns    = options.delete(:columns) || '*'
-      order      = options.delete :order
-      order_sql  = order ? " ORDER BY #{order}" : ''
-      fields     = options.map do |field, value|
-        cmp = '='
-        if value.is_a?(String)
-          value = "'" + value + "'"
-          cmp = 'LIKE' if value.index('%')
-        end
-        "#{field} #{cmp} #{value}"
-      end
-      "SELECT #{columns} FROM #{klass_name} WHERE #{fields.join(' AND ')}#{order_sql}"
-    end
+  def sql_query_from_hash(options = {})
+    target = options.delete :oclass
+    raise "Missing oclass name" unless target
+
+    columns    = options.delete(:columns) || '*'
+    order      = options.delete :order
+    order_sql  = order ? " ORDER BY #{order}" : ''
+    limit      = options.delete :limit
+    limit_sql  = limit ? " LIMIT #{limit}" : ''
+    range_low  = options.delete(:range_low) || options.delete(:range)
+    range_high = options.delete :range_high
+    range_sql  = range_low ? " RANGE #{range_low}#{range_high ? ",#{range_high}" : ''}" : ''
+    fields     = options.map { |field, value| "#{field} #{operator_for(value)} #{quote(value)}" }
+    where_sql  = fields.size > 0 ? " WHERE #{fields.join(' AND ')}" : ''
+
+    "SELECT #{columns} FROM #{target}" + where_sql + order_sql + limit_sql + range_sql
+  end
 
-    def schema
-      metadata.schema
+  def operator_for(value)
+    case value
+      when Integer, Float, Symbol
+        "="
+      when String
+        value.index('%') ? "LIKE" : "="
+      when Array
+        "IN"
     end
+  end
 
-    def get_class(klass_name)
-      schema.get_class klass_name.to_s
+  def quote(value)
+    case value
+      when Integer, Float, Symbol
+        value.to_s
+      when String
+        "'#{value}'"
+      when Array
+        "[" + value.map { |x| quote(x) }.join(", ") + "]"
     end
+  end
 
-    def create_class(klass_name, fields = {})
-      OrientDB::OClass.create self, klass_name.to_s, fields
-    end
+  def schema
+    metadata.schema
+  end
 
-    def get_or_create_class(klass_name)
-      get_class(klass_name) || create_class(klass_name)
-    end
+  def get_class(klass_name)
+    schema.get_class klass_name.to_s
+  end
 
-    alias :each_in_class :browseClass
+  def create_class(klass_name, fields = {})
+    OrientDB::OClass.create self, klass_name.to_s, fields
+  end
 
-    def all_in_class(klass_name)
-      browse_class(klass_name.to_s).map
-    end
+  def get_or_create_class(klass_name)
+    get_class(klass_name) || create_class(klass_name)
+  end
 
-    alias :each_in_cluster :browseCluster
+  alias :each_in_class :browseClass
 
-    def all_in_cluster(cluster_name)
-      browse_cluster(cluster_name.to_s).map
-    end
+  def all_in_class(klass_name)
+    browse_class(klass_name.to_s).map
+  end
+
+  alias :each_in_cluster :browseCluster
 
-    class << self
+  def all_in_cluster(cluster_name)
+    browse_cluster(cluster_name.to_s).map
+  end
 
-      def create(database_url)
-        obj = new(database_url)
-        obj.create
-        obj
-      end
+  class << self
 
-      def connect(database_url, username, password)
-        obj = new(database_url)
-        obj.auth(username, password)
-        obj
-      end
+    def create(database_url)
+      obj = new(database_url)
+      obj.create
+      obj
+    end
 
+    def connect(database_url, username, password)
+      obj = new(database_url)
+      obj.auth(username, password)
+      obj
     end
+
   end
+end
 
 
-end

data/lib/orientdb/database_pool.rb

@@ -1,7 +1,5 @@
 module OrientDB
 
-  DatabasePool = com.orientechnologies.orient.core.db.document.ODatabaseDocumentPool
-
   class DatabasePool
 
     def initialize(database_url, username, password)

data/lib/orientdb/document.rb

@@ -1,7 +1,5 @@
 module OrientDB
 
-  Document = com.orientechnologies.orient.core.record.impl.ODocument
-
   class Document
 
     def values
@@ -20,6 +18,8 @@ module OrientDB
 
     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)
+
       match = method_name.to_s.match(/(.*?)([?=!]?)$/)
       case match[2]
         when "="
@@ -31,9 +31,13 @@ module OrientDB
       end
     end
 
+    def rid
+      identity.to_s
+    end
+
     def inspect
-      props = values.map { |k, v| "#{k}:#{v}" }.join(' ')
-      %{#<OrientDB::Document:#{get_class_name}#{props.empty? ? '' : ' ' + props}>}
+      props = values.map { |k, v| "#{k}:#{v.inspect}" }.join(' ')
+      %{#<OrientDB::Document:#{class_name}:#{rid}#{props.empty? ? '' : ' ' + props}>}
     end
 
     alias :to_s :inspect
@@ -43,9 +47,10 @@ module OrientDB
       alias_method :native_new, :new
 
       def new(db, klass_name, fields = {})
-        obj = native_new db, klass_name
+        puts "new : #{db} : #{klass_name} : #{fields.inspect}"
+        obj = native_new db, klass_name.to_s
         fields.each do |name, value|
-          obj.field name, value
+          obj.field name.to_s, value
         end
         obj
       end

data/lib/orientdb/ext.rb

@@ -2,12 +2,12 @@ require 'date'
 
 class Date
   def proxy_object
-    java.util.Date.new year, month - 1, day - 1, 0, 0, 0
+    java.util.Date.new year, month - 1, day, 0, 0, 0
   end
 end
 
 class DateTime
   def proxy_object
-    java.util.Date.new year, month - 1, day - 1, hour, min, sec
+    java.util.Date.new year, month - 1, day, hour, min, sec
   end
 end

data/lib/orientdb/oclass.rb

@@ -1,44 +1,5 @@
 module OrientDB
 
-
-  OClass        = com.orientechnologies.orient.core.metadata.schema.OClass
-
-#  SchemaType    = com.orientechnologies.orient.core.metadata.schema.OType
-  ClusterType   = com.orientechnologies.orient.core.storage.OStorage::CLUSTER_TYPE
-  IndexType     = com.orientechnologies.orient.core.metadata.schema.OProperty::INDEX_TYPE
-
-
-  FIELD_TYPES   = {
-    :binary        => "BINARY",
-    :bool          => "BOOLEAN",
-    :boolean       => "BOOLEAN",
-    :double        => "BYTE",
-    :date          => "DATE",
-    :datetime      => "DATE",
-    :decimal       => "FLOAT",
-    :double        => "DOUBLE",
-    :embedded      => "EMBEDDED",
-    :embedded_list => "EMBEDDEDLIST",
-    :embedded_map  => "EMBEDDEDMAP",
-    :embedded_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
-  end
-
-  STORAGE_TYPES = %w{ LOGICAL MEMORY PHYSICAL }.inject({}) { |h, s| h[s.downcase.to_sym] = ClusterType.const_get s; h }
-  INDEX_TYPES   = %w{ FULLTEXT NOT_UNIQUE UNIQUE }.inject({}) { |h, s| h[s.downcase.to_sym] = IndexType.const_get s; h }
-
   class OClass
 
     def add(property_name, type)
@@ -55,6 +16,7 @@ module OrientDB
           create_property property_name, FIELD_TYPES[: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]
@@ -68,7 +30,7 @@ module OrientDB
           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[:not_unique] : INDEX_TYPES[type[:index]]
+            index_type = type[:index] == true ? INDEX_TYPES[:notunique] : INDEX_TYPES[type[:index]]
             prop.createIndex index_type
           end
         else
@@ -91,13 +53,15 @@ module OrientDB
     end
 
     def inspect
-      props = properties.map { |x| "#{x.name}:#{x.type.to_s.downcase}" }.join(' ')
-      %{#<OrientDB::OClass:#{name}#{props.empty? ? '' : ' ' + props}>}
+      props = properties.map { |x| "#{x.name}=#{x.type.to_s.downcase}#{x.is_indexed? ? '(idx)' : ''}" }.join(' ')
+      "#<OrientDB::OClass:" + name +
+        (getSuperClass ? ' super=' + getSuperClass.name : '') +
+        (props.empty? ? '' : ' ' + props) +
+        ">"
     end
 
     alias :to_s :inspect
 
-
     class << self
 
       def create(db, name, fields = {})
@@ -105,11 +69,16 @@ module OrientDB
         add_cluster = fields.delete :add_cluster
         add_cluster = true if add_cluster.nil?
 
-        if add_cluster
-          cluster = db.storage.add_cluster name.downcase, STORAGE_TYPES[:physical]
-          klass   = db.schema.create_class name, cluster
+        if db.schema.exists_class? name
+          klass = db.get_class name
         else
-          klass = db.schema.create_class name
+          if 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
+            cluster = db.storage.get_cluster_by_name name.downcase
+          end
         end
 
         super_klass = fields.delete :super

data/lib/orientdb/property.rb

@@ -0,0 +1,39 @@
+module OrientDB
+
+  class Property
+
+    def type_short
+      @type_short ||= OrientDB::FIELD_TYPES.select { |k, v| v.name == getType.name }.first.first
+    end
+
+    def linked_type_short
+      @linked_type_short ||= getLinkedType && OrientDB::FIELD_TYPES.select { |k, v| v.name == getLinkedType.name }.first.first
+    end
+
+    def info
+      {
+        :name         => name,
+        :type         => type_short,
+        :index        => indexed? ? getIndex.name : nil,
+        :min          => min,
+        :max          => max,
+        :mandatory    => is_mandatory?,
+        :not_null     => is_not_null?,
+        :linked_type  => linked_type_short,
+        :linked_class => linked_type_short ? getLinkedClass.name : nil,
+      }
+    end
+
+    def inspect
+      "#<OrientDB::Propery:#{name} type=#{type_short} " +
+        "#{linked_type_short ? "linked_type=#{linked_type_short} linked_class=#{getLinkedClass.name}" : ''}" +
+        "indexed=#{is_indexed?} mandatory=#{is_mandatory?} not_null=#{is_not_null}" +
+        "#{min ? " min=#{min}" : ''}#{max ? " max=#{max}" : ''}" +
+        ">"
+    end
+
+    alias :to_s :inspect
+
+  end
+
+end

data/lib/orientdb/schema.rb

@@ -1,6 +1,7 @@
 module OrientDB
 
-  Schema        = com.orientechnologies.orient.core.metadata.schema.OSchema
-  SchemaType    = com.orientechnologies.orient.core.metadata.schema.OType
+  class Schema
+
+  end
 
 end

data/lib/orientdb/sql_query.rb

@@ -0,0 +1,13 @@
+module OrientDB
+
+  class SqlQuery
+
+    def inspect
+      %{#<OrientDB::SqlQuery:#{name} text="#{text}">}
+    end
+
+    alias :to_s :inspect
+
+  end
+
+end

data/lib/orientdb/user.rb

@@ -1,5 +1,3 @@
 module OrientDB
 
-  User = com.orientechnologies.orient.core.metadata.security.OUser
-
 end

data/orientdb.gemspec

@@ -1,26 +1,96 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-require File.expand_path("../lib/orientdb/version", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "orientdb"
-  s.version     = OrientDB::VERSION
-  s.platform    = "jruby"
-  s.authors     = ["Adrian Madrid"]
-  s.email       = ["aemadrid@gmail.com"]
-  s.homepage    = "http://rubygems.org/gems/orientdb"
-  s.summary     = "JRuby wrapper for OrientDB"
-  s.description = "JRuby wrapper for OrientDB"
+  s.name = %q{orientdb}
+  s.version = "0.0.5"
+  s.platform = %q{jruby}
 
-  s.required_rubygems_version = ">= 1.3.6"
-  s.rubyforge_project         = "orientdb"
+  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.default_executable = %q{orientdb_console}
+  s.description = %q{Simple JRuby wrapper for the OrientDB.}
+  s.email = ["aemadrid@gmail.com"]
+  s.executables = ["orientdb_console"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".gitignore",
+    ".rvmrc",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/orientdb_console",
+    "jars/orient-commons-0.9.24.jar",
+    "jars/orientdb-client-0.9.24.jar",
+    "jars/orientdb-core-0.9.24.jar",
+    "jars/orientdb-enterprise-0.9.24.jar",
+    "jars/orientdb-server-0.9.24.jar",
+    "jars/orientdb-tools-0.9.24.jar",
+    "jars/persistence-api-1.0.jar",
+    "lib/orientdb.rb",
+    "lib/orientdb/constants.rb",
+    "lib/orientdb/database.rb",
+    "lib/orientdb/database_pool.rb",
+    "lib/orientdb/document.rb",
+    "lib/orientdb/ext.rb",
+    "lib/orientdb/oclass.rb",
+    "lib/orientdb/property.rb",
+    "lib/orientdb/schema.rb",
+    "lib/orientdb/sql_query.rb",
+    "lib/orientdb/user.rb",
+    "lib/orientdb/version.rb",
+    "orientdb.gemspec",
+    "spec/database_spec.rb",
+    "spec/document_spec.rb",
+    "spec/orientdb_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://rubygems.org/gems/orientdb}
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{orientdb}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{JRuby wrapper for OrientDB}
 
-  s.add_dependency "hashie"
-  s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "awesome_print"
-  s.add_development_dependency "rspec", ">= 2.1"
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
 
-  s.files        = `git ls-files`.split("\n")
-  s.test_files   = Dir["test/test*.rb"]
-  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
-  s.require_path = 'lib'
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<orientdb>, [">= 0"])
+      s.add_runtime_dependency(%q<hashie>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<awesome_print>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.1"])
+      s.add_development_dependency(%q<awesome_print>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.4"])
+    else
+      s.add_dependency(%q<orientdb>, [">= 0"])
+      s.add_dependency(%q<hashie>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<awesome_print>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 2.1"])
+      s.add_dependency(%q<awesome_print>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 2.4"])
+    end
+  else
+    s.add_dependency(%q<orientdb>, [">= 0"])
+    s.add_dependency(%q<hashie>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<awesome_print>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 2.1"])
+    s.add_dependency(%q<awesome_print>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 2.4"])
+  end
 end
+

data/spec/database_spec.rb

@@ -0,0 +1,91 @@
+require File.expand_path("../spec_helper", __FILE__)
+
+describe "OrientDB" do
+
+  describe "Database" do
+
+    before :all do
+      create_classes
+    end
+
+    it "should create a valid simple table" do
+      exp_class = "#<OrientDB::OClass:person name=string>"
+      exp_props = ["#<OrientDB::Propery:name type=string indexed=false mandatory=false not_null=false>"]
+      @person_class.to_s.should == exp_class
+      @person_class.properties.map { |x| x.to_s }.should == exp_props
+    end
+
+    it "should create a valid simple descendant table" do
+      exp_class = "#<OrientDB::OClass:customer super=person tab=float name=string>"
+      exp_props = [
+        "#<OrientDB::Propery:tab type=decimal 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
+      @customer_class.properties.map { |x| x.to_s }.should == exp_props
+    end
+
+    it "should create a complex table" do
+      exp_class = "#<OrientDB::OClass:invoice number=integer(idx) customer=link sold_on=date total=float lines=linklist>"
+      exp_props = [
+        "#<OrientDB::Propery:number type=int indexed=true mandatory=true not_null=false>",
+        "#<OrientDB::Propery:customer type=link indexed=false mandatory=false not_null=true>",
+        "#<OrientDB::Propery:sold_on type=date indexed=false mandatory=false not_null=false>",
+        "#<OrientDB::Propery:total type=decimal indexed=false mandatory=false not_null=false>",
+        "#<OrientDB::Propery:lines type=link_list indexed=false mandatory=false not_null=false>"
+      ]
+      @invoice_class.to_s.should == exp_class
+      @invoice_class.properties.map { |x| x.to_s }.should == exp_props
+    end
+
+    describe "Query" do
+
+      before :all do
+        create_classes
+
+        @oclass = @employee_class.name
+        @e1 = OrientDB::Document.create DB, @oclass, :name => "Mark", :age => 36, :groups => %w{admin sales}
+        @e2 = OrientDB::Document.create DB, @oclass, :name => "John", :age => 37, :groups => %w{admin tech}
+        @e3 = OrientDB::Document.create DB, @oclass, :name => "Luke", :age => 38, :groups => %w{tech support}
+        @e4 = OrientDB::Document.create DB, @oclass, :name => "Matt", :age => 39, :groups => %w{admin office}
+        @e5 = OrientDB::Document.create DB, @oclass, :name => "Pete", :age => 40, :groups => %w{vp office}
+        @employees = [@e1,@e2,@e3,@e4,@e5]
+      end
+
+      it "should prepare valid queries" do
+        qry1 = DB.prepare_sql_query :oclass => "person"
+        qry1.should be_a_kind_of OrientDB::SQLQuery
+        qry1.text.should == "SELECT * FROM person"
+
+        qry2 = DB.prepare_sql_query :oclass => "person", :name => "John"
+        qry2.should be_a_kind_of OrientDB::SQLQuery
+        qry2.text.should == "SELECT * FROM person WHERE name = 'John'"
+
+        qry3 = DB.prepare_sql_query qry2.text
+        qry3.should be_a_kind_of OrientDB::SQLQuery
+        qry3.text.should == qry2.text
+
+        qry4 = DB.prepare_sql_query qry3
+        qry4.should be_a_kind_of OrientDB::SQLQuery
+        qry4.text.should == qry2.text
+      end
+
+      it "should get all rows for a class" do
+        DB.all(:oclass => @oclass).map.should == @employees
+      end
+
+      it "should find rows by simple field values" do
+        DB.first(:oclass => @oclass, :name => "Mark").should == @e1
+        DB.first(:oclass => @oclass, :age => 37).should == @e2
+      end
+
+      it "should find rows by values in arrays" do
+        qry = DB.prepare_sql_query "SELECT * FROM #{@oclass} WHERE 'admin' IN groups"
+        DB.query(qry).map.should == [@e1,@e2,@e4]
+      end
+
+    end
+
+  end
+
+end

data/spec/document_spec.rb

@@ -0,0 +1,75 @@
+require File.expand_path("../spec_helper", __FILE__)
+
+describe "OrientDB" do
+
+  describe "Document" do
+
+    before :all do
+      create_classes
+
+      @h_fields = {:sku => 'H509', :title => "Hammer", :price => 3.25}
+      @hammer   = OrientDB::Document.create DB, @product_class.name, @h_fields
+
+      @n_fields = {:sku => 'N034', :title => "Nail", :price => 0.25}
+      @nail     = OrientDB::Document.create DB, @product_class.name, @n_fields
+
+      @line1    = OrientDB::Document.create DB, @line_class.name,
+                                            :product  => @hammer,
+                                            :quantity => 1,
+                                            :price    => @hammer.price
+      @line2    = OrientDB::Document.create DB, @line_class.name,
+                                            :product  => @nail,
+                                            :quantity => 10,
+                                            :price    => @nail.price
+      @lines    = [@line1, @line2]
+      @total    = @lines.inject(0.0) { |a, x| a + x.price * x.quantity }
+
+      @customer = OrientDB::Document.create DB, @customer_class.name,
+                                            :name => "Mark Dumber",
+                                            :tab  => 500.00
+
+      @invoice  = OrientDB::Document.create DB, @invoice_class.name,
+                                            :number   => 10001,
+                                            :customer => @customer,
+                                            :total    => @total.to_s,
+                                            :sold_on  => Date.civil(2011, 1, 1).proxy_object,
+                                            :lines    => @lines
+    end
+
+    it "should instantiate new documents" do
+      @screw = OrientDB::Document.new DB, @product_class.name, :sku => "S365", :price => 0.33
+      @screw.should be_a_kind_of OrientDB::Document
+    end
+
+    it "should create simple documents" do
+      @hammer.should be_a_kind_of OrientDB::Document
+      @hammer.to_s.should == "#<OrientDB::Document:product:8:0 title:\"Hammer\" price:3.25 sku:\"H509\">"
+      @h_fields.each { |k, v| @hammer[k].should == v }
+
+      @nail.should be_a_kind_of OrientDB::Document
+      @nail.to_s.should == "#<OrientDB::Document:product:8:1 title:\"Nail\" price:0.25 sku:\"N034\">"
+      @n_fields.each { |k, v| @nail.send(k).should == v }
+    end
+
+    it "should create embedded documents" do
+      @line1.should be_a_kind_of OrientDB::Document
+      @line1.to_s.should == "#<OrientDB::Document:invoice_line:9:0 product:#<OrientDB::Document:product:8:0 title:\"Hammer\" price:3.25 sku:\"H509\"> price:3.25 quantity:1>"
+      @line1.product.should == @hammer
+      @line1.price.should == @hammer.price
+
+      @line2.should be_a_kind_of OrientDB::Document
+      @line2.to_s.should == "#<OrientDB::Document:invoice_line:9:1 product:#<OrientDB::Document:product:8:1 title:\"Nail\" price:0.25 sku:\"N034\"> price:0.25 quantity:10>"
+      @line2.product.should == @nail
+      @line2.price.should == @nail.price
+    end
+
+    it "should create complex, embedded documents" do
+      @invoice.should be_a_kind_of OrientDB::Document
+#      @invoice.to_s.should == "#<OrientDB::Document:invoice_line:8:0 product:#<OrientDB::Document:product:7:0 title:Hammer price:5.5 sku:H509> price:5.5 quantity:1>"
+      @invoice.customer.should == @customer
+      @invoice.total = @total
+      @invoice.lines.should == [@line1, @line2]
+    end
+  end
+
+end

data/spec/orientdb_spec.rb

@@ -2,30 +2,9 @@ require File.expand_path("../spec_helper", __FILE__)
 
 describe "OrientDB" do
 
-  before :all do
-    @db             = OrientDB::Database.new("local:#{TEST_DB_PATH}/test").create
-    @person_class   = @db.create_class :person, :name => :string
-    @customer_class = @db.create_class :customer, :super => @person_class
-    @product_class  = @db.create_class :product, :sku => :string, :title => :string, :price => :float
-    @line_class     = @db.create_class :invoice_line, :product => @product_class, :quantity => :int, :price => :float
-    @invoice_class  = @db.create_class :invoice,
-                                       :number   => {:type => :int, :mandatory => true, :index => true},
-                                       :customer => {:type => @customer_class, :not_null => true},
-                                       :sold_on  => :date,
-                                       :total    => {:type => :float, :min => 0.01, :max => 100_000.0},
-                                       :lines    => :embedded_list
-  end
-
-  after :all do
-    @db.close
-#    puts "Removing files in #{TEMP_DIR}/databases/*"
-#    FileUtils.rm_rf "#{TEMP_DIR}/databases/test"
-  end
-
   it "should create a valid database" do
-    puts "Creating db #{@db_path}..."
-    @db.should be_a_kind_of OrientDB::Database
-    @db.name.should == "test"
+    DB.should be_a_kind_of OrientDB::Database
+    DB.name.should == "test"
   end
 
 end

data/spec/spec_helper.rb

@@ -1,9 +1,16 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'orientdb'
+require 'rspec'
+#require 'rspec/autorun'
+require 'fileutils'
+
 unless defined?(SPEC_HELPER_LOADED)
 
-  GEM_ROOT  = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-  LIB_ROOT  = GEM_ROOT + '/lib'
-  SPEC_ROOT = GEM_ROOT + '/spec'
-  TEMP_DIR  = SPEC_ROOT + '/tmp'
+  GEM_ROOT     = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  LIB_ROOT     = GEM_ROOT + '/lib'
+  SPEC_ROOT    = GEM_ROOT + '/spec'
+  TEMP_DIR     = SPEC_ROOT + '/tmp'
 
   TEST_DB_PATH = "#{TEMP_DIR}/databases/db_#{rand(999) + 1}"
 
@@ -12,13 +19,53 @@ unless defined?(SPEC_HELPER_LOADED)
 
   $LOAD_PATH.unshift(LIB_ROOT) unless $LOAD_PATH.include?(LIB_ROOT)
 
-  require 'orientdb'
-  require 'spec'
-  require 'fileutils'
-
   FileUtils.mkdir_p TEST_DB_PATH
 
-  Spec::Runner.configure do |config|
+  DB = OrientDB::Database.new("local:#{TEST_DB_PATH}/test").create
+
+  module Helpers
+    def create_classes
+      # People
+      @person_class   = DB.create_class :person, :name => :string
+      # Customers
+      @customer_class = DB.create_class :customer,
+                                        :super => @person_class,
+                                        :tab   => :float
+      # Employees
+      @employee_class = DB.create_class :employee,
+                                        :super  => @person_class,
+                                        :age    => :int,
+                                        :groups => [:embedded_list, :string]
+      @employee_class.truncate
+      @customer_class.truncate
+      @person_class.truncate
+      # Products
+      @product_class = DB.create_class :product,
+                                       :sku   => :string,
+                                       :title => :string,
+                                       :price => :float
+      @product_class.truncate
+      # Invoice Lines
+      @line_class = DB.create_class :invoice_line,
+                                    :product  => @product_class,
+                                    :quantity => :int,
+                                    :price    => :float
+      @line_class.truncate
+      # Invoices
+      @invoice_class = DB.create_class :invoice,
+                                       :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')
+                                       :lines    => [:link_list, @line_class]
+      @invoice_class.truncate
+    end
+  end
+
+  RSpec.configure do |config|
+    include Helpers
+
+    config.color_enabled = true
   end
 
   SPEC_HELPER_LOADED = true

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 4
-  version: 0.0.4
+    - 5
+  version: 0.0.5
 platform: jruby
 authors: 
   - Adrian Madrid
@@ -14,25 +14,36 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 -07:00
-default_executable: 
+date: 2011-01-12 00:00:00 -07:00
+default_executable: orientdb_console
 dependencies: 
   - !ruby/object:Gem::Dependency 
-    name: hashie
+    name: orientdb
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    requirement: *id001
     prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: hashie
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             segments: 
               - 0
             version: "0"
+    requirement: *id002
+    prerelease: false
     type: :runtime
-    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: bundler
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -41,24 +52,24 @@ dependencies:
               - 0
               - 0
             version: 1.0.0
+    requirement: *id003
+    prerelease: false
     type: :development
-    version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: awesome_print
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             segments: 
               - 0
             version: "0"
+    requirement: *id004
+    prerelease: false
     type: :development
-    version_requirements: *id003
   - !ruby/object:Gem::Dependency 
     name: rspec
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -66,41 +77,77 @@ dependencies:
               - 2
               - 1
             version: "2.1"
+    requirement: *id005
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: awesome_print
+    version_requirements: &id006 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    requirement: *id006
+    prerelease: false
     type: :development
-    version_requirements: *id004
-description: JRuby wrapper for OrientDB
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    version_requirements: &id007 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 4
+            version: "2.4"
+    requirement: *id007
+    prerelease: false
+    type: :development
+description: Simple JRuby wrapper for the OrientDB.
 email: 
   - aemadrid@gmail.com
 executables: 
   - orientdb_console
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+  - LICENSE
+  - README.rdoc
 files: 
+  - .document
   - .gitignore
   - .rvmrc
   - Gemfile
   - Gemfile.lock
+  - LICENSE
   - README.rdoc
   - Rakefile
+  - VERSION
   - bin/orientdb_console
-  - jars/orient-commons-0.9.23.jar
-  - jars/orientdb-client-0.9.23.jar
-  - jars/orientdb-core-0.9.23.jar
-  - jars/orientdb-enterprise-0.9.23.jar
-  - jars/orientdb-server-0.9.23.jar
-  - jars/orientdb-tools-0.9.23.jar
+  - jars/orient-commons-0.9.24.jar
+  - jars/orientdb-client-0.9.24.jar
+  - jars/orientdb-core-0.9.24.jar
+  - jars/orientdb-enterprise-0.9.24.jar
+  - jars/orientdb-server-0.9.24.jar
+  - jars/orientdb-tools-0.9.24.jar
+  - jars/persistence-api-1.0.jar
   - lib/orientdb.rb
+  - lib/orientdb/constants.rb
   - lib/orientdb/database.rb
   - lib/orientdb/database_pool.rb
   - lib/orientdb/document.rb
   - lib/orientdb/ext.rb
   - lib/orientdb/oclass.rb
+  - lib/orientdb/property.rb
   - lib/orientdb/schema.rb
+  - lib/orientdb/sql_query.rb
   - lib/orientdb/user.rb
   - lib/orientdb/version.rb
   - orientdb.gemspec
+  - spec/database_spec.rb
+  - spec/document_spec.rb
   - spec/orientdb_spec.rb
   - spec/spec.opts
   - spec/spec_helper.rb