cwyckoff-babel_icious 0.0.6.3 → 0.0.6.6

data/lib/babel_icious/core_ext/libxml_node.rb

@@ -1,7 +1,15 @@
 require 'xml/libxml'
 
-def new_node(name)
-  XML::Node.new(name)
+def new_node(name, val=nil)
+  node = XML::Node.new(name)
+  
+  if(val)
+    node << val
+  else 
+    yield node if block_given?
+  end 
+
+  node
 end 
 
 module BabeliciousNodeHacks

data/lib/babel_icious/map_definition.rb

@@ -3,10 +3,10 @@ class MapDefinitionError < Exception; end
 module Babelicious
 
   class MapDefinition
-    attr_reader :mappings, :direction
+    attr_reader :rules, :direction
     
     def initialize
-      @mappings = []
+      @rules = []
     end
 
     def direction=(dir)
@@ -18,43 +18,43 @@ module Babelicious
     
     def translate(source)
       target = nil
-      @mappings.each do |rule|
+      @rules.each do |rule|
         target = rule.initial_target if target.nil?
         filtered_source = rule.filtered_source(source) if filtered_source.nil?
         
-        source_value = rule.source.value_from(filtered_source)
+        source_value = rule.source_value(filtered_source)
         rule.translate(target, source_value)
       end
       target
     end
     
     def register_condition(condition_key, condition=nil, &block)
-      @mappings.last.target.register_condition(condition_key, condition, &block)
+      @rules.last.target.register_condition(condition_key, condition, &block)
     end
     
     def register_customized(&block)
-      @mappings.last.target.register_customized(&block)
+      @rules.last.target.register_customized(&block)
     end
     
     def register_from(from_str)
       raise MapDefinitionError, "Please specify a source mapping" if from_str.nil?
       source = MapFactory.source(@direction, {:from => from_str})
 
-      @mappings << MapRule.new(source)
+      @rules << MapRule.new(source)
     end
 
     def register_to(&block)
-      raise MapDefinitionError, "You must call the .from method before customizing the .to method (e.g., m.from(\"foo\").to {|value| ...}" unless @mappings.last
+      raise MapDefinitionError, "You must call the .from method before customizing the .to method (e.g., m.from(\"foo\").to {|value| ...}" unless @rules.last
 
       target = MapFactory.target(@direction, {:to => '', :to_proc => block})
-      @mappings.last.target = target
+      @rules.last.target = target
     end
 
     def register_include(map_definition=nil, opts={})
       raise MapDefinitionError, "A mapping definition key is required (e.g., m.include(:another_map))" if map_definition.nil?
       raise MapDefinitionError, "Mapping definition for #{map_definition} does not exist" unless (other_mapper = Mapper[map_definition.to_sym])
 
-      other_mapper.mappings.each do |m|
+      other_mapper.rules.each do |m|
         source = m.source.dup
         target = m.target.dup
 
@@ -63,18 +63,18 @@ module Babelicious
           target.path_translator.unshift(opts[:inside_of])
         end 
         
-        @mappings << MapRule.new(source, target)
+        @rules << MapRule.new(source, target)
       end 
     end
 
-    def register_mapping(opts={})
+    def register_rule(opts={})
       raise MapDefinitionError, "Both :from and :to keys must be set (e.g., {:from => \"foo/bar\", :to => \"bar/foo\")" unless (opts[:from] && opts[:to])
       
-      @mappings << MapRule.new(MapFactory.source(@direction, opts), MapFactory.target(@direction, opts))
+      @rules << MapRule.new(MapFactory.source(@direction, opts), MapFactory.target(@direction, opts))
     end
     
     def reset
-      @mappings, @direction = [], nil
+      @rules, @direction = [], nil
     end
   end
 end

data/lib/babel_icious/map_rule.rb

@@ -15,6 +15,18 @@ module Babelicious
       @target.class.initial_target
     end 
 
+    def source_path
+      @source.path_translator.full_path
+    end 
+
+    def source_value(src)
+      @source.value_from(src)
+    end 
+
+    def target_path
+      @target.path_translator.full_path
+    end 
+
     def translate(target_data, source_value)
       if(@target.opts[:to_proc])
         @target.path_translator.set_path(@target.opts[:to_proc].call(source_value))

data/lib/babel_icious/mapper.rb

@@ -8,7 +8,7 @@ module Babelicious
       attr_reader :direction, :current_map_definition_key
 
       def [](key)
-        mappings[key.to_sym]
+        definitions[key.to_sym]
       end 
       
       def config(key)
@@ -37,16 +37,16 @@ module Babelicious
       end
       
       def map(opts={})
-        current_map_definition.register_mapping(opts)
+        current_map_definition.register_rule(opts)
         self
       end
 
-      def mappings
-        @mapped_targets ||= {}
+      def definitions
+        @map_definitions ||= {}
       end
       
       def reset
-        @mapped_targets, @direction = nil, {}
+        @map_definitions, @direction = nil, {}
       end
 
       def to(&block)
@@ -55,9 +55,9 @@ module Babelicious
       end
       
       def translate(key=nil, source=nil)
-        raise MapperError, "No target mapper exists for key #{key}" unless mappings.has_key?(key)
+        raise MapperError, "No target mapper exists for key #{key}" unless definitions.has_key?(key)
         
-        mappings[key].translate(source)
+        definitions[key].translate(source)
       end
       
       def when(&block)
@@ -72,11 +72,11 @@ module Babelicious
       private
       
       def current_map_definition
-        mappings[@current_map_definition_key] ||= MapDefinition.new
+        definitions[@current_map_definition_key] ||= MapDefinition.new
       end
       
       def mapping_already_exists?(key)
-        mappings.keys.include?(key)
+        definitions.keys.include?(key)
       end
 
     end

data/lib/babel_icious/mappers/base_map.rb

@@ -26,7 +26,7 @@ module Babelicious
     def register_customized(&block)
       @customized_map = block
     end
-    
+
     protected
 
     def map_condition

data/lib/babel_icious/mappers/hash_map.rb

@@ -22,17 +22,18 @@ module Babelicious
     def value_from(source)
       hash = {}
       element = ""
+      return source if (@path_translator.full_path == "" || @path_translator.full_path == "/")
       @path_translator.inject_with_index(hash) do |hsh, element, index|
-        return hsh[element.to_sym] if (index == @path_translator.last_index && index != 0)
+        return source_element(hsh, element) if (index == @path_translator.last_index && index != 0)
         if hsh.empty?
           source_element(source, element)
         else 
-          hsh[element.to_sym]
+          source_element(hsh, element)
         end
       end
 
-      rescue
-        raise "There was a problem extracting the value from your hash.  It seems to be missing element '#{element}'"
+      rescue Exception => e
+        raise "There was a problem extracting the value from your hash at map definition source path '#{@path_translator.full_path}'."
     end
 
     protected
@@ -52,7 +53,7 @@ module Babelicious
     private
     
     def source_element(source, element)
-      source[element.to_sym] || source[element.to_s]
+      source[element.to_sym] || source[element.to_s] || ''
     end
     
     def map_source_value(source_value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cwyckoff-babel_icious
 version: !ruby/object:Gem::Version 
-  version: 0.0.6.3
+  version: 0.0.6.6
 platform: ruby
 authors: 
 - Chris Wyckoff
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-23 00:00:00 -07:00
+date: 2009-07-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,7 @@ files:
 - MIT-LICENSE
 has_rdoc: true
 homepage: http://github.com/cwyckoff/babel_icious
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -74,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Babel_icious dynamic and scalable mapping tool