xml_schema_mapper 0.0.11 → 0.0.12

data/lib/xml_schema_mapper/element.rb

@@ -57,14 +57,18 @@ module XmlSchemaMapper
       (klass_name + "Converter").safe_constantize
     end
 
-    def mapper_class
-      mapper_class_name.constantize
+    def mapper_class(safe=false)
+      safe ? mapper_class_name.safe_constantize : mapper_class_name.constantize
     end
 
     def mapper_class_name
       klass_name + "Mapper"
     end
 
+    def klass
+      klass_name.safe_constantize
+    end
+
     def klass_name
       if type.name.nil?
         name.underscore.camelize

data/lib/xml_schema_mapper/parser.rb

@@ -1,13 +1,13 @@
 module XmlSchemaMapper
   class Parser
     def initialize(klass)
-      @klass  = klass
+      @klass = klass
       @module = resolve_module
     end
 
     def parse(xml)
       instance = @klass.new
-      xml      = document(xml)
+      xml = document(xml)
       @klass.elements.each do |e|
         if e.array?
           write_array_element(e, instance, xml)
@@ -68,7 +68,13 @@ module XmlSchemaMapper
     private
 
     def resolve_element_parser(element)
-      parsers_for_resolve(element).find(&:safe_constantize).safe_constantize or raise_class_not_found(e)
+      element_class_in_current_namespace(element) || element.mapper_class(true) || element.klass || raise_class_not_found(element)
+    end
+
+    def element_class_in_current_namespace(element) # prevent top-level constant referencing
+      if @klass.const_defined?(element.klass_name, false)
+        @klass.const_get(element.klass_name, false)
+      end
     end
 
     def parsers_for_resolve(element)

data/lib/xml_schema_mapper/version.rb

@@ -1,3 +1,3 @@
 module XmlSchemaMapper
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

metadata

@@ -2,14 +2,14 @@
 name: xml_schema_mapper
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Anton Sozontov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,3 +187,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/visitor_spec.rb
 - spec/xml_schema_mapper_spec.rb
+has_rdoc: