orientdb 0.0.17-jruby → 0.0.19-jruby

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.19

data/lib/old/constants.rb

@@ -0,0 +1,7 @@
+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

data/lib/orientdb.rb

@@ -1,25 +1,19 @@
 raise "OrieentDB-client only runs on JRuby. Sorry!" unless (RUBY_PLATFORM =~ /java/)
 
-$: << File.dirname(__FILE__)
-$: << File.expand_path('../../jars/', __FILE__)
-
-require 'java'
-require "orientdb-client-1.0rc7"
-
 module OrientDB
+  GEM_PATH = File.dirname File.expand_path(__FILE__) unless const_defined?(:GEM_PATH)
+end
 
-  def self.const_missing(missing)
-    puts "[#{name}:const_missing] #{missing}"
-    super
-  end
+$: << OrientDB::GEM_PATH
+$: << File.join(OrientDB::GEM_PATH, 'jars')
 
-end
+require 'java'
+require "orientdb-client-1.0rc7"
 
+require 'orientdb/version'
 require 'orientdb/ext'
 require 'orientdb/rid'
 require 'orientdb/constants'
-require 'orientdb/version'
-require 'orientdb/user'
 require 'orientdb/property'
 require 'orientdb/schema'
 require 'orientdb/storage'

data/lib/orientdb/constants.rb

@@ -5,26 +5,24 @@ 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.OProperty::INDEX_TYPE
-  OClass                 = com.orientechnologies.orient.core.metadata.schema.OClass
+  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
   LogicalCluster         = com.orientechnologies.orient.core.storage.impl.local.OClusterLogical
-  Property               = com.orientechnologies.orient.core.metadata.schema.OProperty
+  PropertyImpl           = com.orientechnologies.orient.core.metadata.schema.OPropertyImpl
   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
+  SchemaProxy            = com.orientechnologies.orient.core.metadata.schema.OSchemaProxy
   SchemaType             = com.orientechnologies.orient.core.metadata.schema.OType
-  SQLSynchQuery          = com.orientechnologies.orient.core.sql.query.OSQLSynchQuery
   SQLCommand             = com.orientechnologies.orient.core.sql.OCommandSQL
+  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 }
-  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 }
 
-  FIELD_TYPES            = {
+  FIELD_TYPES = {
     :binary        => "BINARY",
     :bool          => "BOOLEAN",
     :boolean       => "BOOLEAN",
@@ -50,7 +48,7 @@ module OrientDB
     :long          => "LONG",
     :short         => "SHORT",
     :string        => "STRING",
-  }.inject({}) do |h, (k, v)|
+  }.inject({ }) do |h, (k, v)|
     h[k] = SchemaType.const_get v
     h
   end

data/lib/orientdb/database.rb

@@ -59,7 +59,7 @@ module OrientDB
     end
 
     def create_class(klass_name, fields = {})
-      OrientDB::OClass.create self, klass_name.to_s, fields
+      OrientDB::OClassImpl.create self, klass_name.to_s, fields
     end
 
     def get_or_create_class(klass_name, fields = {})

data/lib/orientdb/oclass.rb

@@ -1,6 +1,6 @@
 module OrientDB
 
-  class OClass
+  class OClassImpl
 
     def type_for(value)
       self.class.type_for value
@@ -19,7 +19,7 @@ module OrientDB
           prop = create_property property_name, type
         when Symbol
           prop = create_property property_name, type_for(type)
-        when OClass
+        when OClassImpl
           prop = create_property property_name, type_for(:link), type
         when Array
           type, sub_type = type_for(type.first), type_for(type.last)
@@ -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
@@ -55,7 +55,7 @@ module OrientDB
 
     def inspect
       props = properties.map { |x| "#{x.name}=#{x.type.name}#{x.is_indexed? ? '(idx)' : ''}" }.join(' ')
-      "#<OrientDB::OClass:" + name +
+      "#<OrientDB::OClassImpl:" + name +
         (getSuperClass ? ' super=' + getSuperClass.name : '') +
         (props.empty? ? '' : ' ' + props) +
         ">"
@@ -68,7 +68,7 @@ module OrientDB
       def type_for(value)
         value = value.oclass if value.respond_to?(:oclass)
         type = case value
-                 when OrientDB::SchemaType, OrientDB::OClass
+                 when OrientDB::SchemaType, OrientDB::OClassImpl
                    value
                  when String
                    if schema.exists_class?(value)
@@ -105,14 +105,14 @@ module OrientDB
         end
 
         super_klass = fields.delete :super
-        super_klass = db.get_class(super_klass.to_s) unless super_klass.is_a?(OrientDB::OClass)
+        super_klass = db.get_class(super_klass.to_s) unless super_klass.is_a?(OrientDB::OClassImpl)
         klass.set_super_class super_klass if super_klass
         db.schema.save
 
         unless fields.empty?
           fields.each do |property_name, type|
             case type
-              when Symbol, Array, OrientDB::OClass
+              when Symbol, Array, OrientDB::OClassImpl
                 klass.add property_name, type
               when Hash
                 options = type.dup

data/lib/orientdb/property.rb

@@ -1,6 +1,5 @@
 module OrientDB
-
-  class Property
+  class PropertyImpl
 
     def type_short
       @type_short ||= OrientDB::FIELD_TYPES.select { |k, v| v.name == getType.name }.first.first
@@ -35,5 +34,4 @@ module OrientDB
     alias :to_s :inspect
 
   end
-
 end

data/lib/orientdb/record.rb

@@ -8,14 +8,6 @@ module OrientDB
     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}>"

data/lib/orientdb/rid.rb

@@ -2,13 +2,13 @@ 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]
+  def initialize(rid = '#-1:-1')
+    parts = rid.to_s.gsub('#', '').split ":"
+    if parts.size == 2
+      self.cluster_id = parts.first.to_i
+      self.document_id = parts.last.to_i
     else
-      raise "Unknown parameters #{args.inspect}"
+      raise "Unknown rid [#{rid}]"
     end
   end
 
@@ -21,11 +21,13 @@ class OrientDB::RID
   end
 
   def inspect
-    "#{cluster_id}:#{@document_id}"
+    "##{cluster_id}:#{@document_id}"
   end
 
+  alias :to_s :inspect
+
   def unsaved?
-    to_s == '-1:-1'
+    to_s == '#-1:-1'
   end
 
   def saved?
@@ -35,8 +37,6 @@ class OrientDB::RID
   def valid?
     saved? || unsaved?
   end
-
-  alias :to_s :inspect
 end
 
 class String

data/lib/orientdb/schema.rb

@@ -1,23 +1,33 @@
 module OrientDB
 
-  class Schema
-
-    def inspect
-      "#<OrientDB::Schema:#{toString}>"
-    end
-
-    alias :to_s :inspect
-
-  end
-
-  class SchemaType
-
-    def inspect
-      "#<OrientDB::SchemaType:#{name}>"
-    end
-
-    alias :to_s :inspect
-
-  end
+  #class Schema
+  #
+  #  def inspect
+  #    "#<OrientDB::Schema:#{toString}>"
+  #  end
+  #
+  #  alias :to_s :inspect
+  #
+  #end
+  #
+  #class SchemaProxy
+  #
+  #  def inspect
+  #    "#<OrientDB::SchemaProxy:#{toString}>"
+  #  end
+  #
+  #  alias :to_s :inspect
+  #
+  #end
+  #
+  #class SchemaType
+  #
+  #  def inspect
+  #    "#<OrientDB::SchemaType:#{name}>"
+  #  end
+  #
+  #  alias :to_s :inspect
+  #
+  #end
 
 end

data/lib/orientdb/version.rb

@@ -1,3 +1,3 @@
 module OrientDB
-  VERSION = "0.0.17"
+  VERSION = "0.0.19"
 end

data/orientdb.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orientdb}
-  s.version = "0.0.17"
+  s.version = "0.0.19"
   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-09}
+  s.date = %q{2011-12-10}
   s.description = %q{Simple JRuby wrapper for the OrientDB.}
   s.email = [%q{aemadrid@gmail.com}]
   s.executables = [%q{orientdb_console}]
@@ -27,13 +27,14 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/orientdb_console",
-    "jars/orient-commons-1.0rc7.jar",
-    "jars/orientdb-client-1.0rc7.jar",
-    "jars/orientdb-core-1.0rc7.jar",
-    "jars/orientdb-enterprise-1.0rc7.jar",
-    "jars/orientdb-server-1.0rc7.jar",
-    "jars/orientdb-tools-1.0rc7.jar",
-    "jars/persistence-api-1.0.jar",
+    "lib/jars/orient-commons-1.0rc7.jar",
+    "lib/jars/orientdb-client-1.0rc7.jar",
+    "lib/jars/orientdb-core-1.0rc7.jar",
+    "lib/jars/orientdb-enterprise-1.0rc7.jar",
+    "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",
@@ -52,7 +53,6 @@ Gem::Specification.new do |s|
     "lib/orientdb/sql/query.rb",
     "lib/orientdb/sql/update.rb",
     "lib/orientdb/storage.rb",
-    "lib/orientdb/user.rb",
     "lib/orientdb/version.rb",
     "orientdb.gemspec",
     "spec/database_spec.rb",

data/spec/database_spec.rb

@@ -9,14 +9,14 @@ describe "OrientDB" do
     end
 
     it "should create a valid simple table" do
-      exp_class = "#<OrientDB::OClass:person name=STRING>"
+      exp_class = "#<OrientDB::OClassImpl: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_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:name type=string indexed=false mandatory=false not_null=false>"
@@ -26,12 +26,12 @@ describe "OrientDB" do
     end
 
     it "should create a complex table" do
-      exp_class = "#<OrientDB::OClass:invoice total=FLOAT sold_on=DATE lines=LINKLIST number=INTEGER(idx) customer=LINK>"
+      exp_class = "#<OrientDB::OClassImpl:invoice total=FLOAT sold_on=DATE lines=LINKLIST number=INTEGER 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=true mandatory=true not_null=false>", 
+        "#<OrientDB::Propery:number type=int indexed=false 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/document_spec.rb

@@ -92,7 +92,7 @@ describe "OrientDB" do
 #      @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]
+      @invoice.lines.map{|x| x}.should == [@line1, @line2]
     end
   end
 

data/spec/spec_helper.rb

@@ -33,34 +33,35 @@ unless defined?(SPEC_HELPER_LOADED)
 
   module Helpers
     def create_classes
-      # People
       @person_class   = DB.recreate_class :person, :name => :string
-      # Customers
       @customer_class = DB.recreate_class :customer,
                                           :super => @person_class,
                                           :tab   => :float
-      # Employees
       @employee_class = DB.recreate_class :employee,
                                           :super  => @person_class,
                                           :age    => :int,
                                           :groups => [:embedded_list, :string]
-      # Products
       @product_class  = DB.recreate_class :product,
                                           :sku   => :string,
                                           :title => :string,
                                           :price => :float
-      # Invoice Lines
       @line_class     = DB.recreate_class :invoice_line,
                                           :product  => @product_class,
                                           :quantity => :int,
                                           :price    => :float
-      # Invoices
       @invoice_class  = DB.recreate_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]
+
+      #@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.17
+  version: 0.0.19
 platform: jruby
 authors: 
   - Adrian Madrid
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-09 00:00:00 Z
+date: 2011-12-10 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: awesome_print
@@ -53,13 +53,14 @@ files:
   - Rakefile
   - VERSION
   - bin/orientdb_console
-  - jars/orient-commons-1.0rc7.jar
-  - jars/orientdb-client-1.0rc7.jar
-  - jars/orientdb-core-1.0rc7.jar
-  - jars/orientdb-enterprise-1.0rc7.jar
-  - jars/orientdb-server-1.0rc7.jar
-  - jars/orientdb-tools-1.0rc7.jar
-  - jars/persistence-api-1.0.jar
+  - lib/jars/orient-commons-1.0rc7.jar
+  - lib/jars/orientdb-client-1.0rc7.jar
+  - lib/jars/orientdb-core-1.0rc7.jar
+  - lib/jars/orientdb-enterprise-1.0rc7.jar
+  - 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
@@ -78,7 +79,6 @@ files:
   - lib/orientdb/sql/query.rb
   - lib/orientdb/sql/update.rb
   - lib/orientdb/storage.rb
-  - lib/orientdb/user.rb
   - lib/orientdb/version.rb
   - orientdb.gemspec
   - spec/database_spec.rb

data/lib/orientdb/user.rb

@@ -1,3 +0,0 @@
-module OrientDB
-
-end