From ee63321e8db076d3e68803432ea90d43a5ecce7b Mon Sep 17 00:00:00 2001
From: Andrey Novikov <envek@envek.name>
Date: Mon, 24 Aug 2015 16:54:25 +0300
Subject: [PATCH] Fix TypeError because sometimes original_meta is just a
 string representation of Hash

---
 lib/paperclip-meta/attachment.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/paperclip-meta/attachment.rb b/lib/paperclip-meta/attachment.rb
index fea51e5..3e020ee 100644
--- a/lib/paperclip-meta/attachment.rb
+++ b/lib/paperclip-meta/attachment.rb
@@ -93,6 +93,8 @@ def meta_decode(meta)
         def merge_existing_meta_hash(meta)
           return unless (original_meta = instance.send("#{name}_meta"))
           meta.reverse_merge! meta_decode(original_meta)
+        rescue TypeError
+          meta.reverse_merge! eval(original_meta)
         end
       end
     end