update code according to the PR review.

Author: whomingbird

app/models/publication.rb

@@ -345,15 +345,15 @@ def generate_citation(bibtex_record)
     publication_type = PublicationType.find(self.publication_type_id)
 
     case publication_type.key
-    when 'journalarticle'
+    when publication_type.journalarticle?
       self.citation += self.journal.nil? ? '':self.journal
       self.citation += volume.blank? ? '': " #{volume}"
       self.citation += number.nil? ? '' : "(#{number})"
       self.citation += pages.blank? ? '' : (":#{pages}")
-    when 'booklet'
+    when publication_type.booklet?
       self.citation += howpublished.blank? ? '': "#{howpublished}"
       self.citation += address.nil? ? '' : (", #{address}")
-    when 'bookchapter'
+    when publication_type.bookchapter?
       self.citation += self.booktitle.nil? ? '' : ("In #{self.booktitle}")
       self.citation += volume.blank? ? '' : (", volume #{volume}")
       self.citation += series.blank? ? '' : (" of #{series}")
@@ -363,7 +363,7 @@ def generate_citation(bibtex_record)
       unless address.nil? || (self.booktitle.try(:include?, address))
         self.citation += address.nil? ? '' : (", #{address}")
       end
-    when 'conferencepaper', 'collection', 'book'
+    when publication_type.conferencepaper?, publication_type.collection?, publication_type.book?
       # InProceedings / InCollection
       self.citation += self.booktitle.nil? ? '' : ("In #{self.booktitle}")
       self.citation += volume.blank? ? '' : (", vol. #{volume}")
@@ -374,25 +374,25 @@ def generate_citation(bibtex_record)
       unless address.nil? || (self.booktitle.try(:include?, address))
         self.citation += address.nil? ? '' : (", #{address}")
       end
-    when 'bachelorsthesis', 'mastersthesis', 'phdthesis'
+    when publication_type.dissertation?
       #PhD/Master Thesis
       self.citation += school.nil? ? '' : (" #{school}")
       self.errors.add(:base,'A thesis need to have a school') if school.nil?
       self.citation += year.nil? ? '' : (", #{year}")
       self.citation += tutor.nil? ? '' : (", #{tutor}(Tutor)")
       self.citation += tutorhits.nil? ? '' : (", #{tutorhits}(HITS Tutor)")
       self.citation += url.nil? ? '' : (", #{url}")
-    when 'conferenceproceeding'
+    when publication_type.conferenceproceeding?
       # Proceedings are conference proceedings, it has no authors but editors
       # Book
       self.journal = self.title
       self.citation += volume.blank? ? '' : ("vol. #{volume}")
       self.citation += series.blank? ? '' : (" of #{series}")
       self.citation += self.publisher.blank? ? '' : (", #{self.publisher}")
-    when 'report'
+    when publication_type.report?
       self.citation += institution.blank? ? ' ': institution
       self.citation += type.blank? ? ' ' : (", #{type}")
-    when 'preprint'
+    when publication_type.preprint?
       self.citation += note.blank? ? ' ': note
     end
 
@@ -594,21 +594,21 @@ def check_bibtex_file (bibtex_record)
       return false
     end
 
-    if (['Collection', 'Conference Paper'].include? self.publication_type.title) && (bibtex_record[:booktitle].blank?)
+    if (publication_type.collection? || publication_type.conferencepaper?) && bibtex_record[:booktitle].blank?
       errors.add(:base, "A #{self.publication_type.title} needs to have a booktitle.")
         return false
     end
 
-    unless ['Booklet', 'Text', 'Other', 'Conference Proceeding'].include? self.publication_type.title
+    unless publication_type.booklet? || publication_type.text? || publication_type.other? || publication_type.conferenceproceeding?
       if bibtex_record[:author].nil? && self.editor.nil?
         self.errors.add(:base, "You need at least one author or editor for the #{self.publication_type.title}.")
         return false
       end
     end
 
-    if ['bachelorsthesis', 'mastersthesis', 'phdthesis', 'diplomthesis'].include?(publication_type.key)
+    if publication_type.dissertation?
       if bibtex_record[:school].try(:to_s).nil?
-        self.errors.add(:base,"A #{self.publication_type.title} needs to have a school.")
+        self.errors.add(:base,"A #{publication_type.title} needs to have a school.")
         return false
       end
     end

app/models/publication_type.rb

@@ -21,20 +21,155 @@ class PublicationType < ActiveRecord::Base
   }.freeze
 
 
-  # Load expected publication types from YAML
-  def self.type_registry
-    @type_registry ||= begin
-                         path = Rails.root.join('config/default_data/publication_types.yml')
-                         YAML.load_file(path).values.index_by { |h| h['title'] }
-                       end
+  def journalarticle?
+    key == 'journalarticle'
   end
 
-  def self.for_type(type)
-    yaml_entry = type_registry[type]
-    return nil unless yaml_entry
-    find_by(key: yaml_entry['key'])
+  def book?
+    key == 'book'
   end
 
+  def booklet?
+    key == 'booklet'
+  end
+
+  def bookchapter?
+    key == 'bookchapter'
+  end
+
+  def collection?
+    key == 'collection'
+  end
+
+  def conferencepaper?
+    key == 'conferencepaper'
+  end
+
+  def conferenceproceeding?
+    key == 'conferenceproceeding'
+  end
+
+  def text?
+    key == 'text'
+  end
+
+  def bachelorsthesis?
+    key == 'bachelorsthesis'
+  end
+
+  def mastersthesis?
+    key == 'mastersthesis'
+  end
+
+  def diplomathesis?
+    key == 'diplomathesis'
+  end
+
+  def phdthesis?
+    key == 'phdthesis'
+  end
+
+  def dissertation?
+    %w[bachelorsthesis mastersthesis diplomathesis phdthesis].include?(key)
+  end
+
+  def other?
+    key == 'other'
+  end
+
+  def preprint?
+    key == 'preprint'
+  end
+
+  def report?
+    key == 'report'
+  end
+
+  def audiovisual?
+    key == 'audiovisual'
+  end
+
+  def award?
+    key == 'award'
+  end
+
+  def computationalnotebook?
+    key == 'computationalnotebook'
+  end
+
+  def datapaper?
+    key == 'datapaper'
+  end
+
+  def dataset?
+    key == 'dataset'
+  end
+
+  def event?
+    key == 'event'
+  end
+
+  def image?
+    key == 'image'
+  end
+
+  def instrument?
+    key == 'instrument'
+  end
+
+  def interactiveresource?
+    key == 'interactiveresource'
+  end
+
+  def model?
+    key == 'model'
+  end
+
+  def outputmanagementplan?
+    key == 'outputmanagementplan'
+  end
+
+  def peerreview?
+    key == 'peerreview'
+  end
+
+  def physicalobject?
+    key == 'physicalobject'
+  end
+
+  def project?
+    key == 'project'
+  end
+
+  def service?
+    key == 'service'
+  end
+
+  def software?
+    key == 'software'
+  end
+
+  def sound?
+    key == 'sound'
+  end
+
+  def standard?
+    key == 'standard'
+  end
+
+  def studyregistration?
+    key == 'studyregistration'
+  end
+
+  def workflow?
+    key == 'workflow'
+  end
+
+  def projectdeliverable?
+    key == 'projectdeliverable'
+  end
+
+  
   # Extract publication type from BibTeX record
   def self.get_publication_type_id(bibtex_record)
     # Extract the BibTeX entry type, e.g. article, inbook, misc...

app/views/publications/new.html.erb

@@ -29,10 +29,12 @@
             <div class="col-sm-3">
               <span id="publication_type_info" style="display:none;"></span>
               <span id="publication_type_selection">
-              <%= collection_select :publication, :publication_type_id, PublicationType.order(:title), :id, :title,
-                                    {:selected => PublicationType.JournalArticle.id},
-                                    {:class => 'form-control'}  -%>
-      </span>
+                <%= collection_select :publication, :publication_type_id,
+                      PublicationType.order(:title),
+                      :id, :title,
+                      { include_blank: "Please select a type ..." },
+                      { class: "form-control" } %>
+              </span>
             </div>
           </div>
         </div>
@@ -78,9 +80,11 @@
           <div class="col-sm-2">
             <span id="publication_type_info" style="display:none;"></span>
             <span id="publication_type_selection">
-        <%= collection_select :publication, :publication_type_id, PublicationType.order(:title), :id, :title,
-                              {:selected => PublicationType.JournalArticle.id},
-                              {:class => 'form-control'} -%>
+            <%= collection_select :publication, :publication_type_id,
+                                  PublicationType.order(:title),
+                                  :id, :title,
+                                  { include_blank: "Please select a type ..." },
+                                  { class: "form-control" } %>
       </span>
           </div>
         </div>

config/default_data/publication_types.yml

@@ -45,11 +45,11 @@ MastersThesis:
   key: mastersthesis
 
 DiplomaThesis:
-  title: Diplom Thesis
-  key: diplomthesis
+  title: Diploma Thesis
+  key: diplomathesis
 
 PhdThesis:
-  title: Doctoral Thesis
+  title: PhD Thesis
   key: phdthesis
 
 Other:

db/seeds/005_publication_types.seeds.rb

@@ -19,7 +19,9 @@
   'Manual'         => 'Text',
   'Misc'           => 'Other',
   'Tech report'    => 'Report',
-  'Unpublished'    => 'Preprint'
+  'Unpublished'    => 'Preprint',
+  'Doctoral Thesis' => 'PhD Thesis',
+  'Diplom Thesis'  => 'Diploma Thesis'
 }.freeze
 
 # -------------------------------------------------------------------

test/factories/publications.rb

@@ -8,7 +8,7 @@
 
 
   factory(:phdthesis, class: PublicationType) do
-    title { 'Doctoral Thesis' }
+    title { 'PhD Thesis' }
     key   { 'phdthesis' }
   end
 

test/fixtures/publication_types.yml

@@ -45,11 +45,11 @@ MastersThesis:
   key: mastersthesis
 
 DiplomaThesis:
-  title: Diplom Thesis
-  key: diplomthesis
+  title: Diploma Thesis
+  key: diplomathesis
 
 PhdThesis:
-  title: Doctoral Thesis
+  title: PhD Thesis
   key: phdthesis
 
 Other:

test/functional/publications_controller_test.rb

@@ -303,7 +303,7 @@ def test_title
       assert_includes flash[:error], 'A Conference Paper needs to have a booktitle.'
       assert_includes flash[:error], 'Please check your bibtex files, each publication should contain a title or a chapter name.'
       assert_includes flash[:error], 'A Collection needs to have a booktitle.'
-      assert_includes flash[:error], 'A Doctoral Thesis needs to have a school.'
+      assert_includes flash[:error], 'A PhD Thesis needs to have a school.'
       assert_includes flash[:error], "A Master's Thesis needs to have a school."
       assert_includes flash[:error], 'You need at least one author or editor for the Journal Article.'
     end
@@ -315,7 +315,7 @@ def test_title
       { title: 'The Example Book',               type_title: 'Book' },
       { title: 'A Chapter Inside a Book',        type_title: 'Book Chapter' },
       { title: 'A Conference Paper Example',     type_title: 'Conference Paper' },
-      { title: 'An Example PhD Thesis',          type_title: 'Doctoral Thesis' },
+      { title: 'An Example PhD Thesis',          type_title: 'PhD Thesis' },
       { title: 'A Technical Report Example',     type_title: 'Report' },
       { title: 'Miscellaneous Example',          type_title: 'Other' }
     ]