orientdb-ar 0.0.4-jruby → 0.0.5-jruby

data/Rakefile

@@ -17,8 +17,9 @@ begin
     gem.required_rubygems_version = ">= 1.3.6"
     gem.rubyforge_project         = "orientdb-ar"
 
-    gem.add_dependency "orientdb", "0.0.15"
+    gem.add_dependency "orientdb", ">= 0.0.20"
     gem.add_dependency "activemodel", ">= 3.0.3"
+    gem.add_dependency "jnunemaker-validatable", "1.8.4"
     gem.add_development_dependency "awesome_print"
     gem.add_development_dependency "rspec", ">= 2.4"
 

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/orientdbar_console

@@ -11,6 +11,7 @@ if ARGV.include?('test:db')
   puts ">> GEM_ROOT     : #{GEM_ROOT}"
   puts ">> TEST_DB PATH : #{TEST_DB_PATH}"
 
+  require 'rspec'
   require 'fileutils'
   puts ">> Removing tmp directory #{TEMP_DIR} ..."
   FileUtils.remove_dir TEMP_DIR + '/databases', true
@@ -20,12 +21,29 @@ if ARGV.include?('test:db')
   DB = OrientDB::AR::Base.connection
   puts ">> Connection : #{OrientDB::AR::Base.connection}"
 
-  require SPEC_ROOT + '/models/person'
-  require SPEC_ROOT + '/models/simple_person'
-  require SPEC_ROOT + '/models/address'
-  require SPEC_ROOT + '/models/phone_number'
-  require SPEC_ROOT + '/models/customer'
-  require SPEC_ROOT + '/models/flo_admin'
+  def remove_constant(const) #:nodoc:
+    names = const.to_s.sub(/^::(Object)?/, 'Object::').split("::")
+    to_remove = names.pop
+    parent = names.join('::').constantize
+    parent.instance_eval { remove_const to_remove }
+    true
+  end
+
+  def load_models
+    %w{ person simple_person address phone_number customer flo_admin product invoice_line invoice }.each do |name|
+      klass_name = name.camelize
+      klass_name = "Flo::Admin" if klass_name == "FloAdmin"
+      klass = klass_name.constantize rescue nil
+      if klass
+        puts ">> Removing class #{klass} ..."
+        remove_constant klass
+      end
+      puts ">> Loading #{klass_name} ..."
+      load SPEC_ROOT + '/models/' + name + '.rb'
+    end
+  end
+
+  load_models
 end
 
 require 'irb'

data/lib/orientdb-ar/attributes.rb

@@ -18,12 +18,11 @@ module OrientDB::AR
     end
 
     def [](attr)
-      res = @odocument[attr]
-      res.respond_to?(:to_orientdb_ar) ? res.to_orientdb_ar : res
+      self.class.from_orientdb @odocument[attr]
     end
 
     def []=(attr, value)
-      value = value.respond_to?(:to_orientdb) ? value.to_orientdb : value
+      value = self.class.to_orientdb value
       old_value = self[attr]
       return old_value if value == old_value
       attribute_will_change!(attr)

data/lib/orientdb-ar/base.rb

@@ -1,29 +1,37 @@
 class OrientDB::AR::Base
 
-  def self.embeddable?
-    false
-  end
-
   include ActiveModel::AttributeMethods
   include OrientDB::AR::DocumentMixin
 
-  class_inheritable_hash :fields
-  self.fields = ActiveSupport::OrderedHash.new
-
   class_attribute :connection
 
-  define_model_callbacks :save, :delete
+  define_model_callbacks :validation, :save, :delete
 
-  def save
+  def save(perform_validations = true)
     _run_save_callbacks do
-      @odocument.save
-      @saved              = true
-      @previously_changed = @changed_attributes
-      @changed_attributes.clear
+      if perform_validations
+        validate
+        if @last_validation_result
+          save_without_validations
+        else
+          false
+        end
+      else
+        save_without_validations
+      end
     end
+  end
+
+  def save_without_validations
+    @odocument.save
+    @saved              = true
+    @previously_changed = @changed_attributes
+    @changed_attributes.clear
     true
   end
 
+  private :save_without_validations
+
   def delete
     _run_delete_callbacks do
       @odocument.delete
@@ -34,7 +42,7 @@ class OrientDB::AR::Base
 
   def reload
     raise "Not persisted, cannot reload" unless persisted?
-    @odocument = OrientDB::AR::Query.new(self.class).where('@rid' => rid.lit).first_result
+    @odocument          = OrientDB::AR::Query.new(self.class).where('@rid' => rid.lit).first_result
     @changed_attributes = { }
     @errors             = ActiveModel::Errors.new(self)
     self
@@ -58,13 +66,13 @@ class OrientDB::AR::Base
 
     attr_writer :oclass_name
 
-    def oclass_name
-      @oclass_name ||= name.to_s
+    def embeddable?
+      false
     end
 
     def oclass
       unless defined?(@oclass)
-        options = {}
+        options = { }
         unless descends_from_base?
           super_oclass          = superclass.oclass
           options[:super]       = super_oclass
@@ -75,12 +83,12 @@ class OrientDB::AR::Base
       @oclass
     end
 
-    def field(name, type, options = {})
+    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
+        fields[name] = { :type => type }.update options
       end
     end
 
@@ -88,14 +96,7 @@ class OrientDB::AR::Base
       superclass && superclass == OrientDB::AR::Base
     end
 
-    def schema!
-      fields.each do |field, options|
-        oclass.add field, options[:type], options.except(:type)
-      end
-      self
-    end
-
-    def create(fields = {})
+    def create(fields = { })
       obj = new fields
       obj.save
       obj
@@ -123,11 +124,11 @@ class OrientDB::AR::Base
       OrientDB::AR::Query.new(self).range(lower_rid, upper_rid)
     end
 
-    def all(conditions = {})
+    def all(conditions = { })
       OrientDB::AR::Query.new(self).where(conditions).all
     end
 
-    def first(conditions = {})
+    def first(conditions = { })
       OrientDB::AR::Query.new(self).where(conditions).first
     end
 
@@ -150,8 +151,9 @@ class OrientDB::AR::Base
     def clear
       oclass.truncate
     end
-  end
 
+
+  end
 end
 
 OrientDB::AR::Base.include_root_in_json = false

data/lib/orientdb-ar/document_mixin.rb

@@ -4,28 +4,43 @@ 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 'active_support/core_ext/module/aliasing'
 require 'orientdb'
+require 'validatable'
 
 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
+  def self.included(base)
+    base.class_eval do
+      include Comparable
+
+      include Validatable
+      alias_method_chain :valid?, :default_group
 
-  include OrientDB::AR::Attributes
-  include OrientDB::AR::Conversion
-  include OrientDB::AR::Validations
+      include OrientDB::AR::Attributes
+      include OrientDB::AR::Conversion
 
-  def self.included(base)
-    base.extend ActiveModel::Translation
-    base.extend ActiveModel::Callbacks unless base.embeddable?
+      extend ActiveModel::Translation
+      include ActiveModel::Serializers::JSON
+      include ActiveModel::Serializers::Xml
+
+      extend ActiveModel::Callbacks
+
+      class_inheritable_hash :fields
+      self.fields = ActiveSupport::OrderedHash.new
+
+      class_inheritable_hash :relationships
+      self.relationships = ActiveSupport::OrderedHash.new
 
-    base.send :include, ActiveModel::Serializers::JSON
-    base.send :include, ActiveModel::Serializers::Xml
+      class_inheritable_accessor :default_validation_group
 
+      class_attribute :connection
+    end
     base.extend OrientDB::AR::DocumentMixin::ClassMethods
   end
 
@@ -38,10 +53,53 @@ module OrientDB::AR::DocumentMixin
     fields.each { |k, v| send "#{k}=", v }
   end
 
+  def human_id
+    rid
+  end
+
   def field?(name)
     @odocument.field?(name)
   end
 
+  def validate
+    @last_validation_result = nil
+    _run_validation_callbacks do
+      @last_validation_result = valid?
+    end
+    @last_validation_result
+  end
+
+  def valid_with_default_group?
+    valid_for_group?(default_validation_group) && related_valid?
+  end
+
+  def related_valid?
+    res = related.all? do |rel_name, row_or_coll|
+      case row_or_coll
+        when Array
+          row_or_coll.all? do |result|
+            result.validate_to_parent errors, rel_name
+          end
+        else
+          row_or_coll.validate_to_parent errors, rel_name
+      end
+    end
+    res
+  end
+
+  def validate_to_parent(parent_errors, rel_name)
+    return true if valid?
+    errors.full_messages.each { |msg| parent_errors[rel_name] = "#{human_id} #{msg}" }
+    false
+  end
+
+  def related
+    relationships.map do |rel_name, options|
+      rel_obj = send options[:name]
+      rel_obj.blank? ? nil : [rel_name, rel_obj]
+    end.compact
+  end
+
   def respond_to?(method_name)
     # Simple field value lookup
     return true if field?(method_name)
@@ -96,7 +154,8 @@ module OrientDB::AR::DocumentMixin
   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}>}
+    rid_str     = embedded? ? '(E)' : ":#{@odocument.rid}"
+    %{#<#{self.class.name}#{super_klass}#{rid_str} #{attrs}>}
   end
 
   alias :to_s :inspect
@@ -109,8 +168,12 @@ module OrientDB::AR::DocumentMixin
 
     attr_writer :oclass_name
 
+    def oclass_name_for(value)
+      value.to_s.gsub('::', '__')
+    end
+
     def oclass_name
-      @oclass_name ||= name.to_s.gsub('::', '__')
+      @oclass_name ||= oclass_name_for name
     end
 
     def field(name, type, options = { })
@@ -122,6 +185,17 @@ module OrientDB::AR::DocumentMixin
       end
     end
 
+    def schema!
+      fields.each do |field, options|
+        begin
+          oclass.add field, options[:type], options.except(:type)
+        rescue Exception => e
+          raise e unless e.message =~ /already exists/
+        end
+      end
+      self
+    end
+
     def new_document
       OrientDB::Document.new connection, oclass_name
     end

data/lib/orientdb-ar/embedded.rb

@@ -1,14 +1,9 @@
 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
+  define_model_callbacks :validation
 
   def save
     raise "Not implemented on Embedded models"
@@ -36,6 +31,12 @@ class OrientDB::AR::Embedded
 
   class << self
 
+    include OrientDB::AR::Relations
+
+    def embeddable?
+      true
+    end
+
     def connection
       OrientDB::AR::Base.connection
     end
@@ -48,11 +49,7 @@ class OrientDB::AR::Embedded
       superclass && superclass == OrientDB::AR::Embedded
     end
 
-    def schema!
-      raise "Not implemented on Embedded models"
-    end
-
-    def create(fields = {})
+    def create(fields = { })
       raise "Not implemented on Embedded models"
     end
 
@@ -78,11 +75,11 @@ class OrientDB::AR::Embedded
       raise "Not implemented on Embedded models"
     end
 
-    def all(conditions = {})
+    def all(conditions = { })
       raise "Not implemented on Embedded models"
     end
 
-    def first(conditions = {})
+    def first(conditions = { })
       raise "Not implemented on Embedded models"
     end
 
@@ -106,5 +103,4 @@ class OrientDB::AR::Embedded
       raise "Not implemented on Embedded models"
     end
   end
-
 end

data/lib/orientdb-ar/ext.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 class OrientDB::Document
   def to_orientdb_ar
     klass = getClassName.gsub('__', '::').constantize
@@ -31,6 +33,42 @@ class NilClass
   end
 end
 
+class Float
+  def to_orientdb
+    to_java
+  end
+end
+
+class Java::JavaLang::Double
+  def to_orientdb_ar
+    to_s.to_f
+  end
+end
+
+class Java::JavaUtil::Date
+  def to_orientdb_ar
+    ::Time.at(getTime / 1000)
+  end
+end
+
+class Time
+  def to_orientdb
+    java.util.Date.new to_i * 1000
+  end
+end
+
+class Date
+  def to_orientdb
+    java.util.Date.new year - 1900, month - 1, day, 0, 0, 0
+  end
+end
+
+class DateTime
+  def to_orientdb
+    java.util.Date.new year - 1900, month - 1, day, hour, min, sec
+  end
+end
+
 class Array
   def to_orientdb
     map { |x| x.respond_to?(:to_orientdb) ? x.to_orientdb : x }
@@ -55,4 +93,4 @@ class Java::JavaUtil::ArrayList
   def to_orientdb_ar
     map { |x| x.respond_to?(:to_orientdb_ar) ? x.to_orientdb_ar : x }
   end
-end
+end