Add support for searching on multiple languages.

.travis.yml

@@ -1,7 +1,7 @@
 bundler_args: --without assets:development:production
 language: ruby
 rvm:
-  - 2.1.1
+  - 2.1.2
 addons:
   postgresql: "9.3"
 before_script:

app/models/concerns/search.rb

@@ -2,7 +2,6 @@ module Search
   extend ActiveSupport::Concern
 
   included do
-    scope :language, ->(language) { where('languages @@ :q', q: language) }
     scope :keyword, ->(keyword) { keyword_search(keyword) }
     scope :category, ->(category) { joins(services: :categories).where(categories: { name: category }) }
 
@@ -57,6 +56,10 @@ module Search
   module ClassMethods
     require 'exceptions'
 
+    def language(lang)
+      where('languages && ARRAY[?]', lang)
+    end
+
     def service_area(sa)
       joins(:services).where('services.service_areas @@ :q', q: sa)
     end

app/models/location.rb

@@ -95,12 +95,6 @@ class Location < ActiveRecord::Base
 
   serialize :emails, Array
 
-  serialize :languages, Array
-  # enumerize :languages, in: [:arabic, :cantonese, :french, :german,
-  #   :mandarin, :polish, :portuguese, :russian, :spanish, :tagalog, :urdu,
-  #   :vietnamese,
-  #    ], multiple: true, scope: true
-
   serialize :urls, Array
 
   auto_strip_attributes :description, :hours, :name, :short_desc,

app/validators/service_area_validator.rb

@@ -1,6 +1,6 @@
 class ServiceAreaValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    return if value.blank?
+    return if value.blank? || SETTINGS[:valid_service_areas].blank?
     default_message = "#{value} #{I18n.t('errors.messages.invalid_service_area')}"
 
     unless SETTINGS[:valid_service_areas].include?(value)

db/migrate/20140909031145_convert_languages_to_array_type.rb

@@ -0,0 +1,29 @@
+class ConvertLanguagesToArrayType < ActiveRecord::Migration
+  def up
+    execute "drop index locations_languages"
+    change_column :locations, :languages, "text[] USING (string_to_array(languages, '\n- '))", default: []
+    add_index :locations, :languages, using: 'gin'
+
+    Location.find_each do |loc|
+      if loc.languages.nil?
+        loc.update(languages: [])
+      else
+        clean_langs = loc.languages.select { |lang| lang != '---' }.
+                          map { |lang| lang.strip.gsub("\n", '') }
+        loc.update(languages: clean_langs)
+      end
+    end
+  end
+
+  def down
+    execute "drop index index_locations_on_languages"
+    change_column :locations, :languages, "text USING (array_to_string(languages, ','))"
+
+    Location.find_each do |loc|
+      next if loc.languages.blank?
+      loc.update(languages: loc.languages.split(','))
+    end
+
+    execute "create index locations_languages on locations using gin(to_tsvector('english', languages))"
+  end
+end