diff options
Diffstat (limited to 'lib/wsdl/xmlSchema/element.rb')
-rw-r--r-- | lib/wsdl/xmlSchema/element.rb | 72 |
1 files changed, 57 insertions, 15 deletions
diff --git a/lib/wsdl/xmlSchema/element.rb b/lib/wsdl/xmlSchema/element.rb index cc9d4e9ed8..584afe9dc6 100644 --- a/lib/wsdl/xmlSchema/element.rb +++ b/lib/wsdl/xmlSchema/element.rb @@ -1,5 +1,5 @@ # WSDL4R - XMLSchema element definition for WSDL. -# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>. +# Copyright (C) 2002, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>. # This program is copyrighted free software by NAKAMURA, Hiroshi. You can # redistribute it and/or modify it under the same terms of Ruby's license; @@ -14,23 +14,62 @@ module XMLSchema class Element < Info - attr_accessor :name # required - attr_accessor :type - attr_accessor :local_complextype - attr_accessor :constraint - attr_accessor :maxoccurs - attr_accessor :minoccurs - attr_accessor :nillable - - def initialize(name = nil, type = XSD::AnyTypeName) + class << self + if RUBY_VERSION > "1.7.0" + def attr_reader_ref(symbol) + name = symbol.to_s + self.__send__(:define_method, name, proc { + instance_variable_get("@#{name}") || + (refelement ? refelement.__send__(name) : nil) + }) + end + else + def attr_reader_ref(symbol) + name = symbol.to_s + module_eval <<-EOS + def #{name} + @#{name} || (refelement ? refelement.#{name} : nil) + end + EOS + end + end + end + + attr_writer :name # required + attr_writer :type + attr_writer :local_simpletype + attr_writer :local_complextype + attr_writer :constraint + attr_writer :maxoccurs + attr_writer :minoccurs + attr_writer :nillable + + attr_reader_ref :name + attr_reader_ref :type + attr_reader_ref :local_simpletype + attr_reader_ref :local_complextype + attr_reader_ref :constraint + attr_reader_ref :maxoccurs + attr_reader_ref :minoccurs + attr_reader_ref :nillable + + attr_accessor :ref + + def initialize(name = nil, type = nil) super() @name = name @type = type - @local_complextype = nil + @local_simpletype = @local_complextype = nil @constraint = nil @maxoccurs = '1' @minoccurs = '1' @nillable = nil + @ref = nil + @refelement = nil + end + + def refelement + @refelement ||= root.collect_elements[@ref] end def targetnamespace @@ -44,6 +83,9 @@ class Element < Info def parse_element(element) case element + when SimpleTypeName + @local_simpletype = SimpleType.new + @local_simpletype when ComplexTypeName @type = nil @local_complextype = ComplexType.new @@ -62,19 +104,19 @@ class Element < Info @name = XSD::QName.new(targetnamespace, value.source) when TypeAttrName @type = value + when RefAttrName + @ref = value when MaxOccursAttrName if parent.is_a?(All) if value.source != '1' - raise Parser::AttrConstraintError.new( - "Cannot parse #{ value } for #{ attr }.") + raise Parser::AttrConstraintError.new("cannot parse #{value} for #{attr}") end end @maxoccurs = value.source when MinOccursAttrName if parent.is_a?(All) unless ['0', '1'].include?(value.source) - raise Parser::AttrConstraintError.new( - "Cannot parse #{ value } for #{ attr }.") + raise Parser::AttrConstraintError.new("cannot parse #{value} for #{attr}") end end @minoccurs = value.source |