cwyckoff-babel_icious 0.0.5.1 → 0.0.6.0

data/lib/babel_icious.rb

@@ -5,6 +5,7 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.i
 
 require "babel_icious/core_ext/enumerable"
 require "babel_icious/core_ext/libxml_node"
+require "babel_icious/map_rule"
 require "babel_icious/target_mapper"
 require "babel_icious/map_factory"
 require "babel_icious/path_translator"

data/lib/babel_icious/core_ext/libxml_node.rb

@@ -2,20 +2,23 @@ require 'xml/libxml'
 
 module BabeliciousNodeHacks
 
-  def concatenate_children(glue)
+  def to_a
     self.children.reject { }
-    res = self.children.inject('') do |a,b| 
+    res = self.children.inject([]) do |a,b| 
       unless b.content.strip.empty?
-        a << "#{b.content.strip}#{glue.strip}"
+        a << b.content.strip
       else 
         a
       end 
     end 
-    res.chop
+  end
+  
+  def concatenate_children(glue)
+    to_a.join(glue)
   end
   
   def child_content(child)
-    child_arr(child).first.content
+    child_arr(child).first.content unless child_arr(child).empty?
   end
 
   def child_name(child)

data/lib/babel_icious/mappers/base_map.rb

@@ -2,6 +2,14 @@ module Babelicious
   
   class BaseMap
     attr_reader :opts, :path_translator
+    
+    def initialize_copy(other)
+      @opts = {}
+      other.opts.each do |key, value|
+        @opts[key] = value.dup
+      end
+      @path_translator = other.path_translator.dup
+    end
 
     def map_from(output, source_value)
       if map_condition?

data/lib/babel_icious/mappers/xml_map.rb

@@ -29,6 +29,9 @@ module Babelicious
           return node.content
         end
       end
+
+      rescue
+        raise "There was a problem extracting the value from your xml at mapping '#{@path_translator.full_path}'"
     end
 
     protected

data/lib/babel_icious/path_translator.rb

@@ -7,6 +7,11 @@ module Babelicious
     def initialize(untranslated_path)
       set_path(untranslated_path)
     end
+    
+    def initialize_copy(other)
+      @full_path = other.full_path.dup
+      @parsed_path = other.parsed_path.dup
+    end
 
     def [](index)
       @parsed_path[index]
@@ -41,6 +46,11 @@ module Babelicious
       untranslated_path.gsub(/^\//, "").split("/")
     end
 
+    def unshift(element)
+      @parsed_path.unshift(element)
+      @full_path = "#{element}/" << @full_path
+    end 
+
   end
 
 end

data/lib/babel_icious/target_mapper.rb

@@ -18,36 +18,36 @@ module Babelicious
     
     def translate(source)
       target = nil
-      @mappings.each do |source_element, target_element|
-        target = target_element.class.initial_target if target.nil?
-        filtered_source = source_element.class.filter_source(source) if filtered_source.nil?
+      @mappings.each do |rule|
+        target = rule.initial_target if target.nil?
+        filtered_source = rule.filtered_source(source) if filtered_source.nil?
         
-        source_value = source_element.value_from(filtered_source)
-        process_target(target, target_element, source_value)
+        source_value = rule.source.value_from(filtered_source)
+        rule.translate(target, source_value)
       end
       target
     end
     
     def register_condition(condition_key, condition=nil, &block)
-      @mappings.last[1].register_condition(condition_key, condition, &block)
+      @mappings.last.target.register_condition(condition_key, condition, &block)
     end
     
     def register_customized(&block)
-      @mappings.last[1].register_customized(&block)
+      @mappings.last.target.register_customized(&block)
     end
     
     def register_from(from_str)
       raise TargetMapperError, "Please specify a source mapping" if from_str.nil?
       source = MapFactory.source(@direction, {:from => from_str})
 
-      @mappings << [source]
+      @mappings << MapRule.new(source)
     end
 
     def register_to(&block)
       raise TargetMapperError, "You must call the .from method before customizing the .to method (e.g., m.from(\"foo\").to {|value| ...}" unless @mappings.last
 
       target = MapFactory.target(@direction, {:to => '', :to_proc => block})
-      @mappings.last << target
+      @mappings.last.target = target
     end
 
     def register_include(map_definition=nil, opts={})
@@ -55,43 +55,27 @@ module Babelicious
       raise TargetMapperError, "Mapping definition for #{map_definition} does not exist" unless (other_mapper = Mapper[map_definition.to_sym])
 
       other_mapper.mappings.each do |m|
-        source = MapFactory.source(@direction, m[0].opts)
-        target = MapFactory.target(@direction, m[1].opts.merge(:to => to_path(m, opts)))
+        source = m.source.dup
+        target = m.target.dup
+
+        if opts[:inside_of]
+          source.path_translator.unshift(opts[:inside_of])
+          target.path_translator.unshift(opts[:inside_of])
+        end 
         
-        @mappings << [source, target]
+        @mappings << MapRule.new(source, target)
       end 
     end
 
     def register_mapping(opts={})
       raise TargetMapperError, "Both :from and :to keys must be set (e.g., {:from => \"foo/bar\", :to => \"bar/foo\")" unless (opts[:from] && opts[:to])
-      target = MapFactory.target(@direction, opts)
-      source = MapFactory.source(@direction, opts)
-
-      @mappings << [source, target]
+      
+      @mappings << MapRule.new(MapFactory.source(@direction, opts), MapFactory.target(@direction, opts))
     end
     
     def reset
       @mappings, @direction = [], nil
     end
-
-    private
-
-    def process_target(target, target_element, source_value)
-      if(target_element.opts[:to_proc])
-        target_element.path_translator.set_path(target_element.opts[:to_proc].call(source_value))
-        target_element.map_from(target, source_value)
-      else 
-        target_element.map_from(target, source_value)
-      end 
-    end 
-
-    def to_path(mappings, opts)
-      if opts[:inside_of]
-        to_path = mappings[1].path_translator.append(opts[:inside_of])
-      else
-        to_path = mappings[1].path_translator.full_path
-      end 
-    end 
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cwyckoff-babel_icious
 version: !ruby/object:Gem::Version 
-  version: 0.0.5.1
+  version: 0.0.6.0
 platform: ruby
 authors: 
 - Chris Wyckoff
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 -07:00
+date: 2009-06-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency