Merge pull request #267 from Zloy/refactor-mm

Refactor MethodReader#method_missing

1 files changed, 12 insertions, 6 deletions

diff --git a/lib/hashie/extensions/method_access.rb b/lib/hashie/extensions/method_access.rb
index a823d9d..9c3d537 100644
--- a/lib/hashie/extensions/method_access.rb
+++ b/lib/hashie/extensions/method_access.rb
@@ -33,13 +33,19 @@ module Hashie
       end
 
       def method_missing(name, *args)
-        return self[name.to_s] if key?(name.to_s)
-        return self[name.to_sym] if key?(name.to_sym)
-        if name[-1] == '?'
-          kname = name.to_s[0..-2]
-          return key?(kname) || key?(kname.to_sym)
+        if key?(name)
+          self[name]
+        else
+          sname = name.to_s
+          if key?(sname)
+            self[sname]
+          elsif sname[-1] == '?'
+            kname = sname[0..-2]
+            key?(kname) || key?(kname.to_sym)
+          else
+            super
+          end
         end
-        super
       end
     end