query methods work with column with _translations suffix

lib/awesome_hstore_translate/active_record/class_methods.rb

@@ -19,6 +19,14 @@ def with_fallbacks(&block)
         translation_options[:fallbacks] = before_state
       end
 
+      def get_column_name(attr)
+        column_name = attr.to_s
+        # detect column from original hstore_translate
+        column_name << '_translations' if !has_attribute?(column_name) && has_attribute?("#{column_name}_translations")
+
+        column_name
+      end
+
       protected
 
       def toggle_fallback

lib/awesome_hstore_translate/active_record/instance_methods.rb

@@ -21,7 +21,7 @@ def read_translated_attribute(attr, locale = I18n.locale)
       end
 
       def read_raw_attribute(attr)
-        read_attribute(get_column_name(attr))
+        read_attribute(self.class.get_column_name(attr))
       end
 
       def write_translated_attribute(attr, value, locale= I18n.locale)
@@ -31,22 +31,12 @@ def write_translated_attribute(attr, value, locale= I18n.locale)
       end
 
       def write_raw_attribute(attr, value)
-        write_attribute(get_column_name(attr), value)
+        write_attribute(self.class.get_column_name(attr), value)
       end
 
       def get_fallback_for_locale(locale)
         I18n.fallbacks[locale] if I18n.respond_to?(:fallbacks)
       end
-
-      private
-
-      def get_column_name(attr)
-        column_name = attr.to_s
-        # detect column from original hstore_translate
-        column_name << '_translations' if !has_attribute?(column_name) && has_attribute?("#{column_name}_translations")
-
-        column_name
-      end
     end
   end
 end

lib/awesome_hstore_translate/active_record/query_methods.rb

@@ -58,10 +58,17 @@ def order(*args)
       private
 
       def translated_attributes(opts)
-        opts.select{ |key, _| self.translated_attribute_names.include?(key) }
+        return opts unless self.respond_to?(:translated_attribute_names)
+
+        opts
+          .select{ |key, _| self.translated_attribute_names.include?(key) }
+          .map{ |key, value| [get_column_name(key), value] }
+          .to_h
       end
 
       def untranslated_attributes(opts)
+        return opts unless self.respond_to?(:translated_attribute_names)
+
         opts.reject{ |key, _| self.translated_attribute_names.include?(key) }
       end
     end

lib/awesome_hstore_translate/version.rb

@@ -1,3 +1,3 @@
 module AwesomeHstoreTranslate
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

test/awesome_hstore_translate_legacy_test.rb

@@ -140,4 +140,27 @@ def test_persists_translations_assigned_to_localized_accessors
   def test_class_method_translates?
     assert_equal true, PageWithoutFallbacks.translates?
   end
+
+  def test_where_query_with_translated_value
+    PageWithFallbacks.create!(:title_raw => {'en' => 'English title', 'de' => 'Deutscher Titel'})
+    exp = PageWithFallbacks.create!(:title_raw => {'en' => 'Another English title', 'de' => 'Noch ein Deutscher Titel'})
+    res = PageWithFallbacks.where(title: 'Another English title').first
+    assert_equal(exp.id, res.id)
+  end
+
+  def test_where_query_with_translated_value_and_other
+    PageWithFallbacks.create!(:title_raw => {'en' => 'English title', 'de' => 'Deutscher Titel'},
+                              author: 'Awesome')
+    exp = PageWithFallbacks.create!(:title_raw => {'en' => 'English title', 'de' => 'Deutscher Titel'},
+                              author: 'Spectacular')
+    res = PageWithFallbacks.where(title: 'English title', author: 'Spectacular').first
+    assert_equal(exp.id, res.id)
+  end
+
+  def test_find_by_query_with_translated_value
+    PageWithFallbacks.create!(:title_raw => {'en' => 'English title', 'de' => 'Deutscher Titel'})
+    exp = PageWithFallbacks.create!(:title_raw => {'en' => 'Another English title', 'de' => 'Noch ein Deutscher Titel'})
+    res = PageWithFallbacks.find_by(title: 'Another English title')
+    assert_equal(exp.id, res.id)
+  end
 end