unhappymapper 0.4.4 → 0.5.0

data/README.md

@@ -222,12 +222,12 @@ Well if we only going to parse country, on it's own, we would likely create a cl
       tag 'country'
   
       attribute :code, String
-      text_node :name, String
+      content :name, String
     end
 
-We are utilizing an `attribute` declaration and a new declaration called `text_node`.
+We are utilizing an `attribute` declaration and a new declaration called `content`.
 
-* `text_node` is used when you want the text contained within the element
+* `content` is used when you want the text contained within the element
 
 Awesome, now if we were to redeclare our `Address` class we would use our new `Country` class.
 

data/lib/happymapper.rb

@@ -107,7 +107,7 @@ module HappyMapper
     def elements
       @elements[to_s] || []
     end
-
+    
     #
     # The value stored in the text node of the current element.
     #
@@ -117,16 +117,16 @@ module HappyMapper
     #
     #     # definition of the 'firstName' text node within the class
     # 
-    #     text_node :first_name, String
+    #     content :first_name, String
     # 
     # @param [Symbol] name the name of the accessor that is created
     # @param [String,Class] type the class name of the name of the class whcih
     #     the object will be converted upon parsing
     # @param [Hash] options additional parameters to send to the relationship
     #
-    def text_node(name, type, options={})
-      @text_node = TextNode.new(name, type, options)
-      attr_accessor @text_node.method_name.intern
+    def content(name, type, options={})
+      @content = TextNode.new(name, type, options)
+      attr_accessor @content.method_name.intern
     end
 
     #
@@ -315,8 +315,8 @@ module HappyMapper
             obj.send("#{elem.method_name}=",elem.from_xml_node(n, namespace, namespaces))
           end
 
-          if @text_node
-            obj.send("#{@text_node.method_name}=",@text_node.from_xml_node(n, namespace, namespaces))
+          if @content
+            obj.send("#{@content.method_name}=",@content.from_xml_node(n, namespace, namespaces))
           end
           
           # If the HappyMapper class has the method #xml_value=, 
@@ -481,16 +481,16 @@ module HappyMapper
 
       
       #
-      # When a text_node has been defined we add the resulting value
+      # When a content has been defined we add the resulting value
       # the output xml
       #
-      if text_node = self.class.instance_variable_get('@text_node')
+      if content = self.class.instance_variable_get('@content')
         
-        unless text_node.options[:read_only]
-          text_accessor = text_node.tag || text_node.name
+        unless content.options[:read_only]
+          text_accessor = content.tag || content.name
           value = send(text_accessor)
         
-          if on_save_action = text_node.options[:on_save]
+          if on_save_action = content.options[:on_save]
             if on_save_action.is_a?(Proc)
               value = on_save_action.call(value)
             elsif respond_to?(on_save_action)

data/spec/happymapper_spec.rb

@@ -304,7 +304,7 @@ class Country
   include HappyMapper
 
   attribute :code, String
-  text_node :name, String
+  content :name, String
 end
 
 class Address

data/spec/happymapper_to_xml_spec.rb

@@ -81,7 +81,7 @@ module ToXML
     #
     class Description
       include HappyMapper
-      text_node :description, String
+      content :description, String
       attribute :category, String, :tag => 'category'
       attribute :rating, String, :tag => 'rating', :state_when_nil => true
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unhappymapper
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ date: 2011-08-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70120458309660 !ruby/object:Gem::Requirement
+  requirement: &70125244720920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -26,10 +26,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70120458309660
+  version_requirements: *70125244720920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70120458305740 !ruby/object:Gem::Requirement
+  requirement: &70125244720240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,7 +37,7 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70120458305740
+  version_requirements: *70125244720240
 description: Object to XML Mapping Library, using Nokogiri (fork from John Nunemaker's
   Happymapper)
 email: franklin.webber@gmail.com