@@ -24,6 +24,16 @@ class DateTime end end +# little module for including in our models (unless_activerecord) +module NonActiveRecordModel + def self.included base + base.module_eval { include Validatable } + end + def initialize options = {} + options.each { |k,v| instance_variable_set "@#{k}", v } + end +end + # ADF is a utility class and the namespace for all of the model classes class ADF lib/adf.rb @@ -1,12 +1,8 @@ class ADF::Contact - unless_activerecord do - include Validatable + unless_activerecord do + include NonActiveRecordModel attr_accessor :name, :phone - - def initialize options = {} - options.each { |k,v| instance_variable_set "@#{k}", v } - end end def to_adf node lib/adf/models/contact.rb @@ -1,12 +1,8 @@ class ADF::Customer - unless_activerecord do - include Validatable + unless_activerecord do + include NonActiveRecordModel attr_accessor :contact - - def initialize options = {} - options.each { |k,v| instance_variable_set "@#{k}", v } - end end def to_adf prospect lib/adf/models/customer.rb @@ -1,12 +1,8 @@ class ADF::Prospect - unless_activerecord do - include Validatable + unless_activerecord do + include NonActiveRecordModel attr_accessor :requestdate, :vehicle, :customer, :vendor - - def initialize options = {} - options.each { |k,v| instance_variable_set "@#{k}", v } - end end def to_adf lib/adf/models/prospect.rb @@ -1,12 +1,8 @@ class ADF::Vehicle - unless_activerecord do - include Validatable + unless_activerecord do + include NonActiveRecordModel attr_accessor :year, :make, :model - - def initialize options = {} - options.each { |k,v| instance_variable_set "@#{k}", v } - end end def to_adf prospect lib/adf/models/vehicle.rb @@ -1,12 +1,8 @@ class ADF::Vendor - unless_activerecord do - include Validatable + unless_activerecord do + include NonActiveRecordModel attr_accessor :contact - - def initialize options = {} - options.each { |k,v| instance_variable_set "@#{k}", v } - end end def to_adf prospect lib/adf/models/vendor.rb baec8d838ba4ad26812cc733a90ef62f6c6dc6ed remi remi@remitaylor.com http://github.com/remi/adf/commit/e98908a3e044ff878b5ea23b1a600df7c7fd1175 e98908a3e044ff878b5ea23b1a600df7c7fd1175 2008-05-23T16:20:44-07:00 2008-05-23T16:20:44-07:00 fixed validations 567b0bc80c7eee851c58a6da9a6f773db2d83083 remi remi@remitaylor.com