hash_mapper 0.0.8 → 0.0.9

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:
@@ -209,15 +218,7 @@ Note also that 'output' is correct at the time of the filter, i.e. before_normal
 == REQUIREMENTS:
 
 == TODO:
-==== 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')
 
 ==== Optimizations
 

data/Rakefile

@@ -1,28 +1,22 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/hash_mapper'
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('hash_mapper', HashMapper::VERSION) do |p|
-  p.developer('Ismael Celis', 'ismaelct@gmail.com')
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
-  p.rubyforge_name       = p.name # TODO this is default value
-  # p.extra_deps         = [
-  #   ['activesupport','>= 2.0.2'],
-  # ]
-  p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
-end
-
-require 'newgem/tasks' # load /tasks/*.rake
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-task :default => [:spec]
+require 'rubygems'
+require File.dirname(__FILE__) + '/lib/hash_mapper'
+
+Dir['tasks/**/*.rake'].each { |t| load t }
+
+# TODO - want other tests/tasks run by default? Add them to the list
+task :default => [:spec]
+
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "hash_mapper"
+    gemspec.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)"
+    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.authors = ["Ismael Celis"]
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end

data/VERSION

@@ -0,0 +1 @@
+0.0.9

data/hash_mapper.gemspec

@@ -0,0 +1,54 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{hash_mapper}
+  s.version = "0.0.9"
+
+  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.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 = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "History.txt",
+     "Manifest.txt",
+     "PostInstall.txt",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "hash_mapper.gemspec",
+     "lib/hash_mapper.rb",
+     "script/console",
+     "script/destroy",
+     "script/generate",
+     "spec/hash_mapper_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "tasks/rspec.rake"
+  ]
+  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.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",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/lib/hash_mapper.rb

@@ -40,8 +40,7 @@ unless Array.instance_methods.include?("inject_with_index")
 end
 
 module HashMapper
-  VERSION = '0.0.8'
-  
+
   # we need this for inheritable mappers, which is annoying because it needs ActiveSupport, kinda overkill.
   #
   def self.extended(base)
@@ -50,24 +49,24 @@ module HashMapper
       class_inheritable_accessor :maps
     end
   end
-  
+
   def map(from, to, using=nil, &filter)
     self.maps << Map.new(from, to, using)
     to.filter = filter if block_given? # Useful if just one block given
   end
-  
+
   def from(path, &filter)
     path_map = PathMap.new(path)
     path_map.filter = filter if block_given? # Useful if two blocks given
     path_map
   end
-  
+
   alias :to :from
-  
+
   def using(mapper_class)
     mapper_class
   end
-  
+
   def normalize(a_hash)
     perform_hash_mapping a_hash, :normalize
   end
@@ -75,7 +74,7 @@ module HashMapper
   def denormalize(a_hash)
     perform_hash_mapping a_hash, :denormalize
   end
-  
+
   def before_normalize(&blk)
     @before_normalize = blk
   end
@@ -91,10 +90,10 @@ module HashMapper
   def after_denormalize(&blk)
     @after_denormalize = blk
   end
-  
+
   protected
 
-  
+
   def perform_hash_mapping(a_hash, meth)
     output = {}
     # Before filter
@@ -110,18 +109,18 @@ module HashMapper
     # Return
     output
   end
-  
+
   # Contains PathMaps
   # Makes them interact
   #
   class Map
-    
+
     attr_reader :path_from, :path_to, :delegated_mapper
-    
+
     def initialize(path_from, path_to, delegated_mapper = nil)
       @path_from, @path_to, @delegated_mapper = path_from, path_to, delegated_mapper
     end
-    
+
     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
@@ -129,19 +128,22 @@ module HashMapper
         add_value_to_hash!(output, path_2, value)
       end
     end
-    
     protected
-    
+
     def get_value_from_input(output, input, path, meth)
       value = path.inject(input) do |h,e|
-        v = h.with_indifferent_access[e] # this does it, but uses ActiveSupport
+        if h.respond_to?(:with_indifferent_access)# this does it, but uses ActiveSupport
+          v = h.with_indifferent_access[e]
+        else
+          v = h[e]
+        end
         throw :no_value if v.nil?#.has_key?(e)
         v
       end
       delegated_mapper ? delegate_to_nested_mapper(value, meth) : value
     end
-    
-    
+
+
     def delegate_to_nested_mapper(value, meth)
       case value
       when Array
@@ -152,60 +154,81 @@ module HashMapper
         delegated_mapper.send(meth, value)
       end
     end
-    
+
     def add_value_to_hash!(hash, path, value)
       path.inject_with_index(hash) do |h,e,i|
         if !h[e].nil? # it can be FALSE
           h[e]
         else
-          h[e] = (i == path.size-1 ? path.apply_filter(value) : {})
+          h[e] = if i == path.size-1
+            path.apply_filter(value)
+          else
+            if path.segments[i+1].is_a? Integer
+              []
+            else
+              {}
+            end
+          end
         end
       end
-      
+
     end
-    
+
   end
-  
+
   # contains array of path segments
   #
   class PathMap
     include Enumerable
-    
+
     attr_reader :segments
     attr_writer :filter
-    
+    attr_reader :path
+
     def initialize(path)
       @path = path.dup
       @segments = parse(path)
       @filter = lambda{|value| value}# default filter does nothing
     end
-    
+
     def apply_filter(value)
       @filter.call(value)
     end
-    
+
     def each(&blk)
       @segments.each(&blk)
     end
-    
+
     def first
       @segments.first
     end
-    
+
     def last
       @segments.last
     end
-    
+
     def size
       @segments.size
     end
-    
+
     private
-    
+    KEY_NAME_REGEXP = /([^\[]*)(\[(\d+)+\])?/
+
     def parse(path)
-      path.sub(/^\//,'').split('/').map(&:to_sym)
+
+      segments = path.sub(/^\//,'').split('/')
+      segments = segments.collect do |segment|
+        matches = segment.to_s.scan(KEY_NAME_REGEXP).flatten.compact
+        index = matches[2]
+        if index
+          [matches[0].to_sym, index.to_i]
+        else
+          segment.to_sym
+        end
+      end.flatten
+      segments
     end
-    
+
   end
-  
+
 end

data/spec/hash_mapper_spec.rb

@@ -146,12 +146,10 @@ describe "array indexes" do
   end
   
   it "should extract defined array values" do
-    pending
     WithArrays.normalize(@from).should == @to
   end
   
   it "should map the other way restoring arrays" do
-    pending
     WithArrays.denormalize(@to).should == @from
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hash_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Ismael Celis
@@ -9,43 +9,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 +01:00
+date: 2009-10-29 00:00:00 +00:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
-description: |-
-  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).
-   
-  Tiny module that allows you to easily adapt from one hash structure to another with a simple declarative DSL.
-email: 
-- ismaelct@gmail.com
+dependencies: []
+
+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: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- PostInstall.txt
 - README.rdoc
 files: 
 - History.txt
@@ -53,6 +27,8 @@ files:
 - PostInstall.txt
 - README.rdoc
 - Rakefile
+- VERSION
+- hash_mapper.gemspec
 - lib/hash_mapper.rb
 - script/console
 - script/destroy
@@ -65,10 +41,9 @@ has_rdoc: true
 homepage: http://github.com/ismasan/hash_mapper
 licenses: []
 
-post_install_message: PostInstall.txt
+post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -85,10 +60,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: hash_mapper
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Maps values from hashes with different structures and/or key names
-test_files: []
-
+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)
+test_files: 
+- spec/hash_mapper_spec.rb
+- spec/spec_helper.rb