Changeset 1747

Timestamp:

10/28/06 21:20:37 (2 years ago)

Author:

nahi

Message:

added a workaround for rubygems' custom require inconsistency.
closes #277.

Files:

• trunk/lib/xsd/xmlparser.rb (modified) (1 diff)
• trunk/lib/xsd/xmlparser/parser.rb (modified) (3 diffs)

trunk/lib/xsd/xmlparser.rb

@@ -52 +52 @@
-  begin
-    require lib
+    # XXX: for a workaround of rubygems' require inconsistency
+    # XXX: MUST BE REMOVED IN THE FUTURE
+    name = lib.sub(/^.*\//, '')
+    raise LoadError unless XSD::XMLParser.constants.find { |c|
+      c.downcase == name
+    }
-    loaded = true
-    break

trunk/lib/xsd/xmlparser/parser.rb

@@ -23 +23 @@
-  class UnexpectedElementError < FormatDecodeError; end
-  class ElementConstraintError < FormatDecodeError; end
+  class ParserError < ParseError; end
-
-  @@parser_factory = nil
@@ -31 +32 @@
-
-  def self.create_parser(host, opt = {})
+    unless @@parser_factory
+      raise ParserError.new("illegal XML parser configuration")
+    end
-    @@parser_factory.new(host, opt)
-  end
@@ -60 +64 @@
-
-  def do_parse(string_or_readable)
-NotImplement
+Parser
-      'Method do_parse must be defined in derived class.')
-  end