From 501c6b684cb301883a37843ac459a7f1605696c4 Mon Sep 17 00:00:00 2001
From: Vincent Isambart <vincent.isambart@gmail.com>
Date: Thu, 22 Jan 2009 07:30:10 +0900
Subject: [PATCH] Fixed HotCocoa mapping after framework load

---
 lib/hotcocoa/mappings.rb   |    1 +
 lib/hotcocoa/object_ext.rb |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/hotcocoa/mappings.rb b/lib/hotcocoa/mappings.rb
index 084584b..256bf6a 100644
--- a/lib/hotcocoa/mappings.rb
+++ b/lib/hotcocoa/mappings.rb
@@ -39,6 +39,7 @@ module HotCocoa
           add_mapping(mapped_name, constant, &block)
         else
           on_framework(framework) do
+            constant = Object.full_const_get(mapped_value)
             add_mapping(mapped_name, constant, &block)
           end
         end
diff --git a/lib/hotcocoa/object_ext.rb b/lib/hotcocoa/object_ext.rb
index 09b1b18..a756c15 100644
--- a/lib/hotcocoa/object_ext.rb
+++ b/lib/hotcocoa/object_ext.rb
@@ -12,8 +12,11 @@ class Object
     list.each do |x|
       # This is required because const_get tries to look for constants in the
       # ancestor chain, but we only want constants that are HERE
-      obj = obj.const_defined?(x) ? obj.const_get(x) : nil
-      return false unless obj
+      if obj.const_defined?(x)
+        obj = obj.const_get(x)
+      else
+        return nil
+      end
     end
     obj
   end
-- 
1.6.1