acdc 0.7.4 → 0.7.5

data/lib/acdc.rb

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

data/lib/acdc/body.rb

@@ -1,6 +1,8 @@
 module AcDc
   class Body
     
+    attr_accessor :value
+    
     include Mapping
     include Building
     

data/lib/acdc/item.rb

@@ -29,7 +29,7 @@ module AcDc
     end
     
     def single?
-      options[:single].nil? || options[:single]
+      @single ||= options[:single].nil? || options[:single]
     end
     
     def element?
@@ -41,16 +41,12 @@ module AcDc
     end
     
     def value_from_xml(node, namespace)
-      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
+      n = find(node,namespace)
+      if primitive?
+        value = n.respond_to?(:content) ? n.content : n.to_s
+        typecast(value)
+      else
+        constant.acdc(n)
       end
     end
     
@@ -79,51 +75,15 @@ module AcDc
         end
       end
       
-      def find(node, namespace, &block)
-        if options[:namespace] == false
-          namespace = nil
-        elsif options[:namespace]
-          namespace = "#{DEFAULT_NAMESPACE}:#{options[:namespace]}"
-        elsif self.namespace
-          namespace = "#{DEFAULT_NAMESPACE}:#{self.namespace}"
-        end
+      def find(node, namespace)
         if element?
-          if(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(single?)
-              value = yield(result)
-            else
-              value = []
-              result.each do |res|
-                value << yield(res)
-              end
-            end
-            value
-          else
-            nil
+          result = single? ? node.find_first(xpath(namespace), namespace) : node.find(xpath(namespace))
+          unless result.nil?
+            value = single? ? result : result.each { |res| (value ||= []) << res } 
           end
+          value
         else
-          yield(node[tag])
+          node[tag]
         end
       end
       

data/lib/acdc/mapping.rb

@@ -45,18 +45,17 @@ module AcDc
       def namespace(namespace = nil)
         @namespace = namespace if namespace
         @namespace
-      end
-      
-      private
-        def make_accessor(item)
-          in_elems = elements.find{|e| e.name == item.name and e != item}
-          in_attrs = attributes.find{|a| a.name == item.name and a != item}
-          if in_elems or in_attrs
-            name = "#{item.element? ? "element_" : "attribute_"}#{item.name}"
-            item.name = name
-          end
-          attr_accessor item.method_name.intern
+      end   
+    
+      def make_accessor(item)
+        in_elems = elements.find{|e| e.name == item.name and e != item}
+        in_attrs = attributes.find{|a| a.name == item.name and a != item}
+        if in_elems or in_attrs
+          name = "#{item.element? ? "element_" : "attribute_"}#{item.name}"
+          item.name = name
         end
+        attr_accessor item.method_name.intern
+      end
 
     end
     

data/lib/acdc/parse.rb

@@ -2,6 +2,8 @@ module AcDc
   module Parsing
 
     def acdc(xml)
+      return nil if xml.nil?
+      
       if xml.is_a?(XML::Node)
         node = xml
       else
@@ -11,35 +13,33 @@ module AcDc
           node = XML::Parser.string(xml).parse.root
         end
       end
+    
       klass = AcDc.parseable_constants.find{ |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.downcase
+ 
       namespace = node.namespaces.default
       namespace = "#{DEFAULT_NAMESPACE}:#{namespace}" if namespace
-      xpath = root ? '/' : './/'
-      xpath += "#{DEFAULT_NAMESPACE}:" if namespace
-      xpath += node.name
-      nodes = node.find(xpath, Array(namespace))
-      collection = nodes.collect do |n|
-        obj = klass.new
-        klass.attributes.each do |attr|
-          obj.send("#{attr.method_name}=", attr.value_from_xml(n, namespace))
-        end
+
+      obj = klass.new
+      
+      klass.attributes.each do |attr|
+        obj.send("#{attr.method_name}=", attr.value_from_xml(node, namespace))
+      end
+      
+      if klass.elements.size > 0
         klass.elements.each do |elem|
-          obj.send("#{elem.method_name}=", elem.value_from_xml(n, namespace))
+          obj.send("#{elem.method_name}=", elem.value_from_xml(node, namespace))
         end
-        obj
-      end
-      nodes = nil
-      if root
-        collection.first
       else
-        collection
+        obj.value = node.respond_to?(:content) ? node.content : node.to_s
       end
+      
+      obj  
     end
        
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acdc
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Clint Hill
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-01 00:00:00 -07:00
+date: 2010-01-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,6 +78,6 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: acdc 0.7.4
+summary: acdc 0.7.5
 test_files: []