remove person.full_public_name, did always return public_name

app/helpers/application_helper.rb

@@ -79,7 +79,7 @@ def available_conference_locales
   end
 
   def by_speakers(event)
-    speakers = event.speakers.map { |p| link_to p.try(:full_public_name), p }
+    speakers = event.speakers.map { |p| link_to p.public_name, p }
     if not speakers.empty?
       "by #{speakers.join(', ')}".html_safe
     else

app/models/person.rb

@@ -46,21 +46,13 @@ class Person < ActiveRecord::Base
   }
 
   def full_name
-    if first_name.blank? or last_name.blank? and not public_name.blank?
+    if first_name.blank? or last_name.blank?
       public_name
     else
       "#{first_name} #{last_name}"
     end
   end
 
-  def full_public_name
-    if public_name.blank?
-      full_name
-    else
-      public_name
-    end
-  end
-
   def user_email
     self.user.email if self.user.present?
   end

app/views/events/feedbacks.html.haml

@@ -29,7 +29,7 @@
               %tr
                 %td= link_to (image_box event.logo, :small), event
                 %td= link_to event.title, event_event_feedbacks_path(event)
-                %td= event.speakers.map{ |p| link_to p.try(:full_public_name), p}.join(", ").html_safe
+                %td= event.speakers.map{ |p| link_to p.public_name, p}.join(", ").html_safe
                 %td= event.track.try(:name)
                 %td
                   - if event.average_feedback

app/views/events/show.html.haml

@@ -65,7 +65,7 @@
         = number_with_precision @event.average_feedback, :precision => 1
     .span6
       %h2 People
-      %p= @event.speakers.map{ |p| link_to p.try(:full_public_name), p}.join(", ").html_safe
+      %p= @event.speakers.map{ |p| link_to p.public_name, p}.join(", ").html_safe
       %h2 Scheduling
       %p
         %b Time slots:

app/views/public/schedule/day.html.haml

@@ -43,7 +43,7 @@
                           = event.subtitle
                           - if @conference.languages.count > 1
                             = "(#{event.language})"
-                        .speakers= event.speakers.map{|p| link_to(h(p.full_public_name), public_speaker_path(:id => p.id))}.join(", ").html_safe
+                        .speakers= event.speakers.map{|p| link_to(h(p.public_name), public_speaker_path(:id => p.id))}.join(", ").html_safe
               - else
                 %td  
           - slot += 1

app/views/public/schedule/event.html.haml

@@ -61,7 +61,7 @@
       - @event.speakers.each do |speaker|
         %tr
           %td= image_box speaker.avatar, :small
-          %td= link_to speaker.full_public_name, public_speaker_path(:id => speaker.id)
+          %td= link_to speaker.public_name, public_speaker_path(:id => speaker.id)
 
 .span16
   - if @event.videos.count > 0

app/views/public/schedule/events.html.haml

@@ -23,4 +23,4 @@
         %td
           %ul
             - event.speakers.each do |speaker|
-              %li= link_to speaker.full_public_name, public_speaker_path(:id => speaker.id)
+              %li= link_to speaker.public_name, public_speaker_path(:id => speaker.id)

app/views/public/schedule/events.json.jbuilder

@@ -19,7 +19,7 @@ json.conference_events do
     json.speakers event.speakers do |person|
       json.id person.id
       json.image person.avatar_path
-      json.full_public_name person.full_public_name
+      json.full_public_name person.public_name
       json.abstract person.abstract
       json.description person.description
       json.links person.links do |link|

app/views/public/schedule/index.json.jbuilder

@@ -34,7 +34,7 @@ json.schedule do
             json.abstract event.abstract
             json.description event.description
             json.do_not_record event.do_not_record
-            json.persons event.speakers, :id, :full_public_name
+            json.persons event.speakers, :id, :public_name
             json.links event.links do |link|
               json.url url_for(link.url)
               json.title link.title

app/views/public/schedule/index.xcal.haml

@@ -31,4 +31,4 @@
           %url= event.static_url
         %location= event.room.try(:name)
         - event.speakers.each do |speaker|
-          %attendee= speaker.full_public_name
+          %attendee= speaker.public_name

app/views/public/schedule/index.xml.haml

@@ -33,7 +33,7 @@
               %description= event.description
               %persons
                 - event.speakers.each do |speaker|
-                  %person{:id=>speaker.id}= speaker.full_public_name
+                  %person{:id=>speaker.id}= speaker.public_name
               %links
                 - event.links.each do |link|
                   %link{:href=>link.url}= link.title ? link.title : link.url

app/views/public/schedule/speaker.html.haml

@@ -1,4 +1,4 @@
-%h2.title #{t '.speaker'}: #{@speaker.full_public_name}
+%h2.title #{t '.speaker'}: #{@speaker.public_name}
 
 .column.left#basic
   = image_box(@speaker.avatar, :large)

app/views/public/schedule/speakers.html.haml

@@ -10,7 +10,7 @@
     - @speakers.each do |speaker|
       %tr
         %td= link_to image_box(speaker.avatar, :small), public_speaker_path(:id => speaker.id)
-        %td= link_to speaker.full_public_name, public_speaker_path(:id => speaker.id)
+        %td= link_to speaker.public_name, public_speaker_path(:id => speaker.id)
         %td
           %ul
             - speaker.public_and_accepted_events_as_speaker_in(@conference).each do |event|

test/unit/person_test.rb

@@ -1,29 +1,32 @@
 require 'test_helper'
 
 class PersonTest < ActiveSupport::TestCase
-  test "full public name prioritizes public name" do
-    person = FactoryGirl.create(:person, public_name: "public name test")
-    assert_not_nil person.last_name
-    assert_equal "public name test", person.full_public_name
+  test "#full_name" do
+    person = build(:person)
+    assert_equal "Fred Besen", person.full_name
+    person = build(:person, first_name: 'Fred')
+    assert_equal "Fred Besen", person.full_name
+    person = build(:person, first_name: 'Bred', last_name: 'Fesen')
+    assert_equal "Bred Fesen", person.full_name
   end
 
   test "feedback average gets calculated correctly" do
-    conference = FactoryGirl.create(:conference)
-    event1 = FactoryGirl.create(:event, conference: conference)
-    event2 = FactoryGirl.create(:event, conference: conference)
-    event3 = FactoryGirl.create(:event, conference: conference)
-    person = FactoryGirl.create(:person)
-    FactoryGirl.create(:event_person, event: event1, person: person, event_role: :speaker)
-    FactoryGirl.create(:event_person, event: event2, person: person, event_role: :speaker)
-    FactoryGirl.create(:event_person, event: event3, person: person, event_role: :speaker)
+    conference = create(:conference)
+    event1 = create(:event, conference: conference)
+    event2 = create(:event, conference: conference)
+    event3 = create(:event, conference: conference)
+    person = create(:person)
+    create(:event_person, event: event1, person: person, event_role: :speaker)
+    create(:event_person, event: event2, person: person, event_role: :speaker)
+    create(:event_person, event: event3, person: person, event_role: :speaker)
 
-    FactoryGirl.create(:event_feedback, event: event1, rating: 3.0)
-    FactoryGirl.create(:event_feedback, event: event2, rating: 4.0)
+    create(:event_feedback, event: event1, rating: 3.0)
+    create(:event_feedback, event: event2, rating: 4.0)
     assert_equal 3.5, person.average_feedback_as_speaker
 
     # FIXME doesn't register another feedback for event2, thus
     # using a new one
-    FactoryGirl.create(:event_feedback, event: event3, rating: 5.0)
+    create(:event_feedback, event: event3, rating: 5.0)
     assert_equal 4.0, person.average_feedback_as_speaker
   end
 end