acdc 0.6.0 → 0.7.0

data/README

@@ -25,7 +25,7 @@ marshaling those objects from XML a breeze.
 
   jack = acdc("<thejack shes_got='big-balls'><big_balls>I've got big balls</big_balls></thejack>")
   puts jack.shes_got
-  => "big_balls"
+  => "big-balls"
   puts jack.big_balls
   => "I've got big balls"
   puts jack.acdc

data/lib/acdc.rb

@@ -10,19 +10,24 @@ class Boolean; end
 
 module AcDc
   
-  DEFAULT_NAMESPACE = "acdc" unless defined?(AcDc::DEFAULT_NAMESPACE)
-  VERSION = [0,6,0] unless defined?(AcDc::VERSION)
+  DEFAULT_NAMESPACE = "acdc"
+  VERSION = [0,7,0]
   
-  if defined?(JAIL_BREAK)
-    puts "AcDc is live -- Dirty Deeds!"
+  def self.parseable_constants
+    @parseables ||= []
   end
   
 end
 
-require File.join(File.dirname(__FILE__), 'acdc/mapping')
-require File.join(File.dirname(__FILE__), 'acdc/build')
-require File.join(File.dirname(__FILE__), 'acdc/parse')
-require File.join(File.dirname(__FILE__), 'acdc/item')
-require File.join(File.dirname(__FILE__), 'acdc/attribute')
-require File.join(File.dirname(__FILE__), 'acdc/element')
-require File.join(File.dirname(__FILE__), 'acdc/body')
+dir = File.dirname(__FILE__) 
+require File.join(dir, 'acdc/mapping')
+require File.join(dir, 'acdc/build')
+require File.join(dir, 'acdc/parse')
+require File.join(dir, 'acdc/item')
+require File.join(dir, 'acdc/attribute')
+require File.join(dir, 'acdc/element')
+require File.join(dir, 'acdc/body')
+
+class Object
+  include AcDc::Parsing
+end

data/lib/acdc/body.rb

@@ -1,8 +1,8 @@
 module AcDc
   class Body
     
-    include(Mapping)
-    include(Building)
+    include Mapping
+    include Building
     
     def self.inherited(child)
       attrs = @attributes.nil? ? {} : @attributes.dup
@@ -11,6 +11,7 @@ module AcDc
       child.instance_variable_set("@elements", elems)
       @inheritance_chain ||= []
       @inheritance_chain << child
+      AcDc.parseable_constants << child
     end    
       
   end

data/lib/acdc/item.rb

@@ -68,10 +68,8 @@ module AcDc
         if options[:namespace] == false
           namespace = nil
         elsif options[:namespace]
-          # from an element definition
           namespace = "#{DEFAULT_NAMESPACE}:#{options[:namespace]}"
         elsif self.namespace
-          # this node has a custom namespace (that is present in the doc)
           namespace = "#{DEFAULT_NAMESPACE}:#{self.namespace}"
         end
         

data/lib/acdc/mapping.rb

@@ -4,7 +4,8 @@ module AcDc
     def self.included(base)
       base.instance_variable_set("@attributes",{})
       base.instance_variable_set("@elements",{})
-      base.extend(ClassMethods)
+      base.extend ClassMethods
+      AcDc.parseable_constants << base
     end
 
     module ClassMethods

data/lib/acdc/parse.rb

@@ -1,8 +1,7 @@
 module AcDc
   module Parsing
-    
+
     def acdc(xml, options={})
-      
       if xml.is_a?(XML::Node)
         node = xml
       else
@@ -12,20 +11,20 @@ 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)
-      
+      if klass.nil?
+        raise Exception.new("Uh Oh ... Live Wire! Couldn't parse #{node.name}.")
+      end
       root = node.name.downcase == klass.tag_name
-      
       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|
@@ -36,9 +35,7 @@ module AcDc
         end
         obj
       end
-      
       nodes = nil
-      
       if options[:single] || root
         collection.first
       else
@@ -46,45 +43,16 @@ module AcDc
       end
     end
     
-    private
-      
-      def constantize(type)
-        if type.is_a?(String)
-          constant = Object
-          all_class_names.each do |name|
-            if name.downcase == type.downcase
-              constant = const_get(name)
-            end
-          end
-          constant
-        else
-          type
-        end
-      end
-    
-  end
-end
-
-class Module
-  
-  def hierarchy
-    name.split('::').inject([Object]) {|hierarchy,name|
-      hierarchy << hierarchy.last.const_get(name)
-    }
-  end
-  
-  def all_class_names
-    class_names = []
-    constants.each do |const|
-      constant = const_get(const)
-      case constant
-      when Class
-        class_names << constant.to_s.split('::',2)[1]
-      when Module
-        class_names += constant.all_class_names
-      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
-    class_names.uniq
+       
   end
-  
 end

metadata

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