adaptation 0.0.4 → 0.0.5

data/CHANGELOG

@@ -2,3 +2,5 @@
     - changed script/mom to mom as a standalone executable (like adaptation)
 * 0.0.4
     - added console and debugger
+* 0.0.5
+    - migrated to ActiveRrecord validations

data/lib/adaptation/message.rb

@@ -89,23 +89,18 @@ module Adaptation
 #      has_one :attribute, :type
 #      has_one :text, :owner
 #      validates_presence_of :owner, :type
-#      validates_value :type, "indexed"
+#      validates_value_of :type, "indexed"
 #    end
 #
 #
   class Message
     
-    @@validations = {}
-    @@default_error_messages = {
-      :invalid_value => "Invalid value",
-      :must_be_present => "Must be present"
-    }
-    @@errors = []
     @@classes_with_brothers = []
     cattr_reader :classes_with_brothers
     cattr_reader :validations
     cattr_reader :objects
     
+    include Validateable
     include ROXML
 
     def to_hash
@@ -217,6 +212,7 @@ module Adaptation
               klass = get_class_object(symbols[1].to_s.capitalize)
             end
             xml_object symbols[1], klass
+            validates_associated symbols[1]
           end
         when :attribute
           @attributes = [] if @attributes.nil?
@@ -234,7 +230,7 @@ module Adaptation
             @texts << symbols[1]
             xml_text symbols[1]
           end
-      end		
+      end
     end
 
     def self.has_text
@@ -281,229 +277,26 @@ module Adaptation
         
         if configuration[:in]
           xml_object configuration[:in], klass, ROXML::TAG_ARRAY, configuration[:in].to_s
+          validates_associated configuration[:in]
         else
           xml_object options[0], klass, ROXML::TAG_ARRAY #, options[0].to_s 
+          validates_associated options[0]
         end
       end
     end
 
     def self.get_class_object(searched_class)
-      #class_object = nil
-      #ObjectSpace.each_object(Class){|aClass|
-      #  class_object = aClass if aClass.to_s == searched_class
-      #}
-      #if class_object.nil?
-      #  raise Exception.new("Unknown class #{searched_class}.")
-      #else
-      #  return class_object
-      #end
       Object.const_get searched_class
     end
     
-    def self.get_validations_array
-      validations_arrays = self.has_brothers?
-      if validations_arrays.nil?
-        validations_arrays = [self.to_s]  
-      end
-      
-      validations_arrays.each do |va|
-        @@validations[va] = [] if @@validations[va].nil?  
-      end
-      
-      validations_arrays
-    end
-
-    def self.validates_value(*options)
-      get_validations_array.each do |va|
-             
-        validation = Validation.new {|message|
-          configuration = {:message => @@default_error_messages[:invalid_value] }
-          brothers_containers = self.has_brothers?
-          if !brothers_containers
-            unless (message.send(options[0]) == options[1].to_s)
-              @@errors << [options[0], message.send(options[0]), configuration[:message]]
-            end  
-          else
-            brothers_containers.each do |bc|
-              elements = message.search_objects(bc.split(":")[1].to_sym)
-              bad_element = nil
-              elements.each do |e|  
-                if e.send(options[0]) != options[1].to_s
-                  bad_element = e  
-                  break
-                end
-              end      
-              unless bad_element.nil?
-                @@errors << [options[0], bad_element.send(options[0]), configuration[:message]]
-              end   
-                
-              #container = nil  
-              #begin  
-              #  container = message.send(bc.split(":")[1].to_sym)
-              #rescue Exception => e
-              #  container = nil
-              #  next
-              #end
-              #  
-              #if container
-              #  bad_son = nil
-              #  container.each do |son|
-              #    if son.send(options[0]) != options[1].to_s
-              #      bad_son = son
-              #      break
-              #    end
-              #  end
-              #  unless bad_son.nil?
-              #    @@errors << [options[0], bad_son.send(options[0]), configuration[:message]]
-              #  end 
-              #end
-            end
-            
-          end
-          
-          #if belongs_to.nil?
-          #  unless (message.send(options[0]) == options[1].to_s)
-          #    @@errors << [options[0], message.send(options[0]), configuration[:message]]
-          #  end
-          #else
-          #  found = false
-          #  message.send(belongs_to).each do |son|
-          #    if son.send(options[0]) == options[1].to_s
-          #      found = true
-          #      break
-          #    end
-          #  end
-          #  unless found
-          #    @@errors << [options[0], message.send(options[0]), configuration[:message]]
-          #  end
-          #end
-        }
-
-        validation.vid = "#{self.to_s} validates_value #{options.map{|o| o.to_s + " "}}"
-        validation_already_present = false
-        @@validations[va].each do |v|
-          if v.vid == validation.vid
-            validation_already_present = true
-            break
-          end    
-        end
-        if !validation_already_present
-          @@validations[va] << validation
-        end
-        
-      end
-    end
-
-    def self.validates_presence_of *options
-      get_validations_array.each do |va|
-          
-        validation = Validation.new {|message|
-          configuration = {:message => @@default_error_messages[:must_be_present]}
-          options.each do |o|
-            brothers_containers = self.has_brothers?
-            if !brothers_containers
-              if message.send(o).nil?
-                @@errors << [o, message.send(o), configuration[:message]]
-              end
-            else
-              brothers_containers.each do |bc|
-                elements = message.search_objects(bc.split(":")[1].to_sym)
-                elements.each do |e|  
-                  if e.send(o).nil?
-                    @@errors << [o, e.send(o), configuration[:message]]
-                  end
-                end  
-                
-                #container = nil  
-                #begin  
-                #  container = message.send(bc.split(":")[1].to_sym)
-                #rescue Exception => e
-                #  container = nil
-                #  next
-                #end
-                #
-                #if container
-                #  container.each do |son|
-                #    if son.send(o).nil?
-                #      @@errors << [o, son.send(o), configuration[:message]]
-                #      break
-                #    end
-                #  end    
-                #end
-                
-              end  
-              
-            end
-          end
-        }
-        validation.vid = "#{self.to_s} validates_presence_of #{options.map{|o| o.to_s + " "}}"
-        validation_already_present = false
-        @@validations[va].each do |v|
-          if v.vid == validation.vid
-            validation_already_present = true
-            break
-          end    
-        end
-        if !validation_already_present
-          @@validations[va] << validation
-        end
-      end
-    end
-
-    def self.validates_uniqueness_of(*options)
-    end
-
     def self.to_object xml_message
       parse xml_message
     end
 
     def check
-      clear_errors
-      
-      @@validations.each_key do |k|
-        son = k.split(":")[1]
-        unless son.nil?
-          objects = self.search_objects(son.to_sym)
-          unless objects.empty?
-          #if self.has_son? son.to_sym
-            @@validations[k].each do |v|   
-              v.call(self)
-            end
-          end
-        end
-      end
-      
-      unless @@validations[self.class.to_s].nil?
-        @@validations[self.class.to_s].each do |v|
-          v.call(self)
-        end
-      end
-
-      unless @@errors.empty?
-        error = "Errors found in XML message:\n"
-        @@errors.each do |e|
-          error << "  #{e[0]}: #{e[2]}\n"
-          error << "    #{e[1]}\n" 
-        end
-        puts "#{error}"
-        return false
-      end
-
-      return true
-    end
-
-    def get_errors
-      @@errors
-    end
-    
-    def clear_errors
-      @@errors = []
+      valid?
     end
 
   end
   
-  class Validation < Proc
-    attr_accessor :vid  
-  end
-
 end

data/lib/adaptation/test/test_help.rb

@@ -280,15 +280,6 @@ class Test::Unit::TestCase
   
   # this method is repeated many times all over the code!
   def get_class_object(searched_class) #:nodoc:
-    #class_object = nil
-    #ObjectSpace.each_object(Class){|aClass|
-    #  class_object = aClass if aClass.to_s == searched_class
-    #}
-    #if class_object.nil?
-    #  raise Exception.new("Unknown class #{searched_class}.")
-    #else
-    #  return class_object
-    #end
     Object.const_get searched_class
   end
 

data/lib/adaptation/validateable.rb

@@ -0,0 +1,61 @@
+module Validateable
+
+  [:save, :save!, :update_attribute].each{|attr| define_method(attr){}}
+
+  def method_missing(symbol, *params)
+    if(symbol.to_s =~ /(.*)_before_type_cast$/)
+      send($1)
+    end
+  end
+
+  def self.append_features(base)
+    super
+    base.send(:include, ActiveRecord::Validations)
+  end
+
+end
+
+module ActiveRecord
+  module Validations
+    module ClassMethods
+
+      def validates_value_of(*attr_names)
+        configuration = {
+          :message => 'value doesn\'t exist' 
+        }
+        configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
+
+        if configuration[:in].nil?
+          validates_each(attr_names, configuration) do |record, attr_name, value|
+            if (attr_names[1].to_s != record.send(attr_names[0].to_sym))
+              record.errors.add(attr_name, configuration[:message])
+            end
+          end
+        else
+          validates_each(attr_names, configuration) do |record, attr_name, value|
+            found = false
+            record.send(configuration[:in]).each do |s|
+              if (attr_names[1].to_s == s.send(attr_names[0].to_sym))
+                found = true
+                break
+              end
+            end
+            record.errors.add(attr_name, configuration[:message]) unless found
+          end
+        end
+      end
+
+      def validates_as_email(*attr_names)
+        configuration = {
+          :message   => 'is an invalid email',
+          :with      => RFC822::EmailAddress,
+          :allow_nil => true }
+        configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
+
+        validates_format_of attr_names, configuration
+      end
+
+    end
+  end
+end
+

data/lib/adaptation.rb

@@ -1,6 +1,7 @@
 require 'roxml'
 require 'yaml'
 require 'active_record'
+require 'adaptation/validateable'
 require 'adaptation/message'
 require 'adaptation/adaptor'
 require 'adaptation/base'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: adaptation
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2008-06-11 00:00:00 +02:00
+  version: 0.0.5
+date: 2008-07-24 00:00:00 +02:00
 summary: Framework to facilitate web-application interaction.
 require_paths: 
 - lib
@@ -50,6 +50,7 @@ files:
 - lib/adaptation/test
 - lib/adaptation/test/fake_fixtures.rb
 - lib/adaptation/test/test_help.rb
+- lib/adaptation/validateable.rb
 - lib/commands.rb
 - lib/rails_generator
 - lib/rails_generator/options.rb