ismasan-hash_mapper 0.0.6 → 0.0.7

data/lib/hash_mapper.rb

@@ -30,7 +30,7 @@ unless Array.instance_methods.include?("inject_with_index")
 end
 
 module HashMapper
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
   
   # we need this for inheritable mappers, which is annoying because it needs ActiveSupport, kinda overkill.
   #
@@ -91,7 +91,6 @@ module HashMapper
     before_filter = instance_eval "@before_#{meth}"
     a_hash = before_filter.call(a_hash, output) if before_filter
     # Do the mapping
-    a_hash = symbolize_keys(a_hash)
     maps.each do |m|
       m.process_into(output, a_hash, meth)
     end
@@ -102,15 +101,6 @@ module HashMapper
     output
   end
   
-  # from http://www.geekmade.co.uk/2008/09/ruby-tip-normalizing-hash-keys-as-symbols/
-  #
-  def symbolize_keys(hash)
-    hash.inject({}) do |options, (key, value)|
-      options[(key.to_sym rescue key) || key] = value
-      options
-    end
-  end
-  
   # Contains PathMaps
   # Makes them interact
   #
@@ -134,8 +124,9 @@ module HashMapper
     
     def get_value_from_input(output, input, path, meth)
       value = path.inject(input) do |h,e|
-        throw :no_value if h[e].nil?#.has_key?(e)
-        h[e]
+        v = h.with_indifferent_access[e] # this does it, but uses ActiveSupport
+        throw :no_value if v.nil?#.has_key?(e)
+        v
       end
       delegated_mapper ? delegate_to_nested_mapper(value, meth) : value
     end
@@ -154,7 +145,7 @@ module HashMapper
     
     def add_value_to_hash!(hash, path, value)
       path.inject_with_index(hash) do |h,e,i|
-        if h[e]
+        if !h[e].nil? # it can be FALSE
           h[e]
         else
           h[e] = (i == path.size-1 ? path.apply_filter(value) : {})

data/spec/hash_mapper_spec.rb

@@ -294,6 +294,24 @@ describe "with non-matching maps" do
   end
 end
 
+describe "with false values" do
+  
+  it "should include values in output" do
+    NoKeys.normalize({'exists' => false}).should == {:exists_yahoo => false}
+    NoKeys.normalize({:exists => false}).should == {:exists_yahoo => false}
+  end
+  
+end
+
+describe "with nil values" do
+  
+  it "should not include values in output" do
+    NoKeys.normalize({:exists => nil}).should == {}
+    NoKeys.normalize({'exists' => nil}).should == {}
+  end
+  
+end
+
 class WithBeforeFilters
   extend HashMapper
   map from('/hello'), to('/goodbye')
@@ -382,4 +400,31 @@ describe "inherited mappers" do
   it "should not affect other mappers" do
     NotRelated.normalize('n' => 'nn').should == {:n => {:n => 'nn'}}
   end
-end
+end
+
+class MixedMappings
+  extend HashMapper
+  map from('/big/jobs'), to('dodo')
+  map from('/timble'),   to('bingo/biscuit')
+end
+
+describe "dealing with strings and symbols" do
+  
+  it "should be able to normalize from a nested hash with string keys" do
+    MixedMappings.normalize(
+      'big' => {'jobs' => 5},
+      'timble' => 3.2
+    ).should ==   {:dodo  => 5,
+                   :bingo => {:biscuit => 3.2}}
+  end
+  
+  it "should not symbolized keys in value hashes" do
+    MixedMappings.normalize(
+      'big' => {'jobs' => 5},
+      'timble' => {'string key' => 'value'}
+    ).should ==   {:dodo  => 5,
+                   :bingo => {:biscuit => {'string key' => 'value'}}}
+  end
+  
+end
+

metadata

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