orientdb 0.0.16-jruby → 0.0.17-jruby

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.17

data/lib/orientdb.rb

@@ -1,10 +1,10 @@
-raise "Rubyhaze only runs on JRuby. Sorry!" unless (RUBY_PLATFORM =~ /java/)
+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-0.9.24"
+require "orientdb-client-1.0rc7"
 
 module OrientDB
 

data/lib/orientdb/oclass.rb

@@ -3,23 +3,7 @@ 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 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
+      self.class.type_for value
     end
 
     def add(property_name, type, options = { })
@@ -81,6 +65,26 @@ module OrientDB
 
     class << self
 
+      def type_for(value)
+        value = value.oclass if value.respond_to?(:oclass)
+        type = case value
+                 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 create(db, name, fields = { })
         name        = name.to_s
         add_cluster = fields.delete :add_cluster

data/lib/orientdb/version.rb

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

data/orientdb.gemspec

@@ -5,16 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orientdb}
-  s.version = "0.0.16"
+  s.version = "0.0.17"
   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-02-01}
-  s.default_executable = %q{orientdb_console}
+  s.authors = [%q{Adrian Madrid}]
+  s.date = %q{2011-12-09}
   s.description = %q{Simple JRuby wrapper for the OrientDB.}
-  s.email = ["aemadrid@gmail.com"]
-  s.executables = ["orientdb_console"]
+  s.email = [%q{aemadrid@gmail.com}]
+  s.executables = [%q{orientdb_console}]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -28,12 +27,12 @@ Gem::Specification.new do |s|
     "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/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/orientdb.rb",
     "lib/orientdb/constants.rb",
@@ -65,9 +64,9 @@ Gem::Specification.new do |s|
     "spec/sql_spec.rb"
   ]
   s.homepage = %q{http://rubygems.org/gems/orientdb}
-  s.require_paths = ["lib"]
+  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{orientdb}
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.8.9}
   s.summary = %q{JRuby wrapper for OrientDB}
 
   if s.respond_to? :specification_version then

data/spec/database_spec.rb

@@ -26,13 +26,13 @@ describe "OrientDB" do
     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_class = "#<OrientDB::OClass:invoice total=FLOAT sold_on=DATE lines=LINKLIST number=INTEGER(idx) customer=LINK>"
       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>"
+        "#<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:customer type=link indexed=false mandatory=false not_null=true>"
       ]
       @invoice_class.to_s.should == exp_class
       @invoice_class.properties.map { |x| x.to_s }.should == exp_props

data/spec/spec_helper.rb

@@ -21,6 +21,9 @@ unless defined?(SPEC_HELPER_LOADED)
     end
   else
     TEST_DB_PATH = "#{TEMP_DIR}/databases/db_#{rand(999) + 1}"
+    require 'fileutils'
+    FileUtils.remove_dir "#{TEMP_DIR}/databases" rescue nil
+    FileUtils.mkdir_p TEST_DB_PATH
     puts ">> Testing [local] Database :: TEST_DB PATH : #{TEST_DB_PATH}"
     FileUtils.remove_dir "#{TEMP_DIR}/databases/"
     FileUtils.mkdir_p TEST_DB_PATH

metadata

@@ -2,7 +2,7 @@
 name: orientdb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.16
+  version: 0.0.17
 platform: jruby
 authors: 
   - Adrian Madrid
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -07:00
-default_executable: orientdb_console
+date: 2011-12-09 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: awesome_print
@@ -54,12 +53,12 @@ files:
   - 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/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/orientdb.rb
   - lib/orientdb/constants.rb
@@ -89,7 +88,6 @@ files:
   - spec/spec_basic_helper.rb
   - spec/spec_helper.rb
   - spec/sql_spec.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/orientdb
 licenses: []
 
@@ -113,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: orientdb
-rubygems_version: 1.4.2
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: JRuby wrapper for OrientDB