methodize 0.2.0 → 0.2.1

data/lib/methodize.rb

@@ -1,4 +1,21 @@
 module Methodize
+  def self.extend_object(base)
+    __normalize__(base)
+  end
+
+  def self.__normalize__(value)
+    case value
+    when Hash
+      value.extend(MethodizedHash) unless value.kind_of?(MethodizedHash)
+    when Array
+      value.extend(MethodizedArray) unless value.kind_of?(MethodizedArray)
+    end
+    value
+  end
+
+end
+
+module MethodizedHash
   def self.extended(base)
     # ruby >1.9 returns an array of symbols for object.public_methods 
     # while <1.9 returns an array of string. This methods guess it right
@@ -6,17 +23,18 @@ module Methodize
     
     # if some of the Hash keys and public methods names conflict
     # we free the existant method to enable the user to call it
+    __metaclass__ = base.__metaclass__
     base.keys.each do |k|
-      base.__free_method__(k.to_sym) if base.public_methods.include?(@@key_coerce.call(k))
+      base.__free_method__(k.to_sym, __metaclass__) if base.public_methods.include?(@@key_coerce.call(k))
     end
   end
   
   def [](key)
-    __normalize__(super(key))
+    ::Methodize.__normalize__(super(key))
   end
 
   def []=(key, value)
-    __free_method__(key) if !self.keys.include?(key) && self.public_methods.include?(@@key_coerce.call(key))
+    __free_method__(key) if !keys.include?(key) && public_methods.include?(@@key_coerce.call(key))
     super(key,value)
   end
 
@@ -24,11 +42,10 @@ module Methodize
     method_name = name.to_s
     if method_name[-1,1] == '='
       method_name = method_name.chop
-      self.key?(method_name) ? key = method_name : key = method_name.to_sym
+      key = key?(method_name) ? method_name : method_name.to_sym
       self[key] = args[0]
     else
-      self.key?(method_name) ? key = method_name : key = method_name.to_sym
-      self[key]
+      __fetch__key__(method_name)
     end
   end
 
@@ -36,27 +53,32 @@ module Methodize
   # you can use this to free the method and use the method obj.size
   # to access the value of key "size".
   # you still can access the old method with __[method_name]__
-  def __free_method__(sym)
-    self.__metaclass__.send(:alias_method, "__#{sym.to_s}__".to_sym, sym) unless self.respond_to?("__#{sym.to_s}__")
-    self.__metaclass__.send(:define_method, sym) { method_missing(sym.to_s) }
+  def __free_method__(sym, __metaclass__ = self.__metaclass__)
+    __sym__ = "__#{sym}__"
+    __metaclass__.send(:alias_method, __sym__.to_sym, sym) unless respond_to?(__sym__)
+    __metaclass__.send(:define_method, sym) { __fetch__key__(sym.to_s) }
     self
   end
 
   def __metaclass__
     class << self; self; end
   end
-  
+
 private
 
-  def __normalize__(value)
-    case value
-    when Hash
-      value.extend(Methodize)
-    when Array
-      value.map { |v| __normalize__(v) }
-    else
-      value
-    end
-    value
+  def __fetch__key__(key)
+    self[key?(key) ? key : key.to_sym]
+  end
+end
+
+module MethodizedArray
+  def [](*args)
+    ::Methodize.__normalize__(super(*args))
+  end
+  def first(*args)
+    ::Methodize.__normalize__(super(*args))
+  end
+  def last(*args)
+    ::Methodize.__normalize__(super(*args))
   end
-end
+end

data/test/hash_test.rb

@@ -2,7 +2,6 @@ require 'test/unit'
 require 'methodize/hash'
 
 require 'rubygems'
-require 'ruby-debug'
 
 class MethodizeHashTest < Test::Unit::TestCase
 
@@ -41,7 +40,7 @@ class MethodizeHashTest < Test::Unit::TestCase
     assert_equal :text      , @hash["type"]
     assert_equal 3          , @hash[:size]
     assert_nil   @hash[:wrong_key]
-    
+
     assert       @hash.keys.include?(:size)
     assert_equal 3, @hash.article.size
   end
@@ -51,10 +50,10 @@ class MethodizeHashTest < Test::Unit::TestCase
     assert_equal "Foo Bar"  , @hash.article[1].author
     assert_equal :sports    , @hash.article.last.info.category.first
     assert_nil   @hash.wrong_key
-    
+
     assert_equal 3        , @hash.size
     assert_equal :text    , @hash.type
-    assert_equal 123456789, @hash.id  
+    assert_equal 123456789, @hash.id
   end
 
   def test_double_methodize_call_does_not_affect_anything

data/test/methodize_test.rb

@@ -2,7 +2,6 @@ require 'test/unit'
 require 'methodize'
 
 require 'rubygems'
-require 'ruby-debug'
 
 class MethodizeTest < Test::Unit::TestCase
 
@@ -41,7 +40,7 @@ class MethodizeTest < Test::Unit::TestCase
     assert_equal :text      , @hash["class"]
     assert_equal 3          , @hash[:size]
     assert_nil   @hash[:wrong_key]
-    
+
     assert       @hash.keys.include?(:size)
     assert_equal 3, @hash.article.size
   end
@@ -70,7 +69,7 @@ class MethodizeTest < Test::Unit::TestCase
     end
     assert_not_equal 123456789, @hash.__id__
   end
-  
+
   def test_should_enable_write_operations
     @hash.article.last.title = "Article 3"
     @hash.article[1].info = {
@@ -84,7 +83,7 @@ class MethodizeTest < Test::Unit::TestCase
     @hash.shift  = 12
     @hash["inspect"] = false
     @hash.size   = 4
-    
+
     assert_equal "Article 3"  , @hash.article[2].title
     assert_equal "2010-08-31" , @hash.article[1].info.published
     assert_equal "Marty Mcfly", @hash.article.last.author

metadata

@@ -1,26 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: methodize
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Luis Cipriani
+- Marcelo Manzan
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 -03:00
-default_executable: 
+date: 2012-02-10 00:00:00 Z
 dependencies: []
 
 description: 
-email: lfcipriani@talleye.com
+email: lfcipriani@gmail.com
 executables: []
 
 extensions: []
@@ -33,7 +33,6 @@ files:
 - lib/methodize/hash.rb
 - test/methodize_test.rb
 - test/hash_test.rb
-has_rdoc: true
 homepage: http://blog.talleye.com
 licenses: []
 
@@ -63,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Module to read from and write to the keys of a ruby Hash using methods