Project

General

Profile

« Previous | Next » 

Revision 9fca0140

Added by Marc Dequènes over 14 years ago

  • ID 9fca01408af69a7262b021c1ee5db1e512cbc0bb

[evol] improve config #12 (improved object definition check #3 + added aspect definition check)

View differences:

lib/ldap_shadows/controller.rb
@shadow_config
end
class LdapShadowsValidator < Kwalify::Validator
## hook method called by Validator#validate()
def validate_hook(value, rule, path, errors)
msg_list = []
validate_hook_in(value, rule, path, msg_list)
msg_list.each do |msg|
errors << Kwalify::ValidationError.new(msg, path)
end
end
def validate_hook_relation(value, rule, path, msg_list)
extra_params = [:type, :object]
if value['type'] == 'belongs_to'
ne_params = value.keys.collect{|k| k.to_sym } - ActiveLdap::Associations::ClassMethods::VALID_BELONGS_TO_OPTIONS - extra_params
unless ne_params.empty?
msg_list << _("nonexisting relation mapping parameters (%s)") % ne_params.join(", ")
end
else
ne_params = value.keys.collect{|k| k.to_sym } - ActiveLdap::Associations::ClassMethods::VALID_HAS_MANY_OPTIONS - extra_params
unless ne_params.empty?
msg_list << _("nonexisting relation mapping parameters (%s)") % ne_params.join(", ")
end
end
end
end
class AspectValidator < LdapShadowsValidator
def validate_hook_in(value, rule, path, msg_list)
case rule.name
when 'RelationMapping'
validate_hook_relation(value, rule, path, msg_list)
end
end
end
def set_aspect(aspect_name, aspect_def)
parser = Kwalify::Yaml::Parser.new
schema_name = 'aspect'
schema = load_schema(schema_name)
# validate config with schema
validator = AspectValidator.new(schema)
parser = Kwalify::Yaml::Parser.new(validator)
aspect_def = parser.parse(aspect_def, aspect_name)
aspect_def.recursive_symbolize_keys!
raise_if_validation_errors("#{schema_name.capitalize} '#{aspect_name}'", parser.errors)
aspect_name = aspect_name.to_sym
aspect_def.recursive_symbolize_keys!
@aspects[aspect_name] = aspect_def
filename = File.join(Config::CFG_DIR, "hooks", "aspects", aspect_name.to_s.downcase + ".rb")
......
"LdapObject" + obj_name.to_s.capitalize
end
class ObjectValidator < Kwalify::Validator
## hook method called by Validator#validate()
def validate_hook(value, rule, path, errors)
msg_list = []
class ObjectValidator < LdapShadowsValidator
def validate_hook_in(value, rule, path, msg_list)
case rule.name
when 'Mapping'
ne_params = value.keys.collect{|k| k.to_sym } - ActiveLdap::Base::VALID_LDAP_MAPPING_OPTIONS
......
end
when 'RelationMapping'
extra_params = [:type, :object]
if value['type'] == 'belongs_to'
ne_params = value.keys.collect{|k| k.to_sym } - ActiveLdap::Associations::ClassMethods::VALID_BELONGS_TO_OPTIONS - extra_params
unless ne_params.empty?
msg_list << _("nonexisting relation mapping parameters (%s)") % ne_params.join(", ")
end
unless value.has_key? 'many'
msg_list << _("a 'belongs_to' relation needs a 'many' parameter")
end
else
ne_params = value.keys.collect{|k| k.to_sym } - ActiveLdap::Associations::ClassMethods::VALID_HAS_MANY_OPTIONS - extra_params
unless ne_params.empty?
msg_list << _("nonexisting relation mapping parameters (%s)") % ne_params.join(", ")
end
unless value.has_key? 'primary_key'
msg_list << _("a 'has_many' relation needs a 'primary_key' parameter")
end
end
end
msg_list.each do |msg|
errors << Kwalify::ValidationError.new(msg, path)
validate_hook_relation(value, rule, path, msg_list)
end
end
end
......
validator = ObjectValidator.new(schema)
parser = Kwalify::Yaml::Parser.new(validator)
obj_def = parser.parse(obj_def, obj_name)
errors = parser.errors()
raise_if_validation_errors("#{schema_name.capitalize} '#{obj_name}'", errors)
raise_if_validation_errors("#{schema_name.capitalize} '#{obj_name}'", parser.errors)
obj_name = obj_name.to_sym
obj_def.recursive_symbolize_keys!

Also available in: Unified diff