cwyckoff-babel_icious 0.0.4.2 → 0.0.4.4

data/README.rdoc

@@ -47,6 +47,8 @@ the slash indicates that "bar" is a nested hash within "foo".  The target xml th
 with the value of "bar" from the hash above placed in the nested <foo> tags in the xml.
 
 
+=== Conditions
+
 You can also qualify your mappings with the methods "unless" and "when".  For example, if you do not want to translate mappings that lack a value, simply add an "unless" method:
 
   m.map(:from => "foo/bar", :to => "bar/foo").unless(:empty)
@@ -60,6 +62,8 @@ if the value at "foo/bar" is empty or nil, "foo/bar" will not be translated.  Ad
 will only translate if the value at "foo/bar" begins with a capital "M".
 
 
+=== Translation
+
 Finally, when you want to translate the mappings, simply call:
 
  Babelicious::Mapper.translate(:foo, source)

data/lib/babel_icious/mapper.rb

@@ -54,8 +54,8 @@ module Babelicious
       def mapping_already_exists?(key)
         mappings.keys.include?(key)
       end
+
     end
-    
   end
 
 end

data/lib/babel_icious/mappers/hash_map.rb

@@ -20,9 +20,9 @@ module Babelicious
     def value_from(source)
       hash = {}
       @path_translator.inject_with_index(hash) do |hsh, element, index|
-        return hsh[element.to_sym] if (index == @path_translator.last_index)
+        return hsh[element.to_sym] if (index == @path_translator.last_index && index != 0)
         if hsh.empty?
-          source[element.to_sym]
+          source_element(source, element)
         else 
           hsh[element.to_sym]
         end
@@ -30,6 +30,10 @@ module Babelicious
     end
 
     private
+    
+    def source_element(source, element)
+      source[element.to_sym] || source[element.to_s]
+    end
 
     def map_output(hash_output, source_value)
       catch :no_value do
@@ -37,11 +41,50 @@ module Babelicious
           if(hsh[element])
             hsh[element]
           else
-            hsh[element] = (index == @path_translator.last_index ? source_value : {})
+            hsh[element] = (index == @path_translator.last_index ? map_source_value(source_value) : {})
           end 
         end
       end 
     end 
     
+    def map_source_value(source_value)
+      if(@opts[:concatenate])
+        HashMappingStrategies::Concatenate.map(source_value, @opts[:concatenate])
+      else 
+        source_value
+      end 
+    end
+
+  end
+  
+  module HashMappingStrategies
+
+    class Concatenate
+
+      class << self
+        
+        def map(source_value, concat)
+          if(source_value.kind_of?(Hash))
+            concat_values_from_hash(source_value).join(concat)
+          elsif(source_value.kind_of?(Array)) 
+            source_value.join(concat)
+          else 
+            source_value
+          end 
+        end
+
+        private
+        
+        def concat_values_from_hash(source_value)
+          source_value.each do |key, value|
+            unless value.is_a?(Array)
+              return concat_values_from_hash(value)
+            else 
+              return value
+            end
+          end
+        end
+      end
+    end
   end
 end

data/lib/babel_icious/mappers/xml_map.rb

@@ -18,7 +18,7 @@ module Babelicious
     
     def initialize(path_translator, opts={})
       @path_translator, @opts = path_translator, opts
-      @xml_value_mapper = XmlValueMapper.new(@opts)
+      @xml_value_mapper = XmlValueMapper.new(@path_translator, @opts)
     end
     
     def value_from(source)
@@ -76,15 +76,15 @@ module Babelicious
 
   
   class XmlValueMapper
-    
-    def initialize(opts={})
-      @opts = opts
+
+    def initialize(path_translator, opts={})
+      @path_translator, @opts = path_translator, opts
     end
     
     def map(node)
       if(node.children.size > 1)
         content = {}
-        return map_with_strategies_for_children(node, content)
+         map_child(node, content)
       else
         return node.content
       end
@@ -92,78 +92,56 @@ module Babelicious
 
     private
     
-    def map_with_strategies_for_children(node, content)
-      if @opts[:concatenate]
-        XmlMappingStrategies::Concatenate.map(node, @opts[:concatenate])
-      else 
-        XmlMappingStrategies::ChildNodeMapper.map(node, content)
+    def map_child(node, content)
+      node.each_element do |child|
+        if(content[child.name])
+          update_content_key(content, child)
+        else
+          create_content_key(content, child)
+        end 
       end
+      {node.name => content}
     end
-  end
-  
-  
-  module XmlMappingStrategies
-
-    class Concatenate
-      
-      class << self
-        
-        def map(node, concat_value)
-          concatenated_children = node.children.inject('') {|a,b| a << "#{b.content}#{concat_value}"}
-          {node.name => concatenated_children.chop}
-        end
-
+    
+    private
+    
+    def content_value_is_array?(content, child) 
+      content[child.name].is_a?(Array)
+    end 
+    
+    def create_content_key(content, child)
+      unless final_node?(child)
+        content[child.name] = {child.child.name => child.child.content}
+      else 
+        set_value_in_array(content, child)
       end
     end
-
-    class ChildNodeMapper
-
-      class << self
-
-        def map(node, content)
-          node.children.each do |child|
-            if(content[child.name])
-              update_content_key(content, child)
-            else
-              create_content_key(content, child)
-            end 
-          end
-          {node.name => content}
-        end
-        
-        private
-        
-        def content_value_is_array?(content, child) 
-          content[child.name].is_a?(Array)
-        end 
-        
-        def create_content_key(content, child)
-          unless grandchild_is_final_node(child)
-            content[child.name] = {child.child.name => child.child.content}
-          else 
-            set_grandchild_value_in_array(content, child)
-          end
-        end
-        
-        def grandchild_is_final_node(child)
-          child.child.name == "text"        
-        end
-        
-        def set_grandchild_value_in_array(content, child)
-          content[child.name] = [] unless content_value_is_array?(content, child) 
+    
+    def final_node?(child)
+      !child.children? || child.child.name == "text"
+    end
+    
+    def set_value_in_array(content, child)
+      content[child.name] = [] unless content_value_is_array?(content, child)
+      if(child.children?)
+        if (child.parent.find(child.name)).to_a.size == 1
+          content[child.name] = child.child.content
+        else 
           content[child.name] << child.child.content
         end
+      else
+        content[child.name] = ""
+      end 
+    end
 
-        def update_content_key(content, child)
-          unless grandchild_is_final_node(child)
-            content[child.name] = [content[child.name]] unless content_value_is_array?(content, child) 
-            content[child.name] << {child.child.name => child.child.content}
-          else 
-            set_grandchild_value_in_array(content, child)
-          end
-        end
+    def update_content_key(content, child)
+      unless final_node?(child)
+        content[child.name] = [content[child.name]] unless content_value_is_array?(content, child) 
+        content[child.name] << {child.child.name => child.child.content}
+      else 
+        set_value_in_array(content, child)
       end
     end
-    
   end
+
 end

data/lib/babel_icious/path_translator.rb

@@ -21,6 +21,10 @@ module Babelicious
       @parsed_path.size - 1
     end
     
+    def last
+      @parsed_path.last
+    end
+    
     def size
       @parsed_path.size
     end

data/lib/babel_icious/target_mapper.rb

@@ -43,7 +43,6 @@ module Babelicious
     def reset
       @mappings, @direction = [], nil
     end
-    
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cwyckoff-babel_icious
 version: !ruby/object:Gem::Version 
-  version: 0.0.4.2
+  version: 0.0.4.4
 platform: ruby
 authors: 
 - Chris Wyckoff