frontend/app/helpers/gaku/person_helper.rb in gaku-0.1.1 vs frontend/app/helpers/gaku/person_helper.rb in gaku-0.2.0

@@ -13,27 +13,27 @@
       end
     end
 
     def name_and_ruby_for(person)
       name_elements = [
-        {word: person.surname,  reading: person.surname_reading},
-        {word: person.name,     reading: person.name_reading}
+        { word: person.surname,  reading: person.surname_reading },
+        { word: person.name,     reading: person.name_reading }
       ]
 
       name_elements.map do |element|
         content_tag :ruby do
           [
             content_tag(:rb) do
               element[:word]
             end,
-            content_tag(:rp, "( "),
+            content_tag(:rp, '( '),
             content_tag(:rt) do
               element[:reading]
             end,
-            content_tag(:rp, " )"),
+            content_tag(:rp, ' )'),
             unless name_elements.last == element
-              " "
+              ' '
             end
           ].join.html_safe
         end
       end.join.html_safe
     end
@@ -54,12 +54,11 @@
     end
 
     def student_names(student, options = {})
       @names_preset ||= Gaku::Preset.names
       reading = options[:reading]
-      if @names_preset.blank?
-        return reading ? student.surname : student.name
-      end
+      return reading ? student.surname : student.names if @names_preset.blank?
+
       result = @names_preset.gsub(/%(\w+)/) do |name|
         case name
         when '%first' then proper_name(student, :name, reading)
         when '%middle' then proper_name(student, :middle_name, reading)
         when '%last' then proper_name(student, :surname, reading)