jeokkarak 1.0.2 → 1.0.4

data/README.textile

@@ -107,7 +107,7 @@ Jeokkarak supports schema evoluted relationships: newly created relationships wi
 <pre>
 hash = {"player" => [{"name" => "guilherme silveira"}, {"name" => "caue guerra"}], "new_relation" => {"new_entry" => 20}}
 team = Team.from_hash(hash)
-team.new_relation.new_entry.should eql(20)
+team.new_relation.new_entry.should == 20
 </pre>
 
 It also supports pre-existing relations through the use of has_child:
@@ -121,7 +121,7 @@ end
 # will instantiate a Player type:
 hash = {"player" => {"name" => "guilherme silveira"}}
 team = Team.from_hash(hash)
-team.player.class.should eql(Player)
+team.player.class.should == Player
 </pre>
 
 And finally, it supports rails's ActiveRecord:
@@ -133,7 +133,7 @@ end
 
 hash = {"players" => [{"name" => "guilherme silveira"}]}
 team = Team.from_hash(hash)
-team.players[0].class.should eql(Player)
+team.players[0].class.should == Player
 </pre>
 
 h1. Installing

data/Rakefile

@@ -5,9 +5,9 @@ require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 
 GEM = "jeokkarak"
-GEM_VERSION = "1.0.2"
+GEM_VERSION = "1.0.4"
 SUMMARY = "Hash to object helper methods for schema evolution forward-compatible services."
-AUTHOR = "Guilherme Silveira, Jose Donizetti"
+AUTHOR = "Guilherme Silveira, Jose Donizetti, Caue Guerra"
 EMAIL = "guilherme.silveira@caelum.com.br"
 HOMEPAGE = "http://github.com/caelum/jeokkarak"
 

data/lib/hashi.rb

@@ -1,41 +1,69 @@
 module Hashi
-  class UndefinedMethod
+  class UndefinedMethod < Exception
+    attr_reader :msg
+    def initialize(msg)
+      @msg = msg
+    end
+    def to_s
+      @msg
+    end
   end
+  
   class CustomHash
     
-    attr_reader :hash
+    attr_reader :internal_hash
 
-    def initialize(h)
-      @hash = h
+    def initialize(hash = {})
+      @internal_hash = hash
     end
-    def method_missing(name, *args)
+    
+    def method_missing(name, *args, &block)
       name = name.to_s if name.kind_of? Symbol
       if name[-1,1] == "?"
-        parse(@hash[name.chop])
+        parse(name, @internal_hash[name.chop])
       elsif name[-1,1] == "="
-        @hash[name.chop] = args[0]
+        @internal_hash[name.chop] = args[0]
+      elsif @internal_hash.kind_of?(Array) && name == "each"
+        @internal_hash.each do |k| block.call(transform(k)) end
+      elsif name.respond_to? name
+        @internal_hash.send(name, *args, &block)
       else
-        parse(transform(@hash[name]))
+        return nil if @internal_hash.has_key?(name) && @internal_hash[name].nil?
+        parse(name, transform(@internal_hash[name]))
       end
     end
+    
+    def respond_to?(symbol)
+      super(symbol) || (is_hash? && @internal_hash.key?(symbol.to_s))
+    end
+    
+    def is_hash?
+      @internal_hash.kind_of? Hash
+    end
+    
     def [](x)
-      transform(@hash[x])
+      transform(@internal_hash[x])
     end
+    
     private
     def transform(value)
       return CustomHash.new(value) if value.kind_of?(Hash) || value.kind_of?(Array)
       value
     end
-    def parse(val)
-      raise Hashi::UndefinedMethod.new if val.nil?
-      val
+    
+    def parse(name, value)
+      raise Hashi::UndefinedMethod.new("undefined method '#{name}'") if value.nil?
+      value
     end
     
   end
-  def self.from_hash(h)
-    CustomHash.new(h)
+  
+  def self.from_hash(hash)
+    CustomHash.new(hash)
   end
-  def self.to_object(h)
-    CustomHash.new(h)
+  
+  def self.to_object(hash)
+    CustomHash.new(hash)
   end
+  
 end

data/lib/jeokkarak.rb

@@ -10,7 +10,7 @@ module Jeokkarak
     
     # checks what is the type element for this type (supports rails ActiveRecord, has_child and Hashi)
     def child_type_for(name)
-      return reflect_on_association(key.to_sym ).klass if respond_to? :reflect_on_association
+      return reflect_on_association(name.to_sym ).klass if respond_to? :reflect_on_association
       resource_children[name] || Hashi
     end
     
@@ -30,7 +30,7 @@ module Jeokkarak
         from_hash_parse result, h, key, value
       end
       def result.method_missing(name, *args, &block)
-          Hashi.to_object(@_internal_hash).send(name, args[0], block)
+        Hashi.to_object(@_internal_hash).send(name, args[0], block)
       end
       result
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: jeokkarak
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors: 
-- Guilherme Silveira, Jose Donizetti
+- Guilherme Silveira, Jose Donizetti, Caue Guerra
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 -02:00
+date: 2010-01-25 00:00:00 -02:00
 default_executable: 
 dependencies: []