Fix nil exception, when reading empty translated values

openscript · Jul 30, 2016 · 24f523e · 24f523e
1 parent 4045d9a
commit 24f523e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/.idea/awesome_hstore_translate.iml b/.idea/awesome_hstore_translate.iml
diff --git a/lib/awesome_hstore_translate/active_record/instance_methods.rb b/lib/awesome_hstore_translate/active_record/instance_methods.rb
@@ -10,9 +10,11 @@ def read_translated_attribute(attr, locale = I18n.locale)
 
         translations = read_raw_attribute(attr)
 
-        locales.uniq.each do |cur|
-          if translations.has_key?(cur.to_s) && !translations[cur.to_s].empty?
-            return translations[cur.to_s]
+        if translations
+          locales.uniq.each do |cur|
+            if translations.has_key?(cur.to_s) && !translations[cur.to_s].empty?
+              return translations[cur.to_s]
+            end
           end
         end
 

diff --git a/test/awesome_hstore_translate_test.rb b/test/awesome_hstore_translate_test.rb
@@ -158,4 +158,9 @@ def test_find_by_query_with_translated_value
     res = PageWithFallbacks.find_by(title: 'Another English title')
     assert_equal(exp.id, res.id)
   end
+
+  def test_with_empty_translated_value
+    new = PageWithFallbacks.new
+    assert_nil(new.title)
+  end
 end