oxmlk 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/oxmlk/description.rb

@@ -2,14 +2,9 @@ module OxMlk
 
   class Description
     PROCESSORS = {
-      :elem => {
-        :value => proc {|x| x.content rescue nil},
-        Integer => proc {|x| x.content.to_i rescue nil},
-        Float => proc {|x| x.content.to_f rescue nil}
-      },
-      :attribute => {
-        :value => proc {|x| x.value rescue nil} 
-      }
+      :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
@@ -139,7 +134,7 @@ module OxMlk
     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[ox_type][processor] || processor
+      PROCESSORS[processor] || processor
     end
     
     def wrap(xpath=nil)

data/lib/oxmlk/xml.rb

@@ -10,6 +10,8 @@ module OxMlk
     Error = LibXML::XML::Error
     
     class Node
+      alias_method :value, :content
+      
       def self.from(data)
         case data
         when XML::Document

data/oxmlk.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oxmlk}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Robinson"]

data/spec/xml_spec.rb

@@ -61,4 +61,14 @@ describe OxMlk::XML::Node, '#build' do
   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')
+  end
+  
+  it 'should be the same as content' do
+    @node.value.should == @node.content
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oxmlk
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Josh Robinson