acdc 0.7.1 → 0.7.2

data/lib/acdc.rb

@@ -11,7 +11,7 @@ class Boolean; end
 module AcDc
   
   DEFAULT_NAMESPACE = "acdc"
-  VERSION = [0,7,1]
+  VERSION = [0,7,2]
   
   def self.parseable_constants
     @parseables ||= []

data/lib/acdc/item.rb

@@ -7,7 +7,9 @@ module AcDc
     def initialize(name, type, options={})
       @name = name.to_s
       @type = type
-      @tag = options.delete(:tag) || name.to_s
+      @tag = options.delete(:tag) || 
+             @type.tag_name rescue nil ||
+             name.to_s
       @options = options
       @xml_type = self.class.to_s.split('::').last.downcase
     end
@@ -29,13 +31,16 @@ module AcDc
     end
     
     def value_from_xml(node, namespace)
-      if primitive?
-        find(node, namespace) do |n|
+      find(node,namespace) do |n|
+        if primitive?
           value = n.respond_to?(:content) ? n.content : n.to_s
           typecast(value)
+        else
+          # it is important to "detach" the node from the document
+          # by passing it in as a string. this forces the root xpath
+          # lookup to work properly.
+          constant.acdc(n.to_s)
         end
-      else
-        constant.parse(node, options)
       end
     end
     
@@ -72,14 +77,28 @@ module AcDc
         elsif self.namespace
           namespace = "#{DEFAULT_NAMESPACE}:#{self.namespace}"
         end
-        
         if element?
           if(options[:single].nil? || options[:single])
+            
             result = node.find_first(xpath(namespace), namespace)
+
+            if result.nil? and AcDc::parseable_constants.include?(@type)
+             # This makes sure it is found if in the event the Ruby type name
+             # doesn't match the Xml node name, but the type has a tag_name.
+             # Not sure why this would be good ---- edge case fix.
+             result = node.find_first(@type.tag_name, namespace)
+            end
+            
+            if result.nil? 
+             # This makes sure it is found in the event the Ruby method name
+             # doesn't match the Xml node name.
+             # Not sure why this would be good ---- edge case fix.
+             result = node.find_first(@type.to_s.split('::').last, namespace)
+            end
+          
           else
             result = node.find(xpath(namespace))
           end
-         
           if result
             if(options[:single].nil? || options[:single])
               value = yield(result)
@@ -89,18 +108,6 @@ module AcDc
                 value << yield(res)
               end
             end
-            if options[:attributes].is_a?(Hash)
-              result.attributes.each do |xml_attribute|
-                if attribute_options = options[:attributes][xml_attribute.name.to_sym]
-                  attribute_value = Attribute.new(xml_attribute.name.to_sym, *attribute_options).from_xml_node(result, namespace)
-                  result.instance_eval <<-EOV
-                    def value.#{xml_attribute.name}
-                      #{attribute_value.inspect}
-                    end
-                  EOV
-                end
-              end
-            end
             value
           else
             nil

data/lib/acdc/parse.rb

@@ -1,7 +1,7 @@
 module AcDc
   module Parsing
 
-    def acdc(xml, options={})
+    def acdc(xml)
       if xml.is_a?(XML::Node)
         node = xml
       else
@@ -11,14 +11,13 @@ module AcDc
           node = XML::Parser.string(xml).parse.root
         end
       end
-      # This constantize is a global scope constantize.
-      # It will use AcDc#parseable_constants to detect which class
-      # is being parsed.
-      klass = constantize(node.name)
+      klass = AcDc.parseable_constants.detect{ |const|
+        const.name.downcase =~ /#{node.name.downcase}/ || const.tag_name == node.name
+      }
       if klass.nil?
         raise Exception.new("Uh Oh ... Live Wire! Couldn't parse #{node.name}.")
       end
-      root = node.name.downcase == klass.tag_name
+      root = node.name.downcase == klass.tag_name.downcase
       namespace = node.namespaces.default
       namespace = "#{DEFAULT_NAMESPACE}:#{namespace}" if namespace
       xpath = root ? '/' : './/'
@@ -36,23 +35,12 @@ module AcDc
         obj
       end
       nodes = nil
-      if options[:single] || root
+      if root
         collection.first
       else
         collection
       end
     end
-    
-  private
-    def constantize(type)
-      # I'm using a separate store for constants because of the fact at 
-      # runtime during parsing we will simply get a tag name to start with.
-      # It won't be in a form we could use to detect a constant normally.
-      # Also - this way provides a cleaner check for the tag_name feature.
-      AcDc.parseable_constants.detect{ |const|
-        const.name.downcase =~ /#{type.downcase}/ || const.tag_name == type
-      }
-    end
        
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acdc
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Clint Hill
@@ -78,6 +78,6 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: acdc 0.7.1
+summary: acdc 0.7.2
 test_files: []