ismasan-hash_mapper 0.0.4 → 0.0.5

data/README.rdoc

@@ -123,6 +123,15 @@ Just use the denormalize() method instead:
 This will work with your block filters and even nested mappers (see below).
 	
 === Advanced usage
+==== Array access
+You want:
+
+{:names => ['Ismael', 'Celis']} converted to {:first_name => 'Ismael', :last_name => 'Celis'}
+
+Do this:
+
+   map from('/names[0]'), to('/first_name')
+   map from('/names[1]'), to('/last_name')
 ==== Nested mappers
 
 You want to map nested structures delegating to different mappers:
@@ -183,18 +192,6 @@ But HashMapper's nested mappers will actually do that for you if a value is an a
 == REQUIREMENTS:
 
 == TODO:
-=== Array access
-
-* See pending specs
-
-You want:
-
-{:names => ['Ismael', 'Celis']} converted to {:first_name => 'Ismael', :last_name => 'Celis'}
-
-Do this:
-
-   map from('/names[0]'), to('/first_name')
-   map from('/names[1]'), to('/last_name')
 
 == INSTALL:
 

data/lib/hash_mapper.rb

@@ -11,7 +11,7 @@ unless Symbol.instance_methods.include?('to_proc')
 end
 
 module HashMapper
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
   
   def maps
     @maps ||= []
@@ -85,8 +85,9 @@ module HashMapper
     
     def get_value_from_input(output, input, path, meth)
       value = path.inject(input) do |h,e|
-        throw :no_value unless h.has_key?(e)
-        h[e]
+        throw :no_value unless h.has_key?(e[0].to_sym)
+        e[1].nil? ? h[e[0].to_sym] : h[e[0].to_sym][e[1].to_i]
+        #h[e[0].to_sym]
       end
       value = delegate_to_nested_mapper(value, meth) if delegated_mapper
       value
@@ -103,14 +104,31 @@ module HashMapper
     
     def add_value_to_hash!(hash, path, value)
       path.inject(hash) do |h,e|
-        if h[e]
-          h[e]
+        if contained?(h,e)
+          if e[1].nil? 
+            h[e[0].to_sym] 
+          else 
+            if e == path.last
+              h[e[0].to_sym][e[1].to_i] = value
+            end
+            h[e[0].to_sym][e[1].to_i]
+          end
         else
-          h[e] = (e == path.last ? path.apply_filter(value) : {})
+          if e[1].nil?
+            h[e[0].to_sym] = (e == path.last ? path.apply_filter(value) : {})
+          else
+            h[e[0].to_sym] = []
+            h[e[0].to_sym][e[1].to_i] = (e == path.last ? path.apply_filter(value) : {})
+          end
         end
       end
     end
     
+    def contained?(h,e)
+      e[1].nil? ? h[e[0].to_sym] : h[e[0].to_sym][e[1].to_i].nil?
+    rescue
+      false
+    end
   end
   
   # contains array of path segments
@@ -142,7 +160,12 @@ module HashMapper
     private
     
     def parse(path)
-      path.sub(/^\//,'').split('/').map(&:to_sym)
+      #path.sub(/^\//,'').split('/').map(&:to_sym)
+      path.sub(/^\//,'').split('/').map{ |p| key_index p }
+    end
+    
+    def key_index(p)
+      p =~ /\[[0-9]+\]$/ ? p.sub(/\[([0-9]+)\]$/,' \1').split(' ') : [p,nil]
     end
     
   end

data/spec/hash_mapper_spec.rb

@@ -146,13 +146,11 @@ describe "array indexes" do
   end
   
   it "should extract defined array values" do
-    pending "must reimplement for normalize and denormalize"
     WithArrays.normalize(@from).should == @to
   end
   
   it "should map the other way restoring arrays" do
-    pending "must reimplement for normalize and denormalize"
-    WithArrays.denormalize(@from).should == @to
+    WithArrays.denormalize(@to).should == @from
   end
 end
 
@@ -271,18 +269,22 @@ end
 class NoKeys
   extend HashMapper
   
-  map from('/exists'), to('/exists_yahoo')
-  map from('/foo'), to('/bar')
+  map from('/exists'), to('/exists_yahoo') #in
+  map from('/exists_as_nil'), to('/exists_nil') #in
+  map from('/foo'), to('/bar') # not in
+  
 end
 
 describe "with non-matching maps" do
   before :all do
     @input = {
       :exists => 1,
+      :exists_as_nil => nil,
       :doesnt_exist => 2
     }
     @output = {
-      :exists_yahoo => 1
+      :exists_yahoo => 1,
+      :exists_nil => nil
     }
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ismasan-hash_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ismael Celis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-04 00:00:00 -08:00
+date: 2009-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency