hash_mapper 0.0.9 → 0.0.10

data/README.rdoc

@@ -81,7 +81,7 @@ You can use HashMapper in your own little hash-like objects:
 
 ==== Coercing values
 
-You want to make sure an incoming value get converted to a certain type, so 
+You want to make sure an incoming value gets converted to a certain type, so 
 
 {'one' => '1', 'two' => '2'} gets translated to {:one => 1, :two => 2}
 
@@ -168,9 +168,6 @@ Now ProjectMapper will delegate parsing of :author_names to UserMapper
 
    ProjectMapper.normalize( input ) # => output
 
-* Note the ampersand in &UserMapper. This is important if you are passing custom classes instead of procs.
-* If you want to implement your own filter class just define to_proc in it.
-
 Let's say you have a CompanyMapper which maps a hash with an array of employees, and you want to reuse UserMapper to map each employee. You could:
 
    class CompanyMapper
@@ -226,13 +223,9 @@ Note also that 'output' is correct at the time of the filter, i.e. before_normal
 
 == INSTALL:
 
-# If you haven't done this already:
-
-   gem sources -a http://gems.github.com
-
 # Now install
 
-   sudo gem install ismasan-hash_mapper
+   sudo gem install hash_mapper
 
 == Credits:
 
@@ -240,6 +233,7 @@ Note also that 'output' is correct at the time of the filter, i.e. before_normal
 * Mark Evans (Contributor - http://github.com/markevans)
 * Jdeveloper (Contributor - http://github.com/jdeveloper)
 * nightscape (Contributor - http://github.com/nightscape)
+* radamanthus (Contributor - http://github.com/radamanthus)
 
 == LICENSE:
 

data/Rakefile

@@ -15,6 +15,7 @@ begin
     gemspec.description = "Tiny module that allows you to easily adapt from one hash structure to another with a simple declarative DSL."
     gemspec.email = "ismaelct@gmail.com"
     gemspec.homepage = "http://github.com/ismasan/hash_mapper"
+    gemspec.add_dependency('active_support', '>= 3.0.0.beta')
     gemspec.authors = ["Ismael Celis"]
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/hash_mapper.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{hash_mapper}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ismael Celis"]
-  s.date = %q{2009-10-29}
+  s.date = %q{2010-09-21}
   s.description = %q{Tiny module that allows you to easily adapt from one hash structure to another with a simple declarative DSL.}
   s.email = %q{ismaelct@gmail.com}
   s.extra_rdoc_files = [
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/ismasan/hash_mapper}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Maps values from hashes with different structures and/or key names. Ideal for normalizing arbitrary data to be consumed by your applications, or to prepare your data for different display formats (ie. json)}
   s.test_files = [
     "spec/hash_mapper_spec.rb",
@@ -46,9 +46,13 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<active_support>, [">= 3.0.0.beta"])
     else
+      s.add_dependency(%q<active_support>, [">= 3.0.0.beta"])
     end
   else
+    s.add_dependency(%q<active_support>, [">= 3.0.0.beta"])
   end
 end
+

data/lib/hash_mapper.rb

@@ -4,11 +4,8 @@ $:.unshift(File.dirname(__FILE__)) unless
 def require_active_support
   require 'active_support/core_ext/array/extract_options'
   require 'active_support/core_ext/hash/indifferent_access'
-  require 'active_support/core_ext/duplicable'
-  Array.send(:include, ActiveSupport::CoreExtensions::Array::ExtractOptions)
-  Hash.send(:include, ActiveSupport::CoreExtensions::Hash::IndifferentAccess)
+  require 'active_support/core_ext/object/duplicable'
   require 'active_support/core_ext/class/inheritable_attributes'
-
 end
 
 begin
@@ -123,21 +120,19 @@ module HashMapper
 
     def process_into(output, input, meth = :normalize)
       path_1, path_2 = (meth == :normalize ? [path_from, path_to] : [path_to, path_from])
-      catch :no_value do
-        value = get_value_from_input(output, input, path_1, meth)
-        add_value_to_hash!(output, path_2, value)
-      end
+      value = get_value_from_input(output, input, path_1, meth)
+      add_value_to_hash!(output, path_2, value) unless value == :hash_mapper_no_value
     end
     protected
 
     def get_value_from_input(output, input, path, meth)
       value = path.inject(input) do |h,e|
-        if h.respond_to?(:with_indifferent_access)# this does it, but uses ActiveSupport
-          v = h.with_indifferent_access[e]
+        if h.is_a?(Hash)
+          v = [h[e.to_sym], h[e.to_s]].compact.first
         else
           v = h[e]
         end
-        throw :no_value if v.nil?#.has_key?(e)
+        return :hash_mapper_no_value if v.nil?
         v
       end
       delegated_mapper ? delegate_to_nested_mapper(value, meth) : value
@@ -149,7 +144,7 @@ module HashMapper
       when Array
         value.map {|h| delegated_mapper.send(meth, h)}
       when nil
-        throw :no_value
+        return :hash_mapper_no_value
       else
         delegated_mapper.send(meth, value)
       end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hash_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  hash: 11
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Ismael Celis
@@ -9,10 +15,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 +00:00
+date: 2010-09-21 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: active_support
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31098225
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta
+        version: 3.0.0.beta
+  type: :runtime
+  version_requirements: *id001
 description: Tiny module that allows you to easily adapt from one hash structure to another with a simple declarative DSL.
 email: ismaelct@gmail.com
 executables: []
@@ -47,21 +69,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Maps values from hashes with different structures and/or key names. Ideal for normalizing arbitrary data to be consumed by your applications, or to prepare your data for different display formats (ie. json)