cwyckoff-babel_icious 0.0.5.0 → 0.0.5.1

data/lib/babel_icious/path_translator.rb

@@ -11,7 +11,11 @@ module Babelicious
     def [](index)
       @parsed_path[index]
     end
-    
+
+    def append(element)
+      "#{element}/#{@full_path}"
+    end 
+
     def each(&block)
       @parsed_path.each(&block)
     end
@@ -37,11 +41,6 @@ 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

@@ -54,9 +54,11 @@ module Babelicious
       raise TargetMapperError, "A mapping definition key is required (e.g., m.include(:another_map))" if map_definition.nil?
       raise TargetMapperError, "Mapping definition for #{map_definition} does not exist" unless (other_mapper = Mapper[map_definition.to_sym])
 
-      other_mapper.mappings.each do |m| 
-        m[1].path_translator.unshift(opts[:inside_of]) if opts[:inside_of]
-        @mappings << m
+      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)))
+        
+        @mappings << [source, target]
       end 
     end
 
@@ -82,6 +84,14 @@ module Babelicious
         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.0
+  version: 0.0.5.1
 platform: ruby
 authors: 
 - Chris Wyckoff
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 -07:00
+date: 2009-06-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency