oxmlk 0.2.3 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/examples/example.rb

@@ -3,8 +3,8 @@ class Number
   
   ox_tag :number
   
-  ox_attr :group, :from => :attr
-  ox_attr(:value, :from => :content)
+  ox_attr :group
+  ox_elem(:value, :from => :content)
 end
 
 class Email
@@ -12,8 +12,8 @@ class Email
   
   ox_tag :email
   
-  ox_attr :group, :from => :attr
-  ox_attr(:value, :from => :content)
+  ox_attr :group
+  ox_elem(:value, :from => :content)
 end
 
 class Person
@@ -21,12 +21,12 @@ class Person
   
   ox_tag :person
   
-  ox_attr(:category, :from => :attr)
-  ox_attr(:alt, :from => '@alt')
+  ox_attr :category
+  ox_attr :alternate, :from => 'alt'
   
-  ox_attr(:name)
-  ox_attr(:contacts, :as => [Number,Email], :freeze => true)
-  ox_attr(:friends, :as => [Person], :in => :friends, :freeze => false)
+  ox_elem :name
+  ox_elem :contacts, :as => [Number,Email]
+  ox_elem :friends, :as => [Person], :in => :friends
   
   def say_hello(xml)
     'hello'

data/lib/oxmlk/attr.rb

@@ -0,0 +1,34 @@
+module OxMlk
+  class Attr
+    PROCS = (Hash.new {|h,k| k.to_proc rescue nil}).merge(
+      Integer => :to_i.to_proc,
+      Float => :to_f.to_proc,
+      String => :to_s.to_proc,
+      Symbol => :to_sym.to_proc,
+      :bool => proc {|a| fetch_bool(a)})
+    
+    attr_reader :accessor, :setter,:from, :as, :procs, :tag
+    
+    def initialize(name,o={},&block)
+      name = name.to_s
+      @accessor = name.chomp('?').intern
+      @setter = "#{@accessor}=".intern
+      @from = o.delete(:from)
+      @tag = (from || accessor).to_s
+      @as = o.delete(:as) || (:bool if name.ends_with?('?'))
+      @procs = ([*as].map {|k| PROCS[k]} + [block]).compact
+    end
+    
+    def from_xml(data)
+      procs.inject(XML::Node.from(data)[tag]) {|d,p| p.call(d) rescue d}
+    end
+    
+    def self.fetch_bool(value)
+      value = value.to_s.downcase
+      return true if %w{true yes 1 t}.include? value
+      return false if %w{false no 0 f}.include? value
+      value
+    end
+
+  end
+end

data/lib/oxmlk/elem.rb

@@ -0,0 +1,97 @@
+module OxMlk
+  class Elem
+    PROCS = (Hash.new {|h,k| default_proc(k)}).merge(
+      Integer => :to_i.to_proc,
+      Float => :to_f.to_proc,
+      String => :to_s.to_proc,
+      Symbol => :to_sym.to_proc,
+      :raw => proc {|e| e},
+      :name => proc {|e| e.name},
+      :value => proc {|e| e.value},
+      :bool => proc {|e| fetch_bool(e.value)})
+    
+    attr_reader :accessor, :setter, :collection, :from, :as, :in, :procs, :block, :tag
+    
+    def initialize(name,o={},&blk)
+      @tag = name.to_s
+      @accessor = @tag.chomp('?').intern
+      @setter = "#{@accessor}=".intern
+      @collection = o[:as].is_a?(Array)
+      
+      @from = o[:from]
+      @as = [*o.delete(:as)].compact
+      @in = o.delete(:in)
+      
+      @procs = as.map {|k| PROCS[k]}
+      @procs = [PROCS[:value]] + procs unless [:raw,:name,:value].include?(as.first) || ox?
+      @block = blk || (collection ? proc {|x| x} : proc {|x| x.first})
+    end
+    
+    def ox?
+      return false if as.empty?
+      as.all? {|x| x.ox? rescue false}
+    end
+    
+    def content?
+      @from == :content || @from == '.'
+    end
+
+    def from_xml(data)
+      xml = XML::Node.from(data)
+      block.call(xml.find(xpath).map do |node|
+        procs.inject(node) do |n,p|
+          p.call(n)
+        end
+      end)
+    end
+    
+    def to_xml(data)
+      value = data.send(accessor)
+      
+      return [] if value.nil?
+      
+      nodes = [*value].map do |node|
+        if node.respond_to?(:to_xml)
+          node.to_xml
+        elsif content?
+          XML::Node.new_text(node.to_s)
+        else
+          XML::Node.new(tag, node.to_s)
+        end
+      end
+      return [] if nodes.empty?
+      @in ? [nodes.inject(XML::Node.new(@in)) {|o,n| o << n}] : nodes
+    end
+    
+    def xpath
+      wrap case @from
+      when nil
+        ox? ? as.map(&:ox_tag).join('|') : tag
+      when String
+        from
+      when :content
+        '.'
+      end
+    end
+    
+    def self.fetch_bool(value)
+      value = value.to_s.downcase
+      return true if %w{true yes 1 t}.include? value
+      return false if %w{false no 0 f}.include? value
+      value
+    end
+    
+    def self.default_proc(value)
+      return value if value.is_a?(Proc)
+      return proc {|x| value.from_xml(x) rescue x} if (value.ox? rescue false)
+      return value.to_proc rescue proc {|x| x} if value.respond_to?(:to_proc)
+      proc {|x| x.value}
+    end
+    
+  private
+  
+    def wrap(xpath)
+      (xpath.split('|').map {|x| [@in,x].compact.join('/') }).join('|')
+    end
+  end
+end

data/lib/oxmlk/xml.rb

@@ -28,13 +28,6 @@ module OxMlk
           raise 'Invalid XML data'
         end
       end
-      
-      def self.build(name,nodes=[],attributes={})
-        node = new(name)
-        nodes.each {|n| node << n}
-        attributes.each {|x| node[x.first.to_s] = x.last.to_s unless x.last.to_s.blank?}
-        node
-      end
     end
   end
 end

data/lib/oxmlk.rb

@@ -1,14 +1,20 @@
 dir = File.dirname(__FILE__)
-require File.join(dir, 'oxmlk/xml')
-require File.join(dir, 'oxmlk/description')
+
+require 'rubygems'
 require 'activesupport'
 
+require File.join(dir, 'oxmlk/xml')
+require File.join(dir, 'oxmlk/attr')
+require File.join(dir, 'oxmlk/elem')
+
 module OxMlk
   
   def self.included(base)
     base.class_eval do
       include InstanceMethods
       extend ClassMethods
+      
+      @ox_attrs, @ox_elems = [], []
     end
   end
   
@@ -19,32 +25,26 @@ module OxMlk
   end
   
   module ClassMethods
-    def ox_attrs
-      @ox_attrs ||= []
-    end
+    attr_accessor :ox_attrs, :ox_elems
     
     def ox_attr(name,o={})
-      new_attr =  Description.new(name, o)
-      ox_attrs << new_attr
-      attr new_attr.accessor, new_attr.writable?
+      new_attr =  Attr.new(name, o)
+      (@ox_attrs ||= []) << new_attr
+      attr_accessor new_attr.accessor
     end
     
-    def ox_attributes
-      ox_attrs.select {|x| x.attribute?}
-    end
-    
-    def ox_elems
-      ox_attrs.select {|x| x.elem?}
+    def ox_elem(name,o={})
+      new_elem =  Elem.new(name, o)
+      (@ox_elems ||= []) << new_elem
+      attr_accessor new_elem.accessor
     end
     
     def ox_tag(tag=false)
       @ox_tag ||= (tag || self).to_s.split('::').last
     end
     
-    def xml_array(data)
-      [ ox_tag, 
-        ox_elems.map {|x| x.to_xml(data)}.flatten,
-        ox_attributes.map {|x| x.to_xml(data)} ]
+    def ox?
+      true
     end
     
     def from_xml(data)
@@ -52,19 +52,20 @@ module OxMlk
       raise 'invalid XML' unless xml.name == ox_tag
       
       ox = new
-      ox_attrs.each do |a|
-        value = a.from_xml(xml,ox)
-        if ox.respond_to?(a.setter)
-          ox.send(a.setter,value)
-        else
-          ox.instance_variable_set(a.instance_variable,value)
-        end
-      end
+      (ox_attrs + ox_elems).each {|e| ox.send(e.setter,e.from_xml(xml))}
       ox
     end
     
     def to_xml(data)
-      XML::Node.build(*xml_array(data))
+      ox = XML::Node.new(ox_tag)
+      ox_elems.each do |elem|
+        elem.to_xml(data).each{|e| ox << e}
+      end
+      ox_attrs.each do |a| 
+        val = data.send(a.accessor).to_s
+        ox[a.tag]= val if val.present?
+      end
+      ox
     end
     
   end

data/oxmlk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oxmlk}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Robinson"]
-  s.date = %q{2009-08-26}
+  s.date = %q{2009-09-01}
   s.description = %q{OxMlk gives you a simple way to map you ruby objects to XML and then convert one to the other.}
   s.email = %q{hexorx@gmail.com}
   s.extra_rdoc_files = [
@@ -28,10 +28,12 @@ Gem::Specification.new do |s|
      "examples/xml/example.xml",
      "examples/xml/posts.xml",
      "lib/oxmlk.rb",
-     "lib/oxmlk/description.rb",
+     "lib/oxmlk/attr.rb",
+     "lib/oxmlk/elem.rb",
      "lib/oxmlk/xml.rb",
      "oxmlk.gemspec",
-     "spec/description_spec.rb",
+     "spec/oxmlk/attr_spec.rb",
+     "spec/oxmlk/elem_spec.rb",
      "spec/oxmlk_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
@@ -40,10 +42,11 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/hexorx/oxmlk}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Object 2 XML kit for ruby}
   s.test_files = [
-    "spec/description_spec.rb",
+    "spec/oxmlk/attr_spec.rb",
+     "spec/oxmlk/elem_spec.rb",
      "spec/oxmlk_spec.rb",
      "spec/spec_helper.rb",
      "spec/xml_spec.rb",

data/spec/oxmlk/attr_spec.rb

@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe OxMlk::Attr do
+  describe '#accessor' do
+    it 'should be attr name as Symbol' do
+      ox_attr.accessor.should == :name
+    end
+  end
+  
+  describe '#setter' do
+    it 'should be name + = as Symbol' do
+      ox_attr.setter.should == :'name='
+    end
+  end
+  
+  describe '#from_xml' do
+    it 'should return attr with name by default' do
+      ox_attr.from_xml('<test name="joe"/>').should == 'joe'
+    end
+    
+    it 'should return attr by :from if specified' do
+      ox_attr(:name, :from => 'firstName').from_xml('<test firstName="joe"/>').should == 'joe'
+    end
+    
+    it 'should return type specified in :as' do
+      ox_attr(:age, :as => Integer).from_xml('<test age="30"/>').should == 30
+      ox_attr(:age, :as => Float).from_xml('<test age="30"/>').should == 30.0
+      ox_attr(:age, :as => String).from_xml('<test age="30"/>').should == '30'
+      ox_attr(:age, :as => Symbol).from_xml('<test age="30"/>').should == :'30'
+    end
+    
+    it 'should return true or false if :as is :bool' do
+      ox_attr(:odd, :as => :bool).from_xml('<test odd="true"/>').should == true
+      ox_attr(:odd, :as => :bool).from_xml('<test odd="false"/>').should == false
+    end
+    
+    it 'should act like a bool if name ends in ? and :as is not set' do
+      ox_attr(:odd?).from_xml('<test odd="true"/>').should == true
+      ox_attr(:odd?).from_xml('<test odd="false"/>').should == false
+    end
+  end
+  
+  describe '#tag' do
+    it 'should be :from if set' do
+      ox_attr(:name, :from => 'FullName').tag.should == 'FullName'
+    end
+    
+    it 'should default to name cleaned up' do
+      ox_attr(:name).tag.should == 'name'
+    end
+  end
+end
+
+def ox_attr(name=:name,o={})
+  OxMlk::Attr.new(name,o)
+end

data/spec/oxmlk/elem_spec.rb

@@ -0,0 +1,142 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe OxMlk::Elem do
+  describe '#accessor' do
+    it 'should be attr name as Symbol' do
+      ox_elem.accessor.should == :name
+    end
+  end
+  
+  describe '#setter' do
+    it 'should be name + = as Symbol' do
+      ox_elem.setter.should == :'name='
+    end
+  end
+  
+  describe '#ox?' do
+    it 'should be true if :as class is ox?' do
+      ox_elem(:name, :as => OxKlass).ox?.should be_true
+    end
+    
+    it 'should be true if :as is an array of ox objects' do
+      ox_elem(:name, :as => [OxKlass]).ox?.should be_true
+    end
+    
+    it 'should be false if :as does not responds to ox?' do
+      ox_elem(:name, :as => 1).ox?.should be_false
+    end
+    
+    it 'should be false if any of the items in :as array do not respond to from_xml' do
+      ox_elem(:name, :as => [OxKlass,1]).ox?.should be_false
+    end
+  end
+  
+  describe '#from_xml' do
+    before(:all) do
+      @xml = OxMlk::XML::Node.from(xml_for(:example))
+    end
+    
+    it 'should default to :value' do
+      ox_elem.from_xml(@xml).should == 'Joe'
+    end
+    
+    it 'should return a :value if :as is :value' do
+      ox_elem(:name, :as => :value).from_xml(@xml).should == 'Joe'
+    end
+    
+    it 'should return an Integer if :as is Integer' do
+      ox_elem(:name, :as => Integer).from_xml(@xml).should be_an(Integer)
+    end
+    
+    it 'should return an Float if :as is Float' do
+      ox_elem(:name, :as => Float).from_xml(@xml).should be_an(Float)
+    end
+    
+    it 'should return an Array of Integers if :as is [Integer]' do
+      ox_elem(:name, :as => [Integer]).from_xml(@xml).each do |x|
+        x.should be_an(Integer)
+      end
+    end
+    
+    it 'should run procs passed to :as' do
+      ox_elem(:name, :as => proc {|x| 'hi'}).from_xml(@xml).should == 'hi'
+    end
+    
+    it 'should return an OxMlk object if one is passed to :as' do
+      ox_elem(:name, :as => OxKlass).from_xml(@xml).should be_a(OxKlass)
+    end
+    
+    it 'should match class to ox_tag if array of ox_objects is passed to :as' do
+      ox_elem(:contact, :as => [Email,Number]).from_xml(@xml).first.should be_a(Number)
+    end
+    
+    it 'should turn symbol to proc if possible' do
+      ox_elem(:name, :as => :to_i).from_xml(@xml).should be_a(Integer)
+    end
+  end
+  
+  describe '#to_xml' do
+    before(:all) do
+      require example(:example)
+      @ox = Person.from_xml(xml_for(:example))
+      @elem = Person.ox_elems.first
+    end
+    
+    it 'should return an Array of nodes if it is an elem' do
+      @elem.to_xml(@ox).should be_a(Array)
+      @elem.to_xml(@ox).first.should be_a(OxMlk::XML::Node)
+    end
+  end
+  
+  describe '#xpath' do
+    it 'should be name by default' do
+      ox_elem.xpath.should == 'name'
+    end
+    
+    it 'should be the string if :from is a string' do
+      ox_elem(:name, :from => 'String').xpath.should == 'String'
+    end
+    
+    it 'should be . if :from is :content' do
+      ox_elem(:name, :from => :content).xpath.should == '.'
+    end
+    
+    it 'should be ox_tag if :as is a ox_object' do
+      ox_elem(:name, :as => OxKlass).xpath.should == 'name'
+    end
+    
+    it 'should be list of ox_tag if :as is an array of ox_objects' do
+      ox_elem(:name, :as => [OxKlass,OxKlass]).xpath.should == 'name|name'
+    end
+    
+    it 'should add :in + / to xpath if :in is passed' do
+      ox_elem(:name, :in => :friends).xpath.should == 'friends/name'
+    end
+    
+    it 'should add :in + / to all items in array of ox objects' do
+      ox_elem(:name, :as => [OxKlass,OxKlass], :in => :friends).xpath.should == 'friends/name|friends/name'
+    end
+  end
+end
+
+def ox_elem(name=:name,o={})
+  OxMlk::Elem.new(name,o)
+end
+
+class OxKlass
+  include OxMlk
+  
+  ox_tag :name
+end
+
+class Number
+  include OxMlk
+  
+  ox_tag :number
+end
+
+class Email
+  include OxMlk
+  
+  ox_tag :email
+end

data/spec/oxmlk_spec.rb

@@ -40,6 +40,12 @@ describe OxMlk::InstanceMethods do
       @oxml.to_s.should == OxMlk::XML::Node.from(@xml).to_s
     end
   end
+  
+  describe '#ox?' do
+    it 'should return true' do
+      Person.ox?.should be_true
+    end
+  end
 end
 
 describe OxMlk::ClassMethods do
@@ -49,25 +55,31 @@ describe OxMlk::ClassMethods do
     @klass = Person
   end
   
-  describe '#ox_attr' do
-    it 'should add an OxMlk::Description to the class' do
-      @klass.ox_attrs.first.should be_a(OxMlk::Description)
+  describe '#ox_elem' do
+    it 'should add an OxMlk::Description to the ox_elems list' do
+      @klass.ox_elems.first.should be_a(OxMlk::Elem)
     end
   
     it 'should add a reader method' do
       @klass.new.should respond_to(:name)
     end
   
-    it 'should add a writter method by default' do
+    it 'should add a writter method' do
       @klass.new.should respond_to(:name=)
     end
-
-    it 'should add not a writter method when :freeze => true' do
-      @klass.new.should_not respond_to(:contacts=)
+  end
+  
+  describe '#ox_attr' do
+    it 'should add an OxMlk::Attr to the ox_attrs list' do
+      @klass.ox_attrs.first.should be_a(OxMlk::Attr)
+    end
+    
+    it 'should add a reader method' do
+      @klass.new.should respond_to(:alternate)
     end
   
-    it 'should add a writter method when :freeze => false' do
-      @klass.new.should respond_to(:friends=)
+    it 'should add a writter method' do
+      @klass.new.should respond_to(:alternate=)
     end
   end
     
@@ -105,9 +117,9 @@ describe OxMlk::ClassMethods do
     end
   end
   
-  describe '#ox_attributes' do
+  describe '#ox_attrs' do
     it 'should return a list of attributes' do
-      @klass.ox_attributes.size.should == 2
+      @klass.ox_attrs.size.should == 2
     end
   end
   

data/spec/xml_spec.rb

@@ -38,31 +38,6 @@ describe OxMlk::XML::Node, '#from' do
   end
 end
 
-describe OxMlk::XML::Node, '#build' do
-  before(:all) do
-    @node = OxMlk::XML::Node
-    @nodes = [@node.new('one'),@node.new('two'),@node.new('three')]
-    @attributes = [[1,2],[3,4]]
-    @args = ['name',@nodes,@attributes]
-  end
-  
-  it 'should return a new node' do
-    @node.build(*@args).should be_a(@node)
-  end
-  
-  it 'should set its name to the first argument' do
-    @node.build(*@args).name.should == 'name'
-  end
-  
-  it 'should set its children to second argument' do
-    @node.build(*@args).children.should == @nodes
-  end
-  
-  it 'should set its attributes to the third argument' do
-    @node.build(*@args).should be_attributes
-  end
-end
-
 describe OxMlk::XML::Node, '#value' do
   before(:all) do
     @node = OxMlk::XML::Node.new('test')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oxmlk
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - Josh Robinson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 -06:00
+date: 2009-09-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,10 +63,12 @@ files:
 - examples/xml/example.xml
 - examples/xml/posts.xml
 - lib/oxmlk.rb
-- lib/oxmlk/description.rb
+- lib/oxmlk/attr.rb
+- lib/oxmlk/elem.rb
 - lib/oxmlk/xml.rb
 - oxmlk.gemspec
-- spec/description_spec.rb
+- spec/oxmlk/attr_spec.rb
+- spec/oxmlk/elem_spec.rb
 - spec/oxmlk_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -95,12 +97,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Object 2 XML kit for ruby
 test_files: 
-- spec/description_spec.rb
+- spec/oxmlk/attr_spec.rb
+- spec/oxmlk/elem_spec.rb
 - spec/oxmlk_spec.rb
 - spec/spec_helper.rb
 - spec/xml_spec.rb

data/lib/oxmlk/description.rb

@@ -1,144 +0,0 @@
-module OxMlk
-
-  class Description
-    PROCESSORS = {
-      :value => proc {|x| x.value rescue nil},
-      Integer => proc {|x| x.value.to_i rescue nil},
-      Float => proc {|x| x.value.to_f rescue nil}
-    }
-    
-    attr_reader :xpath
-
-    def initialize(name,o={},&block)
-      @froze = o.delete(:freeze)
-      @from = o.delete(:from)
-      @as = o.delete(:as)
-      @in = o.delete(:in)
-      @tag = o.delete(:tag)
-      @name = name.to_s
-      
-      @is_attribute = computed_is_attribute
-      @processors = [coputed_processor, block].compact
-      @xpath = computed_xpath
-    end
-    
-    def accessor
-      @accessor ||= @name.intern
-    end
-    
-    def setter
-      :"#{accessor}="
-    end
-    
-    def instance_variable
-      :"@#{accessor}"
-    end
-    
-    def froze?
-      @froze ||= false
-    end
-    
-    def writable?
-      !froze?
-    end
-    
-    def attribute?
-      @is_attribute ||= false
-    end
-    
-    def elem?
-      !attribute?
-    end
-    
-    def ox_type
-      elem? ? :elem : :attribute
-    end
-    
-    def collection?
-      @as.is_a?(Array)
-    end
-    
-    def content?
-      @from == :content || @from == '.'
-    end
-    
-    def ox_object?
-      return false if [*@as].empty?
-      [*@as].all? {|x| x.respond_to?(:from_xml)}
-    end
-    
-    def process(node,instance)
-      @processors.inject(node) do |memo,processor|
-        case processor
-        when Proc
-          processor.call(memo)
-        when Symbol
-          instance.send(processor,memo)
-        else
-          processor.from_xml(memo)
-        end
-      end
-    end
-    
-    def from_xml(data,instance)
-      xml = XML::Node.from(data)
-      nodes = xml.find(@xpath)
-      return nil if nodes.first.nil?
-      return process(nodes.first,instance) unless collection?
-      (nodes).map {|n| process(n,instance)}
-    end
-    
-    def to_xml(data)
-      value = data.send(accessor)
-      
-      return [] if value.nil?
-      return [accessor.to_s,value.to_s] if attribute?
-      
-      nodes = [*value].map do |node|
-        if node.respond_to?(:to_xml)
-          node.to_xml
-        elsif content?
-          XML::Node.new_text(node.to_s)
-        else
-          XML::Node.new(accessor, node.to_s)
-        end
-      end
-      @in ? XML::Node.build(@in, nodes) : nodes
-    end
-    
-  protected
-  
-    def computed_xpath
-      wrap case @from
-      when nil
-        if ox_object?
-          [*@as].map(&:ox_tag).join('|')
-        elsif collection?
-          @name.to_s.singularize
-        else
-          @name.to_s
-        end
-      when String
-        @from
-      when :attr
-        "@#{accessor}"
-      when :content
-        '.'
-      end
-    end
-    
-    def computed_is_attribute
-      @from.to_s[0,1] == '@' || @from == :attr
-    end
-    
-    def coputed_processor
-      return proc {|x| Hash[*@as.map{|o| [o.ox_tag,o]}.flatten][x.name].from_xml(x) } if collection? && ox_object?
-      processor = [*@as].first || :value
-      PROCESSORS[processor] || processor
-    end
-    
-    def wrap(xpath=nil)
-      (xpath.split('|').map {|x| [@in,x].compact.join('/') }).join('|') 
-    end
-  end
-end

data/spec/description_spec.rb

@@ -1,266 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe OxMlk::Description do
-  
-  before(:all) do
-    require example(:example)
-    
-    @xml = OxMlk::XML::Node.from(xml_for(:example))
-    @klass = Person
-  end
-  
-  describe '#xpath' do
-    it 'should be name by default' do
-      @desc = OxMlk::Description.new(:name)
-      @desc.xpath.should == 'name'
-    end
-    
-    it 'should be the string if :from is a string' do
-      @desc = OxMlk::Description.new(:name, :from => 'String')
-      @desc.xpath.should == 'String'
-    end
-    
-    it 'should be @+accessor if :from is :attr' do
-      @desc = OxMlk::Description.new(:name, :from => :attr)
-      @desc.xpath.should == '@name'
-    end
-    
-    it 'should be . if :from is :content' do
-      @desc = OxMlk::Description.new(:name, :from => :content)
-      @desc.xpath.should == '.'
-    end
-    
-    it 'should be singular if plural name and is a collection' do
-      @desc = OxMlk::Description.new(:numbers, :as => [])
-      @desc.xpath.should == 'number'
-    end
-    
-    it 'should be ox_tag if :as is a ox_object' do
-      @desc = OxMlk::Description.new(:digits, :as => Number)
-      @desc.xpath.should == 'number'
-    end
-    
-    it 'should be list of ox_tag if :as is an array of ox_objects' do
-      @desc = OxMlk::Description.new(:digits, :as => [Number,Person])
-      @desc.xpath.should == 'number|person'
-    end
-    
-    it 'should add :in + / to xpath if :in is passed' do
-      @desc = OxMlk::Description.new(:person, :in => :friends)
-      @desc.xpath.should == 'friends/person'
-    end
-    
-    it 'should add :in + / to all items in array of ox_objetcs' do
-      @desc = OxMlk::Description.new(:digits, :as => [Number,Person], :in => :friends)
-      @desc.xpath.should == 'friends/number|friends/person'
-    end
-  end
-  
-  describe '#accessor' do
-    it 'should be attr name as Symbol' do
-      @desc = OxMlk::Description.new(:name)
-      @desc.accessor.should == :name
-    end
-  end
-  
-  describe '#setter' do
-    it 'should be accessor with = on the end' do
-      @desc = OxMlk::Description.new(:name)
-      @desc.setter.should == :'name='
-    end
-  end
-  
-  describe '#instance_variable' do
-    it 'should be accessor with @ on the front' do
-      @desc = OxMlk::Description.new(:name)
-      @desc.instance_variable.should == :'@name'
-    end
-  end
-  
-  describe '#writable?' do
-    it 'should be true by default' do
-      @desc = OxMlk::Description.new(:name)
-      @desc.writable?.should be_true
-    end
-    
-    it 'should be true if :freeze is false' do
-      @desc = OxMlk::Description.new(:name, :freeze => false)
-      @desc.writable?.should be_true
-    end
-    
-    it 'should be false if :freeze is true' do
-      @desc = OxMlk::Description.new(:name, :freeze => true)
-      @desc.writable?.should be_false
-    end
-  end
-  
-  describe '#attribute?' do
-    it 'should be true if :from starts with @' do
-      @desc = OxMlk::Description.new(:name, :from => '@name')
-      @desc.attribute?.should be_true
-    end
-    
-    it 'should be true if :from is :attribute' do
-      @desc = OxMlk::Description.new(:name, :from => :attr)
-      @desc.attribute?.should be_true
-    end
-  end
-  
-  describe '#elem?' do
-    it 'should be true if attribute? is false' do
-      @desc = OxMlk::Description.new(:name)
-      @desc.elem?.should be_true
-    end
-    
-    it 'should be false if attribute? is true' do
-      @desc = OxMlk::Description.new(:name, :from => :attr)
-      @desc.elem?.should be_false
-    end
-  end
-  
-  describe '#ox_type' do
-    it 'should be :elem if elem? is true' do
-      @desc = OxMlk::Description.new(:name)
-      @desc.ox_type.should == :elem
-    end
-    
-    it 'should be :attribute if attribute? is true' do
-      @desc = OxMlk::Description.new(:name, :from => :attr)
-      @desc.ox_type.should == :attribute
-    end
-  end
-  
-  describe '#collection?' do
-    it 'should be true if :as is an Array' do
-      @desc = OxMlk::Description.new(:name, :as => [])
-      @desc.collection?.should be_true
-    end
-    
-    it 'should be false if :as is not Array' do
-      @desc = OxMlk::Description.new(:name)
-      @desc.collection?.should be_false
-    end
-  end
-  
-  describe '#ox_object?' do
-    it 'should be true if :as responds to from_xml' do
-      @desc = OxMlk::Description.new(:number, :as => Person)
-      @desc.ox_object?.should be_true
-    end
-    
-    it 'should be true if :as is an array of objects that respond to from_xml' do
-      @desc = OxMlk::Description.new(:number, :as => [Person,Number])
-      @desc.ox_object?.should be_true
-    end
-    
-    it 'should be false if :as does not responds to from_xml' do
-      @desc = OxMlk::Description.new(:number, :as => 1)
-      @desc.ox_object?.should be_false
-    end
-    
-    it 'should be false if any of the items in :as array do not respond to from_xml' do
-      @desc = OxMlk::Description.new(:number, :as => [Person,Number,1])
-      @desc.ox_object?.should be_false
-    end
-  end
-  
-  describe '#content?' do
-    it 'should return true if :from is :content' do
-      @desc = OxMlk::Description.new(:number, :from => :content)
-      @desc.content?.should be_true
-    end
-    
-    it 'should return true if :from is "."' do
-      @desc = OxMlk::Description.new(:number, :from => '.')
-      @desc.content?.should be_true
-    end
-    
-    it 'should return false if :from is nil' do
-      @desc = OxMlk::Description.new(:number)
-      @desc.content?.should be_false
-    end
-    
-    it 'should return false if :from is string other than "."' do
-      @desc = OxMlk::Description.new(:number, :from => 'hi')
-      @desc.content?.should be_false
-    end
-  end
-  
-  describe '#from_xml' do
-    
-    it 'should accept xml argument' do
-      @desc = OxMlk::Description.new(:name)
-      @desc.from_xml(@xml, @klass.new).should be_a(String)
-    end
-    
-    it 'should return an array if :as is an array' do
-      @desc = OxMlk::Description.new(:name, :as => [])
-      @desc.from_xml(@xml, @klass.new).should be_an(Array)
-    end
-    
-    it 'should return a String if :as is :value' do
-      @desc = OxMlk::Description.new(:name, :as => :value)
-      @desc.from_xml(@xml, @klass.new).should be_an(String)
-    end
-    
-    it 'should return a String if :as is nil' do
-      @desc = OxMlk::Description.new(:name)
-      @desc.from_xml(@xml, @klass.new).should be_an(String)
-    end
-    
-    it 'should return an Integer if :as is Integer' do
-      @desc = OxMlk::Description.new(:name, :as => Integer)
-      @desc.from_xml(@xml, @klass.new).should be_an(Integer)
-    end
-    
-    it 'should return an Float if :as is Float' do
-      @desc = OxMlk::Description.new(:name, :as => Float)
-      @desc.from_xml(@xml, @klass.new).should be_an(Float)
-    end
-    
-    it 'should return an Array of Integers if :as is [Integer]' do
-      @desc = OxMlk::Description.new(:name, :as => [Integer])
-      @desc.from_xml(@xml, @klass.new).each do |x|
-        x.should be_an(Integer)
-      end
-    end
-    
-    it 'should run procs passed to :as' do
-      @desc = OxMlk::Description.new(:name, :as => proc {|x| 'hi'})
-      @desc.from_xml(@xml, @klass.new).should == 'hi'
-    end
-    
-    it 'should run method when symbol is passed to :as' do
-      @desc = OxMlk::Description.new(:name, :as => :say_hello)
-      @desc.from_xml(@xml, @klass.new).should == 'hello'
-    end
-    
-    it 'should return an OxMlk object if one is passed to :as' do
-      @desc = OxMlk::Description.new(:number, :as => Number)
-      @desc.from_xml(@xml, @klass.new).should be_a(Number)
-    end
-    
-    it 'should match class to ox_tag if array of ox_objects is passed to :as' do
-      @desc = OxMlk::Description.new(:contact, :as => [Number,Email])
-      @desc.from_xml(@xml, @klass.new).first.should be_a(Number)
-    end
-  end
-  
-  describe '#to_xml' do
-    before(:all) do
-      @ox = Person.from_xml(@xml)
-      @attr = Person.ox_attributes.first
-      @elem = Person.ox_elems.first
-    end
-    
-    it 'should return an Array of Strings if it is an attribute' do
-      @attr.to_xml(@ox).should be_a(Array)
-      @attr.to_xml(@ox).first.should be_a(String)
-    end
-    
-    it 'should return an Array of nodes if it is an elem' do
-      @elem.to_xml(@ox).should be_a(Array)
-      @elem.to_xml(@ox).first.should be_a(OxMlk::XML::Node)
-    end
-  end
-end