Merge branch 'develop'

Author: ElliottAYoung

app/cells/plugins/core/tooltip_cell.rb

@@ -8,7 +8,7 @@ def show
       private
 
       def tooltip_id
-        @options[:id].parameterize('_')
+        @options[:id].parameterize(separator: '_')
       end
     end
   end

app/models/asset_field_type.rb

@@ -43,7 +43,7 @@ def image?
   end
 
   def mapping_field_name
-    "#{field_name.parameterize('_')}_asset_file_name"
+    "#{field_name.parameterize(separator: '_')}_asset_file_name"
   end
 
   def promote

app/models/author_field_type.rb

@@ -16,13 +16,13 @@ def field_item_as_indexed_json_for_field_type(field_item, options = {})
   end
 
   def mapping
-    {author_name: mapping_field_name, type: :string, analyzer: :snowball}
+    { name: mapping_field_name, type: :string, analyzer: :snowball }
   end
 
   private
 
   def mapping_field_name
-    "#{field_name.parameterize('_')}_author_name"
+    "#{field_name.parameterize(separator: '_')}_author"
   end
 
   def author_name_present

app/models/boolean_field_type.rb

@@ -18,6 +18,6 @@ def mapping
   private
 
   def mapping_field_name
-    "#{field_name.parameterize('_')}_boolean"
+    "#{field_name.parameterize(separator: '_')}_boolean"
   end
 end

app/models/content_item_field_type.rb

@@ -18,6 +18,6 @@ def mapping
   private
 
   def mapping_field_name
-    "#{field_name.parameterize('_')}_content_item"
+    "#{field_name.parameterize(separator: '_')}_content_item"
   end
 end

app/models/date_time_field_type.rb

@@ -21,7 +21,7 @@ def mapping
   private
 
   def mapping_field_name
-    "#{field_name.parameterize('_')}_date_time"
+    "#{field_name.parameterize(separator: '_')}_date_time"
   end
 
   def timestamp_is_valid?

app/models/float_field_type.rb

@@ -23,7 +23,7 @@ def mapping
   private
 
   def mapping_field_name
-    "#{field_name.parameterize('_')}_float"
+    "#{field_name.parameterize(separator: '_')}_float"
   end
 
   def validate_key(key)

app/models/integer_field_type.rb

@@ -23,7 +23,7 @@ def mapping
   private
 
   def mapping_field_name
-    "#{field_name.parameterize('_')}_integer"
+    "#{field_name.parameterize(separator: '_')}_integer"
   end
 
   def validate_key

app/models/tag_field_type.rb

@@ -21,7 +21,7 @@ def mapping
   private
 
   def mapping_field_name
-    "#{field_name.parameterize('_')}_tag"
+    "#{field_name.parameterize(separator: '_')}_tag"
   end
 
   def validate_presence?

app/models/text_field_type.rb

@@ -23,7 +23,7 @@ def mapping
   private
 
   def mapping_field_name
-    "#{field_name.parameterize('_')}_text"
+    "#{field_name.parameterize(separator: '_')}_text"
   end
 
   def text_length