orientdb-ar 0.0.3-jruby → 0.0.4-jruby

data/Rakefile

@@ -17,7 +17,7 @@ begin
     gem.required_rubygems_version = ">= 1.3.6"
     gem.rubyforge_project         = "orientdb-ar"
 
-    gem.add_dependency "orientdb", "0.0.11"
+    gem.add_dependency "orientdb", "0.0.15"
     gem.add_dependency "activemodel", ">= 3.0.3"
     gem.add_development_dependency "awesome_print"
     gem.add_development_dependency "rspec", ">= 2.4"

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/orientdbar_console

@@ -16,7 +16,7 @@ if ARGV.include?('test:db')
   FileUtils.remove_dir TEMP_DIR + '/databases', true
   puts ">> Creating OrientDB test database ..."
   FileUtils.mkdir_p TEST_DB_PATH
-  OrientDB::AR::Base.connection = OrientDB::Database.new("local:#{TEST_DB_PATH}/test").create
+  OrientDB::AR::Base.connection = OrientDB::DocumentDatabase.new("local:#{TEST_DB_PATH}/test").create
   DB = OrientDB::AR::Base.connection
   puts ">> Connection : #{OrientDB::AR::Base.connection}"
 

data/lib/{model → orientdb-ar}/attributes.rb

@@ -5,19 +5,25 @@ module OrientDB::AR
 
     def attribute_names
       schema_names = self.class.fields.keys.map { |x| x.to_s }
-      (schema_names + @odocument.field_names.map).uniq
+      field_names = @odocument.field_names.map { |x| x.to_s }
+      (schema_names + field_names).uniq
     end
 
     def attributes
       attribute_names.inject({}) { |h, attr| h[attr.to_s] = self[attr]; h }
     end
 
+    def to_orientdb
+      @odocument
+    end
+
     def [](attr)
       res = @odocument[attr]
-      res.respond_to?(:jruby_value) ? res.jruby_value : res
+      res.respond_to?(:to_orientdb_ar) ? res.to_orientdb_ar : res
     end
 
     def []=(attr, value)
+      value = value.respond_to?(:to_orientdb) ? value.to_orientdb : value
       old_value = self[attr]
       return old_value if value == old_value
       attribute_will_change!(attr)

data/lib/{model → orientdb-ar}/base.rb

@@ -1,81 +1,18 @@
-require 'rubygems'
-require 'active_model'
-require 'active_support/core_ext/class/attribute_accessors'
-require 'active_support/core_ext/kernel'
-require 'active_support/core_ext/class/attribute'
-require 'orientdb'
-
-require 'model/conversion'
-require 'model/attributes'
-require 'model/validations'
-require 'model/relations'
-require 'model/query'
-
 class OrientDB::AR::Base
-  include ActiveModel::AttributeMethods
-  include Comparable
-
-  extend ActiveModel::Translation
-  extend ActiveModel::Callbacks
 
-  include OrientDB::AR::Attributes
-  include OrientDB::AR::Conversion
-  include OrientDB::AR::Validations
-
-  include ActiveModel::Serializers::JSON
-  include ActiveModel::Serializers::Xml
-
-  define_model_callbacks :save, :delete
+  def self.embeddable?
+    false
+  end
 
-  class_attribute :connection
+  include ActiveModel::AttributeMethods
+  include OrientDB::AR::DocumentMixin
 
   class_inheritable_hash :fields
   self.fields = ActiveSupport::OrderedHash.new
 
-  attr_reader :odocument
-
-  def initialize(fields = {})
-    @odocument          = self.class.new_document
-    @changed_attributes = {}
-    @errors             = ActiveModel::Errors.new(self)
-    fields.each { |k, v| send "#{k}=", v }
-  end
-
-  def field?(name)
-    res = @odocument.field?(name)
-    res
-  end
-
-  def respond_to?(method_name)
-    # Simple field value lookup
-    return true if field?(method_name)
-    # Dirty
-    return true if method_name.to_s =~ /(\w*)(_changed\?|_change|_will_change!|_was)$/ && field?($1)
-    # Setter
-    return true if method_name.to_s =~ /(.*?)=$/
-    # Boolean
-    return true if method_name.to_s =~ /(.*?)?$/ && field?($1)
-    # Unknown pattern
-    super
-  end
+  class_attribute :connection
 
-  def method_missing(method_name, *args, &blk)
-    # Simple field value lookup
-    return self[method_name] if field?(method_name)
-    # Dirty
-    if method_name.to_s =~ /(\w*)(_changed\?|_change|_will_change!|_was)$/ && field?($1)
-      __send__("attribute#{$2}", $1)
-      # Setter
-    elsif method_name.to_s =~ /(.*?)=$/
-      self[$1] = args.first
-      # Boolean
-    elsif method_name.to_s =~ /(.*?)?$/ && field?($1)
-      !!self[$1]
-      # Unknown pattern
-    else
-      super
-    end
-  end
+  define_model_callbacks :save, :delete
 
   def save
     _run_save_callbacks do
@@ -95,6 +32,14 @@ class OrientDB::AR::Base
     true
   end
 
+  def reload
+    raise "Not persisted, cannot reload" unless persisted?
+    @odocument = OrientDB::AR::Query.new(self.class).where('@rid' => rid.lit).first_result
+    @changed_attributes = { }
+    @errors             = ActiveModel::Errors.new(self)
+    self
+  end
+
   def saved?
     @saved || @odocument.rid != '-1:-1'
   end
@@ -107,18 +52,6 @@ class OrientDB::AR::Base
     saved? && !deleted?
   end
 
-  def inspect
-    attrs       = attributes.map { |k, v| "#{k}:#{v.inspect}" }.join(' ')
-    super_klass = self.class.descends_from_base? ? '' : "(#{self.class.superclass.name})"
-    %{#<#{self.class.name}#{super_klass}:#{@odocument.rid} #{attrs}>}
-  end
-
-  alias :to_s :inspect
-
-  def <=>(other)
-    to_s <=> other.to_s
-  end
-
   class << self
 
     include OrientDB::AR::Relations
@@ -142,10 +75,6 @@ class OrientDB::AR::Base
       @oclass
     end
 
-    def embedded?
-      false
-    end
-
     def field(name, type, options = {})
       name = name.to_sym
       if fields.key? name
@@ -166,11 +95,6 @@ class OrientDB::AR::Base
       self
     end
 
-    def new_document(fields = {})
-      oclass
-      OrientDB::Document.new connection, oclass_name, fields
-    end
-
     def create(fields = {})
       obj = new fields
       obj.save
@@ -207,19 +131,24 @@ class OrientDB::AR::Base
       OrientDB::AR::Query.new(self).where(conditions).first
     end
 
-    def clear
-      oclass.truncate
+    def update(*args)
+      OrientDB::AR::Update.new(self).values(*args).run
     end
 
-    def new_from_doc(doc)
-      klass = doc.getClassName.constantize
-      obj   = klass.new
-      obj.instance_variable_set "@odocument", doc
-      obj
+    def delete(*args)
+      OrientDB::AR::Delete.new(self).where(*args).run
+    end
+
+    def insert(*args)
+      from_orientdb OrientDB::AR::Insert.new(self).fields(*args).run
+    end
+
+    def count
+      oclass.count
     end
 
-    def new_from_docs(docs)
-      docs.map { |doc| new_from_doc doc }
+    def clear
+      oclass.truncate
     end
   end
 

data/lib/orientdb-ar/document_mixin.rb

@@ -0,0 +1,144 @@
+require 'rubygems'
+require 'active_model'
+require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/core_ext/kernel'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/class/inheritable_attributes'
+require 'orientdb'
+
+require 'orientdb-ar/conversion'
+require 'orientdb-ar/attributes'
+require 'orientdb-ar/validations'
+require 'orientdb-ar/relations'
+require 'orientdb-ar/sql'
+module OrientDB::AR::DocumentMixin
+
+  include Comparable
+
+  include OrientDB::AR::Attributes
+  include OrientDB::AR::Conversion
+  include OrientDB::AR::Validations
+
+  def self.included(base)
+    base.extend ActiveModel::Translation
+    base.extend ActiveModel::Callbacks unless base.embeddable?
+
+    base.send :include, ActiveModel::Serializers::JSON
+    base.send :include, ActiveModel::Serializers::Xml
+
+    base.extend OrientDB::AR::DocumentMixin::ClassMethods
+  end
+
+  attr_reader :odocument
+
+  def initialize(fields = { })
+    @odocument          = self.class.new_document
+    @changed_attributes = { }
+    @errors             = ActiveModel::Errors.new(self)
+    fields.each { |k, v| send "#{k}=", v }
+  end
+
+  def field?(name)
+    @odocument.field?(name)
+  end
+
+  def respond_to?(method_name)
+    # Simple field value lookup
+    return true if field?(method_name)
+    # Dirty
+    return true if method_name.to_s =~ /(\w*)(_changed\?|_change|_will_change!|_was)$/ && field?($1)
+    # Setter
+    return true if method_name.to_s =~ /(.*?)=$/
+    # Boolean
+    return true if method_name.to_s =~ /(.*?)?$/ && field?($1)
+    # Unknown pattern
+    super
+  end
+
+  def method_missing(method_name, *args, &blk)
+    # Simple field value lookup
+    return self[method_name] if field?(method_name)
+    # Dirty
+    if method_name.to_s =~ /(\w*)(_changed\?|_change|_will_change!|_was)$/ && field?($1)
+      __send__("attribute#{$2}", $1)
+      # Setter
+    elsif method_name.to_s =~ /(.*?)=$/
+      self[$1] = args.first
+      # Boolean
+    elsif method_name.to_s =~ /(.*?)?$/ && field?($1)
+      !!self[$1]
+      # Unknown pattern
+    else
+      super
+    end
+  end
+
+  def embedded?
+    self.class.embeddable?
+  end
+
+  def connection
+    self.class.connection
+  end
+
+  def oclass
+    self.class.oclass
+  end
+
+  def oclass_name
+    self.class.oclass_name
+  end
+
+  def rid
+    @odocument.rid
+  end
+
+  def inspect
+    attrs       = attributes.map { |k, v| "#{k}:#{v.inspect}" }.join(' ')
+    super_klass = self.class.descends_from_base? ? '' : "(#{self.class.superclass.name})"
+    %{#<#{self.class.name}#{super_klass}:#{@odocument.rid} #{attrs}>}
+  end
+
+  alias :to_s :inspect
+
+  def <=>(other)
+    to_s <=> other.to_s
+  end
+
+  module ClassMethods
+
+    attr_writer :oclass_name
+
+    def oclass_name
+      @oclass_name ||= name.to_s.gsub('::', '__')
+    end
+
+    def field(name, type, options = { })
+      name = name.to_sym
+      if fields.key? name
+        puts "Already defined field [#{name}]"
+      else
+        fields[name] = { :type => type }.update options
+      end
+    end
+
+    def new_document
+      OrientDB::Document.new connection, oclass_name
+    end
+
+    def from_orientdb(value)
+      value.respond_to?(:to_orientdb_ar) ? value.to_orientdb_ar : value
+    end
+
+    def to_orientdb(value)
+      if value.respond_to?(:to_orientdb)
+        value.to_orientdb
+      elsif value.respond_to?(:jruby_value)
+        value.jruby_value
+      else
+        value
+      end
+    end
+  end
+
+end

data/lib/orientdb-ar/embedded.rb

@@ -0,0 +1,110 @@
+class OrientDB::AR::Embedded
+
+  def self.embeddable?
+    true
+  end
+
+  include ActiveModel::AttributeMethods
+  include OrientDB::AR::DocumentMixin
+
+  class_inheritable_hash :fields
+  self.fields = ActiveSupport::OrderedHash.new
+
+  def save
+    raise "Not implemented on Embedded models"
+  end
+
+  def delete
+    raise "Not implemented on Embedded models"
+  end
+
+  def reload
+    raise "Not implemented on Embedded models"
+  end
+
+  def saved?
+    false
+  end
+
+  def deleted?
+    false
+  end
+
+  def persisted?
+    false
+  end
+
+  class << self
+
+    def connection
+      OrientDB::AR::Base.connection
+    end
+
+    def oclass
+      @oclass ||= connection.get_or_create_class oclass_name, fields.dup
+    end
+
+    def descends_from_base?
+      superclass && superclass == OrientDB::AR::Embedded
+    end
+
+    def schema!
+      raise "Not implemented on Embedded models"
+    end
+
+    def create(fields = {})
+      raise "Not implemented on Embedded models"
+    end
+
+    def select(*args)
+      raise "Not implemented on Embedded models"
+    end
+
+    alias :columns :select
+
+    def where(*args)
+      raise "Not implemented on Embedded models"
+    end
+
+    def order(*args)
+      raise "Not implemented on Embedded models"
+    end
+
+    def limit(max_records)
+      raise "Not implemented on Embedded models"
+    end
+
+    def range(lower_rid, upper_rid = nil)
+      raise "Not implemented on Embedded models"
+    end
+
+    def all(conditions = {})
+      raise "Not implemented on Embedded models"
+    end
+
+    def first(conditions = {})
+      raise "Not implemented on Embedded models"
+    end
+
+    def update(*args)
+      raise "Not implemented on Embedded models"
+    end
+
+    def delete(*args)
+      raise "Not implemented on Embedded models"
+    end
+
+    def insert(*args)
+      raise "Not implemented on Embedded models"
+    end
+
+    def count
+      raise "Not implemented on Embedded models"
+    end
+
+    def clear
+      raise "Not implemented on Embedded models"
+    end
+  end
+
+end

data/lib/orientdb-ar/ext.rb

@@ -0,0 +1,58 @@
+class OrientDB::Document
+  def to_orientdb_ar
+    klass = getClassName.gsub('__', '::').constantize
+    obj   = klass.new
+    obj.instance_variable_set "@odocument", self
+    obj
+  end
+end
+
+class OrientDB::RecordList
+  def to_orientdb_ar
+    map { |x| x.respond_to?(:to_orientdb_ar) ? x.to_orientdb_ar : x }
+  end
+end
+
+class OrientDB::RecordMap
+  def to_orientdb_ar
+    inject({ }) { |h, (k, v)| h[k] = v.respond_to?(:to_orientdb_ar) ? v.to_orientdb_ar : v; h }
+  end
+end
+
+class OrientDB::RecordSet
+  def to_orientdb_ar
+    map { |x| x.respond_to?(:to_orientdb_ar) ? x.to_orientdb_ar : x }
+  end
+end
+
+class NilClass
+  def to_orientdb_ar
+    self
+  end
+end
+
+class Array
+  def to_orientdb
+    map { |x| x.respond_to?(:to_orientdb) ? x.to_orientdb : x }
+  end
+
+  def to_orientdb_ar
+    map { |x| x.respond_to?(:to_orientdb_ar) ? x.to_orientdb_ar : x }
+  end
+end
+
+class Hash
+  def to_orientdb
+    inject(java.util.HashMap.new) { |h, (k, v)| h[k.to_s] = v.respond_to?(:to_orientdb) ? v.to_orientdb : v; h }
+  end
+
+  def to_orientdb_ar
+    inject({ }) { |h, (k, v)| h[k] = v.respond_to?(:to_orientdb_ar) ? v.to_orientdb_ar : v; h }
+  end
+end
+
+class Java::JavaUtil::ArrayList
+  def to_orientdb_ar
+    map { |x| x.respond_to?(:to_orientdb_ar) ? x.to_orientdb_ar : x }
+  end
+end

data/lib/{model → orientdb-ar}/relations.rb

@@ -1,53 +1,48 @@
 module OrientDB::AR
   module Relations
 
-    def has_one(klass, options = {})
+    def embedds_one(klass, options = {})
       klass = klass_for klass
       name = options[:name].to_s || field_name_for(klass, true)
 
-      field_type = klass.embedded? ? :embedded : :link
-      field name, [OrientDB::FIELD_TYPES[field_type], klass.oclass]
+      field name, [OrientDB::FIELD_TYPES[:embedded], klass.oclass]
 
       class_eval <<-eorb, __FILE__, __LINE__ + 1
         def #{name}                                                          # def address
-          doc = odocument[:#{name}]                                          #   doc = odocument[:address]
-          doc ? #{klass.name}.new_from_doc(doc) : nil                        #   doc ? Address.new_from_doc(doc) : nil
+          self[:#{name}]                                                     #   self[:address]
         end                                                                  # end
       eorb
-                                                                             #
+
       class_eval <<-eorb, __FILE__, __LINE__ + 1
         def #{name}=(value)                                                  # def address=(value)
-          raise "Invalid value for [#{name}]" unless value.is_a?(#{klass})   #   raise "Invalid value for [address]" unless value.is_a?(Address)
-          odocument[:#{name}] = value.odocument                              #   odocument[:address] = value.odocument
+          self[:#{name}] = value                                             #   self[:address] = value.odocument
           #{name}                                                            #   address
         end                                                                  # end
       eorb
     end
 
-    def has_many(klass, options = {})
+    def embedds_many(klass, options = {})
       klass = klass_for klass
       name = options[:name].to_s || field_name_for(klass, false)
 
-      field_type = klass.embedded? ? :embedded : :link
-      field name, [OrientDB::FIELD_TYPES[field_type], klass.oclass]
+      field name, [OrientDB::FIELD_TYPES[:embedded_list], klass.oclass]
 
       class_eval <<-eorb, __FILE__, __LINE__ + 1
         def #{name}                                         # def addresses
-          docs = odocument[:#{name}]                        #   docs = odocument[:addresses]
-          docs ? #{klass.name}.new_from_docs(docs) : nil    #   docs ? Address.new_from_docs(doc) : nil
+          self[:#{name}]                                    #   self[:addresses]
         end                                                 # end
       eorb
 
       class_eval <<-eorb, __FILE__, __LINE__ + 1
         def #{name}=(value)                                 # def addresses=(value)
-          odocument[:#{name}] = value.map{|x| x.odocument } #   odocument[:addresses] = value.map{|x| x.odocument }
-          #{name}                                           #   addresses
+          self[:#{name}]                                    #   self[:addresses]
         end                                                 # end
       eorb
 
       class_eval <<-eorb, __FILE__, __LINE__ + 1
-        def add_#{name.singularize}(value)                 # def add_address(value)
-          odocument[:#{name}] << value.odocument            #   odocument[:addresses] << value.odocument
+        def add_#{name.singularize}(value)                  # def add_address(value)
+          self[:#{name}] ||= []                             #   self[:addresses] ||= []
+          self[:#{name}] << value                           #   self[:addresses] << value
           #{name}                                           #   addresses
         end                                                 # end
       eorb

data/lib/orientdb-ar/sql/delete.rb

@@ -0,0 +1,33 @@
+class OrientDB::AR::Delete
+
+  attr_accessor :model, :command
+
+  def initialize(model, command = OrientDB::SQL::Delete.new)
+    @model, @command = model, command
+    @command.oclass model.oclass_name
+  end
+
+  %w{ oclass oclass! cluster cluster! where where! and or and_not or_not }.each do |name|
+    define_method(name) do |*args|
+      command.send name, *args
+      self
+    end
+  end
+
+  def self.from_query(query)
+    obj = new query.model
+    obj.command.instance_variable_set "@conditions", query.query.instance_variable_get("@conditions")
+    obj
+  end
+
+  def run
+    model.connection.run_command command.to_s
+  end
+
+  def inspect
+    %{#<OrientDB::AR::Delete:#{model.name} command="#{command.to_s}">}
+  end
+
+  alias :to_s :inspect
+
+end

data/lib/orientdb-ar/sql/insert.rb

@@ -0,0 +1,27 @@
+class OrientDB::AR::Insert
+
+  attr_accessor :model, :command
+
+  def initialize(model, command = OrientDB::SQL::Insert.new)
+    @model, @command = model, command
+    @command.oclass model.oclass_name
+  end
+
+  %w{ oclass oclass! cluster cluster! fields fields! values values! }.each do |name|
+    define_method(name) do |*args|
+      command.send name, *args
+      self
+    end
+  end
+
+  def run
+    model.connection.run_command command.to_s
+  end
+
+  def inspect
+    %{#<OrientDB::AR::Insert:#{model.name} command="#{command.to_s}">}
+  end
+
+  alias :to_s :inspect
+
+end

data/lib/{model → orientdb-ar/sql}/query.rb

@@ -4,7 +4,7 @@ class OrientDB::AR::Query
 
   def initialize(model, query = OrientDB::SQL::Query.new)
     @model, @query = model, query
-    @query.from model.name
+    @query.from model.oclass_name
   end
 
   %w{ select select! where where! and or and_not or_not order order! limit limit! range range! }.each do |name|
@@ -15,15 +15,27 @@ class OrientDB::AR::Query
   end
 
   def all
-    model.connection.query(query).map { |doc| model.new_from_doc doc }
+    model.connection.all(query).map { |doc| doc.to_orientdb_ar }
   end
 
   def first
-    model.new_from_doc model.connection.first(query)
+    model.connection.first(query).to_orientdb_ar
   end
 
   def results
-    model.connection.query(query).map
+    model.connection.all(query).map
+  end
+
+  def first_result
+    model.connection.first(query)
+  end
+
+  def update(*args)
+    OrientDB::AR::Update.from_query(self, *args).run
+  end
+
+  def delete
+    OrientDB::AR::Delete.from_query(self).run
   end
 
   def inspect

data/lib/orientdb-ar/sql/update.rb

@@ -0,0 +1,34 @@
+class OrientDB::AR::Update
+
+  attr_accessor :model, :command
+
+  def initialize(model, command = OrientDB::SQL::Update.new)
+    @model, @command = model, command
+    @command.oclass model.oclass_name
+  end
+
+  %w{ oclass oclass! cluster cluster! action fields fields! values values! where where! and or and_not or_not }.each do |name|
+    define_method(name) do |*args|
+      command.send name, *args
+      self
+    end
+  end
+
+  def run
+    model.connection.run_command command.to_s
+  end
+
+  def self.from_query(query, *args)
+    obj = new query.model
+    obj.command.instance_variable_set "@conditions", query.query.instance_variable_get("@conditions")
+    obj.command.fields *args
+    obj
+  end
+
+  def inspect
+    %{#<OrientDB::AR::Update:#{model.name} command="#{command.to_s}">}
+  end
+
+  alias :to_s :inspect
+
+end

data/lib/orientdb-ar/sql.rb

@@ -0,0 +1,4 @@
+require 'orientdb-ar/sql/query'
+require 'orientdb-ar/sql/update'
+require 'orientdb-ar/sql/delete'
+require 'orientdb-ar/sql/insert'

data/lib/orientdb-ar.rb

@@ -5,5 +5,9 @@ module OrientDB
   end
 end
 
-require 'model/base'
-require 'model/embedded'
+require 'orientdb-ar/document_mixin'
+require 'orientdb-ar/base'
+require 'orientdb-ar/embedded'
+require 'orientdb-ar/ext'
+
+OrientDB::SQL.monkey_patch!

data/orientdb-ar.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orientdb-ar}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
   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-18}
+  s.date = %q{2011-01-26}
   s.default_executable = %q{orientdbar_console}
   s.description = %q{Active Model wrappers to persist Ruby objects under OrientDB in JRuby.}
   s.email = ["aemadrid@gmail.com"]
@@ -28,14 +28,20 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/orientdbar_console",
-    "lib/model/attributes.rb",
-    "lib/model/base.rb",
-    "lib/model/conversion.rb",
-    "lib/model/embedded.rb",
-    "lib/model/query.rb",
-    "lib/model/relations.rb",
-    "lib/model/validations.rb",
     "lib/orientdb-ar.rb",
+    "lib/orientdb-ar/attributes.rb",
+    "lib/orientdb-ar/base.rb",
+    "lib/orientdb-ar/conversion.rb",
+    "lib/orientdb-ar/document_mixin.rb",
+    "lib/orientdb-ar/embedded.rb",
+    "lib/orientdb-ar/ext.rb",
+    "lib/orientdb-ar/relations.rb",
+    "lib/orientdb-ar/sql.rb",
+    "lib/orientdb-ar/sql/delete.rb",
+    "lib/orientdb-ar/sql/insert.rb",
+    "lib/orientdb-ar/sql/query.rb",
+    "lib/orientdb-ar/sql/update.rb",
+    "lib/orientdb-ar/validations.rb",
     "orientdb-ar.gemspec",
     "spec/base_spec.rb",
     "spec/dirty_spec.rb",
@@ -55,26 +61,25 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://rubygems.org/gems/orientdb}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{orientdb-ar}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{ActiveRecord-like persistency through OrientDB in JRuby}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<orientdb>, ["= 0.0.11"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<orientdb>, ["= 0.0.15"])
       s.add_runtime_dependency(%q<activemodel>, [">= 3.0.3"])
       s.add_development_dependency(%q<awesome_print>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.4"])
     else
-      s.add_dependency(%q<orientdb>, ["= 0.0.11"])
+      s.add_dependency(%q<orientdb>, ["= 0.0.15"])
       s.add_dependency(%q<activemodel>, [">= 3.0.3"])
       s.add_dependency(%q<awesome_print>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.4"])
     end
   else
-    s.add_dependency(%q<orientdb>, ["= 0.0.11"])
+    s.add_dependency(%q<orientdb>, ["= 0.0.15"])
     s.add_dependency(%q<activemodel>, [">= 3.0.3"])
     s.add_dependency(%q<awesome_print>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.4"])

data/spec/base_spec.rb

@@ -2,6 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Base" do
   it "should have a valid connection" do
-    OrientDB::AR::Base.connection.should be_a_kind_of OrientDB::Database
+    OrientDB::AR::Base.connection.should be_a_kind_of OrientDB::DocumentDatabase
   end
 end

data/spec/model_spec.rb

@@ -3,16 +3,16 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Model" do
 
   it "should have a valid connection" do
-    Person.connection.should be_a_kind_of OrientDB::Database
+    Person.connection.should be_a_kind_of OrientDB::DocumentDatabase
   end
 
   it "should have the right schema" do
     Person.new.should be_a_kind_of Person
     Person.oclass_name.should == 'Person'
     Person.fields.keys.should == [:name, :age, :tags]
-    Person.fields[:name].should == {:type => :string, :not_null => true}
-    Person.fields[:age].should == {:type => :int}
-    Person.fields[:tags].should == {:type => [:list, :string]}
+    Person.fields[:name].should == { :type => :string, :not_null => true }
+    Person.fields[:age].should == { :type => :int }
+    Person.fields[:tags].should == { :type => [:list, :string] }
   end
 
   it "should create working models" do
@@ -31,7 +31,7 @@ describe "Model" do
   it "should handle embedded models as relations" do
     Customer.clear
 
-    a = Address.new :street => "123 S Main", :city => "Salt Lake", :state => "UT", :country => "USA"
+    a  = Address.new :street => "123 S Main", :city => "Salt Lake", :state => "UT", :country => "USA"
     p1 = PhoneNumber.new :number => "123456789"
     p2 = PhoneNumber.new :number => "987654321"
     c1 = Customer.create :name => "Albert Einstein", :number => 1, :address => a, :phones => [p1, p2]
@@ -56,4 +56,46 @@ describe "Model" do
     Person.where("'fighter' IN tags", :age.lte(28)).order(:name.desc).all.first.should == p4
   end
 
+  it "should update models" do
+    Person.clear
+
+    p1 = Person.create :name => "Hans Solo", :age => 38, :tags => %w{ fighter pilot }
+    p2 = Person.create :name => "Yoda", :age => 387, :tags => %w{ genius jedi }
+    p3 = Person.create :name => "Luke Skywalker", :age => 28, :tags => %w{ jedi fighter pilot }
+
+    Person.where(:name => "Hans Solo").update(:name => "Hans Meister")
+    Person.where(:name => "Hans Meister").all.map { |x| x.rid }.should == [p1.rid]
+    p1.reload
+    Person.where(:name => "Hans Meister").all.should == [p1]
+
+
+    Person.update(:age => 45)
+    Person.where(:age => 45).all.map { |x| x.name }.should == [p1.name, p2.name, p3.name]
+  end
+
+  it "should delete models" do
+    Person.clear
+
+    Person.create :name => "Hans Solo", :age => 38, :tags => %w{ fighter pilot }
+    Person.create :name => "Yoda", :age => 387, :tags => %w{ genius jedi }
+    Person.create :name => "Luke Skywalker", :age => 28, :tags => %w{ jedi fighter pilot }
+
+    Person.count.should == 3
+
+    Person.where(:name => "Hans Solo").delete
+    Person.count.should == 2
+
+    Person.delete
+    Person.count.should == 0
+  end
+
+  it "should insert models" do
+    Person.clear
+
+    p1 = Person.insert :name => "Hans Solo", :age => 38, :tags => %w{ fighter pilot }
+    Person.count.should == 1
+
+    p2 = Person.first
+    p1.should == p2
+  end
 end

data/spec/models/address.rb

@@ -5,4 +5,3 @@ class Address < OrientDB::AR::Embedded
   field :zip, :string
   field :country, :string
 end
-Address.schema!

data/spec/models/customer.rb

@@ -1,6 +1,6 @@
 class Customer < Person
   field :number, :int, :not_null => true
-  has_one Address, :name => :address
-  has_many PhoneNumber, :name => :phones
+  embedds_one Address, :name => :address
+  embedds_many PhoneNumber, :name => :phones
 end
 Customer.schema!

data/spec/models/phone_number.rb

@@ -2,5 +2,4 @@ class PhoneNumber < OrientDB::AR::Embedded
   field :type, :string
   field :number, :string
   field :extension, :string
-end
-PhoneNumber.schema!
+end

data/spec/spec_helper.rb

@@ -23,7 +23,7 @@ unless defined?(SPEC_HELPER_LOADED)
   FileUtils.remove_dir TEMP_DIR + '/test', true
   puts ">> Creating OrientDB database..."
   FileUtils.mkdir_p TEST_DB_PATH
-  OrientDB::AR::Base.connection = OrientDB::Database.new("local:#{TEST_DB_PATH}/test").create
+  OrientDB::AR::Base.connection = OrientDB::DocumentDatabase.new("local:#{TEST_DB_PATH}/test").create
   puts ">> Connection : #{OrientDB::AR::Base.connection}"
 
   require SPEC_ROOT + '/models/person'

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: orientdb-ar
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 0
-    - 3
-  version: 0.0.3
+  prerelease: 
+  version: 0.0.4
 platform: jruby
 authors: 
   - Adrian Madrid
@@ -14,34 +10,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 -07:00
+date: 2011-01-26 00:00:00 -07:00
 default_executable: orientdbar_console
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: orientdb
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 0
-              - 11
-            version: 0.0.11
+            version: 0.0.15
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: activemodel
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 3
-              - 0
-              - 3
             version: 3.0.3
     type: :runtime
     version_requirements: *id002
@@ -49,11 +39,10 @@ dependencies:
     name: awesome_print
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :development
     version_requirements: *id003
@@ -61,12 +50,10 @@ dependencies:
     name: rspec
     prerelease: false
     requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 4
             version: "2.4"
     type: :development
     version_requirements: *id004
@@ -89,14 +76,20 @@ files:
   - Rakefile
   - VERSION
   - bin/orientdbar_console
-  - lib/model/attributes.rb
-  - lib/model/base.rb
-  - lib/model/conversion.rb
-  - lib/model/embedded.rb
-  - lib/model/query.rb
-  - lib/model/relations.rb
-  - lib/model/validations.rb
   - lib/orientdb-ar.rb
+  - lib/orientdb-ar/attributes.rb
+  - lib/orientdb-ar/base.rb
+  - lib/orientdb-ar/conversion.rb
+  - lib/orientdb-ar/document_mixin.rb
+  - lib/orientdb-ar/embedded.rb
+  - lib/orientdb-ar/ext.rb
+  - lib/orientdb-ar/relations.rb
+  - lib/orientdb-ar/sql.rb
+  - lib/orientdb-ar/sql/delete.rb
+  - lib/orientdb-ar/sql/insert.rb
+  - lib/orientdb-ar/sql/query.rb
+  - lib/orientdb-ar/sql/update.rb
+  - lib/orientdb-ar/validations.rb
   - orientdb-ar.gemspec
   - spec/base_spec.rb
   - spec/dirty_spec.rb
@@ -122,25 +115,21 @@ rdoc_options: []
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 1
-          - 3
-          - 6
         version: 1.3.6
 requirements: []
 
 rubyforge_project: orientdb-ar
-rubygems_version: 1.3.6
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: ActiveRecord-like persistency through OrientDB in JRuby

data/lib/model/embedded.rb

@@ -1,197 +0,0 @@
-class OrientDB::AR::Embedded
-  include ActiveModel::AttributeMethods
-  include Comparable
-
-  extend ActiveModel::Translation
-
-  include OrientDB::AR::Attributes
-  include OrientDB::AR::Conversion
-  include OrientDB::AR::Validations
-
-  include ActiveModel::Serializers::JSON
-  include ActiveModel::Serializers::Xml
-
-  class_inheritable_hash :fields
-  self.fields = ActiveSupport::OrderedHash.new
-
-  attr_reader :odocument
-
-  def initialize(fields = {})
-    @odocument          = self.class.new_document fields
-    @changed_attributes = {}
-    @errors             = ActiveModel::Errors.new(self)
-  end
-
-  def field?(name)
-    res = @odocument.field?(name)
-    res
-  end
-
-  def respond_to?(method_name)
-    # Simple field value lookup
-    return true if field?(method_name)
-    # Dirty
-    return true if method_name.to_s =~ /(\w*)(_changed\?|_change|_will_change!|_was)$/ && field?($1)
-    # Setter
-    return true if method_name.to_s =~ /(.*?)=$/
-    # Boolean
-    return true if method_name.to_s =~ /(.*?)?$/ && field?($1)
-    # Unknown pattern
-    super
-  end
-
-  def method_missing(method_name, *args, &blk)
-    # Simple field value lookup
-    return self[method_name] if field?(method_name)
-    # Dirty
-    if method_name.to_s =~ /(\w*)(_changed\?|_change|_will_change!|_was)$/ && field?($1)
-      __send__("attribute#{$2}", $1)
-      # Setter
-    elsif method_name.to_s =~ /(.*?)=$/
-      self[$1] = args.first
-      # Boolean
-    elsif method_name.to_s =~ /(.*?)?$/ && field?($1)
-      !!self[$1]
-      # Unknown pattern
-    else
-      super
-    end
-  end
-
-  def save
-    raise "Not implemented on Embedded models"
-  end
-
-  def delete
-    raise "Not implemented on Embedded models"
-  end
-
-  def saved?
-    false
-  end
-
-  def deleted?
-    false
-  end
-
-  def persisted?
-    false
-  end
-
-  def inspect
-    attrs       = attributes.map { |k, v| "#{k}:#{v.inspect}" }.join(' ')
-    super_klass = self.class.descends_from_embedded? ? '' : "(#{self.class.superclass.name})"
-    %{#<#{self.class.name}#{super_klass}:#{@odocument.rid} #{attrs}>}
-  end
-
-  alias :to_s :inspect
-
-  def <=>(other)
-    to_s <=> other.to_s
-  end
-
-  class << self
-
-    def connection
-      OrientDB::AR::Base.connection
-    end
-
-    attr_writer :oclass_name
-
-    def oclass_name
-      @oclass_name ||= name.to_s
-    end
-
-    def oclass
-      unless defined?(@oclass)
-        options = {}
-        unless descends_from_embedded?
-          super_oclass          = superclass.oclass
-          options[:super]       = super_oclass
-          options[:use_cluster] = super_oclass.cluster_ids.first
-        end
-        @oclass = connection.get_or_create_class oclass_name, options
-      end
-      @oclass
-    end
-
-    def embedded?
-      true
-    end
-
-    def field(name, type, options = {})
-      name = name.to_sym
-      if fields.key? name
-        puts "Already defined field [#{name}]"
-      else
-        fields[name] = {:type => type}.update options
-      end
-    end
-
-    def descends_from_embedded?
-      superclass && superclass == OrientDB::AR::Embedded
-    end
-
-    def schema!
-      fields.each do |field, options|
-        oclass.add field, options[:type], options.except(:type)
-      end
-      self
-    end
-
-    def new_document(fields = {})
-      oclass
-      OrientDB::Document.new connection, oclass_name, fields
-    end
-
-    def create(fields = {})
-      raise "Not implemented on Embedded models"
-    end
-
-    def select(*args)
-      raise "Not implemented on Embedded models"
-    end
-
-    alias :columns :select
-
-    def where(*args)
-      raise "Not implemented on Embedded models"
-    end
-
-    def order(*args)
-      raise "Not implemented on Embedded models"
-    end
-
-    def limit(max_records)
-      raise "Not implemented on Embedded models"
-    end
-
-    def range(lower_rid, upper_rid = nil)
-      raise "Not implemented on Embedded models"
-    end
-
-    def all(conditions = {})
-      raise "Not implemented on Embedded models"
-    end
-
-    def first(conditions = {})
-      raise "Not implemented on Embedded models"
-    end
-
-    def clear
-      raise "Not implemented on Embedded models"
-    end
-
-    def new_from_doc(doc)
-      klass = doc.getClassName.constantize
-      obj   = klass.new
-      obj.instance_variable_set "@odocument", doc
-      obj
-    end
-
-    def new_from_docs(docs)
-      docs.map { |doc| new_from_doc doc }
-    end
-  end
-
-end