stanford-mods 2.4.1 → 2.6.2

data/.travis.yml

@@ -1,16 +1,17 @@
 language: ruby
 script: rake
 rvm:
-  - 2.3.1
-  - 2.2.3  # spotlight
-  - 2.2.0
-  # we used to use jruby for merged DOR + MARC records, but no more ...
-  - jruby-head
-  # we also test against ruby-head, which may be unstable.
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: ruby-head
+  - 2.7.0
+  - jruby-9.2.11.0
 notifications: false
-sudo: false
+env:
+  global:
+    - CC_TEST_REPORTER_ID=102848d93bffaa165e4a28cf9998693634256355cd5821349afdea9792dbedaa
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/Gemfile

@@ -2,13 +2,3 @@ source 'https://rubygems.org'
 
 # See stanford-mods.gemspec for this gem's dependencies
 gemspec
-
-group :test, :development do
-  gem 'rubocop', require: false
-  gem 'rubocop-rspec', require: false
-  gem 'pry-byebug', require: false, platform: [:ruby_20, :ruby_21]
-  gem 'coveralls', require: false
-end
-
-# Pin to activesupport 4.x for older versions of ruby
-gem 'activesupport', '~> 4.2' if RUBY_VERSION < '2.2.2'

data/lib/stanford-mods/coordinate.rb

@@ -16,12 +16,14 @@ module Stanford
       # @return [String] the coordinate in WKT/CQL ENVELOPE representation
       def as_envelope
         return unless valid?
+
         "ENVELOPE(#{bounds[:min_x]}, #{bounds[:max_x]}, #{bounds[:max_y]}, #{bounds[:min_y]})"
       end
 
       # @return [String] the coordinate in Solr 4.x+ bbox-format representation
       def as_bbox
         return unless valid?
+
         "#{bounds[:min_x]} #{bounds[:min_y]} #{bounds[:max_x]} #{bounds[:max_y]}"
       end
 
@@ -44,6 +46,7 @@ module Stanford
         @bounds ||= begin
           matches = cleaner_coordinate(value).match %r{\A(?<lat>[EW].+-+.+)\s*/\s*(?<lng>[NS].+-+.+)\Z}
           return {} unless matches
+
           min_x, max_x = matches['lat'].split(/-+/).map { |x| coord_to_decimal(x) }.minmax
           min_y, max_y = matches['lng'].split(/-+/).map { |y| coord_to_decimal(y) }.minmax
           { min_x: min_x, min_y: min_y, max_x: max_x, max_y: max_y }

data/lib/stanford-mods/date_parsing.rb

@@ -32,6 +32,7 @@ module Stanford
       # @return [Boolean] true if the year is between -999 and (current year + 1); false otherwise
       def self.year_str_valid?(year_str)
         return false unless year_str && (year_str.match(/^\d{1,4}$/) || year_str.match(/^-\d{1,3}$/))
+
         (-1000 < year_str.to_i) && (year_str.to_i < Date.today.year + 2)
       end
 
@@ -39,6 +40,7 @@ module Stanford
       # @return [Boolean] true if the year is between -9999 and (current year + 1); false otherwise
       def self.year_int_valid?(year)
         return false unless year.is_a? Integer
+
         (-1000 < year.to_i) && (year < Date.today.year + 2)
       end
 
@@ -59,6 +61,7 @@ module Stanford
         return display_str_for_bc if orig_date_str.match(BC_REGEX)
         # decade next in case there are 4 digits, e.g. 1950s
         return display_str_for_decade if orig_date_str.match(DECADE_4CHAR_REGEXP) || orig_date_str.match(DECADE_S_REGEXP)
+
         result = sortable_year_for_yyyy_or_yy
         unless result
           # try removing brackets between digits in case we have 169[5] or [18]91
@@ -81,6 +84,7 @@ module Stanford
         return if orig_date_str == '0000-00-00' # shpc collection has these useless dates
         # B.C. first in case there are 4 digits, e.g. 1600 B.C.
         return sortable_year_int_for_bc if orig_date_str.match(BC_REGEX)
+
         result = sortable_year_for_yyyy_or_yy
         result ||= sortable_year_for_decade # 19xx or 20xx
         result ||= sortable_year_for_century
@@ -102,6 +106,7 @@ module Stanford
         return if orig_date_str == '0000-00-00' # shpc collection has these useless dates
         # B.C. first in case there are 4 digits, e.g. 1600 B.C.
         return sortable_year_str_for_bc if orig_date_str.match(BC_REGEX)
+
         result = sortable_year_for_yyyy_or_yy
         result ||= sortable_year_for_decade # 19xx or 20xx
         result ||= sortable_year_for_century
@@ -144,6 +149,7 @@ module Stanford
       # @return [String, nil] 4 digit year (e.g. 1865, 0950) if orig_date_str matches pattern, nil otherwise
       def sortable_year_for_yy
         return unless orig_date_str
+
         slash_matches = orig_date_str.match(/\d{1,2}\/\d{1,2}\/\d{2}/)
         if slash_matches
           date_obj = Date.strptime(orig_date_str, '%m/%d/%y')
@@ -196,6 +202,7 @@ module Stanford
       def sortable_year_for_century
         return unless orig_date_str
         return if orig_date_str =~ /B\.C\./
+
         century_matches = orig_date_str.match(CENTURY_4CHAR_REGEXP)
         if century_matches
           return $1 + '00' if $1.length == 2
@@ -215,6 +222,7 @@ module Stanford
       def display_str_for_century
         return unless orig_date_str
         return if orig_date_str =~ /B\.C\./
+
         century_str_matches = orig_date_str.match(CENTURY_WORD_REGEXP)
         return century_str_matches.to_s if century_str_matches
 
@@ -262,6 +270,7 @@ module Stanford
       # @return [String, nil] String sortable -ddd if orig_date_str matches pattern; nil otherwise
       def sortable_year_str_for_early_numeric
         return unless orig_date_str.match(EARLY_NUMERIC)
+
         if orig_date_str =~ /^\-/
           # negative number becomes x - 1000 for sorting; -005 for -995
           num = orig_date_str[1..-1].to_i - 1000
@@ -275,6 +284,7 @@ module Stanford
       # @return [Integer, nil] Integer sortable -ddd if orig_date_str matches pattern; nil otherwise
       def sortable_year_int_for_early_numeric
         return orig_date_str.to_i if orig_date_str.match(EARLY_NUMERIC)
+
         orig_date_str.to_i if orig_date_str =~ /^-\d{4}$/
       end
 
@@ -290,6 +300,7 @@ module Stanford
         return '1 B.C.' if orig_date_str == '0'
         # negative number becomes B.C.
         return "#{orig_date_str[1..-1].to_i + 1} B.C." if orig_date_str =~ /^\-/
+
         # remove leading 0s from early dates
         "#{orig_date_str.to_i} A.D."
       end
@@ -304,6 +315,7 @@ module Stanford
         # need more in string than only 2 digits
         return if orig_date_str.match(/^\d\d$/) || orig_date_str.match(/^\D*\d\d\D*$/)
         return if orig_date_str =~ /\d\s*B.C./ # skip B.C. dates
+
         date_obj = Date.parse(orig_date_str)
         date_obj.year.to_s
       rescue ArgumentError

data/lib/stanford-mods/imprint.rb

@@ -37,12 +37,53 @@ module Stanford
         imprint_statements.join('; ') if imprint_statements.present?
       end
 
+      # @return Array<Integer> an array of publication years for the resource
+      def publication_date_for_slider
+        @originInfo_ng_nodeset.map do |origin_info_node|
+          date_elements = if origin_info_node.as_object.first.key_dates.any?
+                            origin_info_node.as_object.first.key_dates.map(&:as_object).map(&:first)
+                          else
+                            date_field_keys.map do |date_field|
+                              next unless origin_info_node.respond_to?(date_field)
+
+                              date_elements = origin_info_node.send(date_field)
+                              date_elements.map(&:as_object).map(&:first) if date_elements.any?
+                            end.compact.first
+                          end
+
+          if date_elements.nil? || date_elements.none?
+            []
+          elsif date_elements.find(&:start?) &&
+                date_elements.find(&:start?).as_range &&
+                date_elements.find(&:end?) &&
+                date_elements.find(&:end?).as_range
+            start_date = date_elements.find(&:start?)
+            end_date = date_elements.find(&:end?)
+
+            (start_date.as_range.min.year..end_date.as_range.max.year).to_a
+          elsif date_elements.find(&:start?) && date_elements.find(&:start?).as_range
+            start_date = date_elements.find(&:start?)
+
+            (start_date.as_range.min.year..Time.now.year).to_a
+          elsif date_elements.one?
+            date_elements.first.to_a.map(&:year)
+          else
+            date_elements.map { |v| v.to_a.map(&:year) }.flatten
+          end
+        end.flatten
+      end
+
       private
 
+      def extract_year(el)
+        DateParsing.year_int_from_date_str(el.text)
+      end
+
       def compact_and_join_with_delimiter(values, delimiter)
         compact_values = values.compact.reject { |v| v.strip.empty? }
         return compact_values.join(delimiter) if compact_values.length == 1 ||
                                                  !ends_in_terminating_punctuation?(delimiter)
+
         compact_values.each_with_index.map do |value, i|
           if (compact_values.length - 1) == i || # last item?
              ends_in_terminating_punctuation?(value)
@@ -65,6 +106,7 @@ module Stanford
 
       def publisher_vals_str(origin_info_node)
         return if origin_info_node.publisher.text.strip.empty?
+
         publishers = origin_info_node.publisher.reject do |p|
           p.text.strip.empty?
         end.map(&:text)
@@ -75,6 +117,7 @@ module Stanford
 
       def place_vals_str(origin_info_node)
         return if origin_info_node.place.text.strip.empty?
+
         places = place_terms(origin_info_node).reject do |p|
           p.text.strip.empty?
         end.map(&:text)
@@ -91,6 +134,7 @@ module Stanford
       def place_terms(origin_info_element)
         return [] unless origin_info_element.respond_to?(:place) &&
                          origin_info_element.place.respond_to?(:placeTerm)
+
         if unencoded_place_terms?(origin_info_element)
           origin_info_element.place.placeTerm.select do |term|
             !term.attributes['type'].respond_to?(:value) ||
@@ -103,6 +147,7 @@ module Stanford
                         term.attributes['authority'].respond_to?(:value) &&
                         term.attributes['authority'].value == 'marccountry' &&
                         MARC_COUNTRIES.include?(term.text.strip)
+
             term = term.clone
             term.content = MARC_COUNTRIES[term.text.strip]
             term
@@ -115,12 +160,14 @@ module Stanford
       def date_str(origin_info_node)
         date_vals = origin_info_date_vals(origin_info_node)
         return if date_vals.empty?
+
         date_vals.map(&:strip).join(' ')
       end
 
       def origin_info_date_vals(origin_info_node)
         date_field_keys.map do |date_field|
           next unless origin_info_node.respond_to?(date_field)
+
           date_elements = origin_info_node.send(date_field)
           date_elements_display_vals(date_elements) if date_elements.present?
         end.compact.flatten
@@ -299,8 +346,8 @@ module Stanford
           else
             ng_date_element.content
           end
-        rescue
-          ng_date_element.content
+                                  rescue
+                                    ng_date_element.content
         end
         ng_date_element
       end
@@ -313,8 +360,8 @@ module Stanford
           else
             ng_date_element.content
           end
-        rescue
-          ng_date_element.content
+                                  rescue
+                                    ng_date_element.content
         end
         ng_date_element
       end
@@ -337,8 +384,8 @@ module Stanford
           else
             my_ng_date_element.content
           end
-        rescue
-          my_ng_date_element.content
+                                     rescue
+                                       my_ng_date_element.content
         end
         my_ng_date_element
       end
@@ -359,8 +406,8 @@ module Stanford
           else
             my_ng_date_element.content
           end
-        rescue
-          my_ng_date_element.content
+                                     rescue
+                                       my_ng_date_element.content
         end
         my_ng_date_element
       end

data/lib/stanford-mods/name.rb

@@ -45,6 +45,7 @@ module Stanford
         result = []
         mods_ng_xml.personal_name.map do |n|
           next if n.role.size.zero?
+
           n.role.each { |r|
             result << n.display_value_w_date unless includes_marc_relator_collector_role?(r)
           }
@@ -58,6 +59,7 @@ module Stanford
         result = []
         mods_ng_xml.personal_name.each do |n|
           next if n.role.size.zero?
+
           n.role.each { |r|
             result << n.display_value_w_date if includes_marc_relator_collector_role?(r)
           }

data/lib/stanford-mods/origin_info.rb

@@ -82,6 +82,7 @@ module Stanford
       def year_display_str(date_el_array)
         result = date_parsing_result(date_el_array, :date_str_for_display)
         return result if result
+
         _ignore, orig_str_to_parse = self.class.earliest_year_str(date_el_array)
         DateParsing.date_str_for_display(orig_str_to_parse) if orig_str_to_parse
       end
@@ -93,6 +94,7 @@ module Stanford
       def year_int(date_el_array)
         result = date_parsing_result(date_el_array, :year_int_from_date_str)
         return result if result
+
         year_int, _ignore = self.class.earliest_year_int(date_el_array)
         year_int if year_int
       end
@@ -104,6 +106,7 @@ module Stanford
       def year_sort_str(date_el_array)
         result = date_parsing_result(date_el_array, :sortable_year_string_from_date_str)
         return result if result
+
         sortable_str, _ignore = self.class.earliest_year_str(date_el_array)
         sortable_str if sortable_str
       end
@@ -115,6 +118,7 @@ module Stanford
       def date_created_elements(ignore_approximate = false)
         date_created_nodeset = mods_ng_xml.origin_info.dateCreated
         return self.class.remove_approximate(date_created_nodeset) if ignore_approximate
+
         date_created_nodeset.to_a
       end
 
@@ -125,6 +129,7 @@ module Stanford
       def date_issued_elements(ignore_approximate = false)
         date_issued_nodeset = mods_ng_xml.origin_info.dateIssued
         return self.class.remove_approximate(date_issued_nodeset) if ignore_approximate
+
         date_issued_nodeset.to_a
       end
 
@@ -194,6 +199,7 @@ module Stanford
       # @return [Integer, String] year as a String or Integer, depending on method_sym
       def date_parsing_result(date_el_array, method_sym)
         return if date_el_array.empty?
+
         # prefer keyDate
         key_date_el = self.class.keyDate(date_el_array)
         DateParsing.send(method_sym, key_date_el.content) if key_date_el
@@ -239,6 +245,7 @@ module Stanford
         return nil unless pub_date
         return "#{pub_date.to_i + 1000} B.C." if pub_date.start_with?('-')
         return pub_date unless pub_date.include? '--'
+
         "#{pub_date[0, 2].to_i + 1}th century"
       end
 
@@ -251,6 +258,7 @@ module Stanford
           pd = pd.gsub('--', '00')
         end
         fail "pub_date_sort was about to return a non 4 digit value #{pd}!" if pd && pd.length != 4
+
         pd
       end
 
@@ -261,6 +269,7 @@ module Stanford
       def pub_date_display
         return dates_no_marc_encoding.first unless dates_no_marc_encoding.empty?
         return dates_marc_encoding.first unless dates_marc_encoding.empty?
+
         nil
       end
 
@@ -274,6 +283,7 @@ module Stanford
         # use the cached year if there is one
         if @pub_year
           return nil if @pub_year == ''
+
           return @pub_year
         end
 
@@ -307,6 +317,7 @@ module Stanford
       def pub_dates
         return dates_marc_encoding unless dates_marc_encoding.empty?
         return dates_no_marc_encoding unless dates_no_marc_encoding.empty?
+
         nil
       end
 
@@ -410,6 +421,7 @@ module Stanford
         dates.each do |f_date|
           matches = f_date.scan(/\d{1}th/)
           next if matches.empty?
+
           if matches.length == 1
             @pub_year = (matches.first[0, 2].to_i - 1).to_s + '--'
             return @pub_year
@@ -436,6 +448,7 @@ module Stanford
         dates.each do |f_date|
           matches = f_date.scan(/\d{2}th/)
           next if matches.empty?
+
           if matches.length == 1
             @pub_year = (matches.first[0, 2].to_i - 1).to_s + '--'
             return @pub_year
@@ -464,6 +477,7 @@ module Stanford
           # Single digit u notation
           matches = f_date.scan(/\d{3}u/)
           return matches.first.tr('u', '0') if matches.length == 1
+
           # Double digit u notation
           matches = f_date.scan(/\d{2}u{2}/)
           return matches.first.tr('u', '-') if matches.length == 1

data/lib/stanford-mods/searchworks.rb

@@ -139,26 +139,27 @@ module Stanford
         present_title_info_nodes ? present_title_info_nodes.first : nil
       end
 
-      # @return [String] the nonSort text portion of the titleInfo node as a string (if non-empty, else nil)      
+      # @return [String] the nonSort text portion of the titleInfo node as a string (if non-empty, else nil)
       def nonSort_title
         return unless first_title_info_node && first_title_info_node.nonSort
 
         first_title_info_node.nonSort.text.strip.empty? ? nil : first_title_info_node.nonSort.text.strip
       end
-      
+
       # @return [String] the text of the titleInfo node as a string (if non-empty, else nil)
       def title
         return unless first_title_info_node && first_title_info_node.title
 
         first_title_info_node.title.text.strip.empty?   ? nil : first_title_info_node.title.text.strip
       end
-      
+
+      # Searchworks requires that the MODS has a '//titleInfo/title'
       # @return [String] value for title_245_search, title_full_display
       def sw_full_title
-        
-        return nil unless first_title_info_node        
+        return nil if !first_title_info_node || !title
+
         preSubTitle = nonSort_title ? [nonSort_title, title].compact.join(" ") : title
-        preSubTitle.sub!(/:$/, '') if preSubTitle # remove trailing colon
+        preSubTitle.sub!(/:$/, '')
 
         subTitle = first_title_info_node.subTitle.text.strip
         preParts = subTitle.empty? ? preSubTitle : preSubTitle + " : " + subTitle
@@ -178,6 +179,7 @@ module Stanford
 
         result = parts ? preParts + ". " + parts : preParts
         return nil unless result
+
         result += "." unless result =~ /[[:punct:]]$/
         result.strip!
         result = nil if result.empty?
@@ -191,13 +193,20 @@ module Stanford
       def sw_title_display
         result = sw_full_title
         return nil unless result
+
         result.sub(/[\.,;:\/\\]+$/, '').strip
       end
 
       # this includes all titles except
       # @return [Array<String>] values for title_variant_search
       def sw_addl_titles
-        full_titles.select { |s| s !~ Regexp.new(Regexp.escape(sw_short_title)) }
+        excluded_title = sw_short_title || sw_title_display
+        if excluded_title.present?
+          title_regex = Regexp.new(Regexp.escape(excluded_title))
+          full_titles.reject { |s| s =~ title_regex }.reject(&:blank?)
+        else
+          full_titles.reject(&:blank?)
+        end
       end
 
       # Returns a sortable version of the main title
@@ -227,68 +236,15 @@ module Stanford
       # see origin_info.rb  (as all this information comes from top level originInfo element)
       # ---- end PUBLICATION (place, year) ----
 
-      # select one or more format values from the controlled vocabulary here:
-      #   http://searchworks-solr-lb.stanford.edu:8983/solr/select?facet.field=format&rows=0&facet.sort=index
-      # @return <Array[String]> value in the SearchWorks controlled vocabulary
-      # @deprecated - kept for backwards compatibility but not part of SW UI redesign work Summer 2014
-      # @deprecated:  this is no longer used in SW, Revs or Spotlight Jan 2016
-      def format
-        types = term_values(:typeOfResource)
-        return [] unless types
-        genres = term_values(:genre)
-        issuance = term_values([:origin_info, :issuance])
-        val = []
-        types.each do |type|
-          case type
-            when 'cartographic'
-              val << 'Map/Globe'
-            when 'mixed material'
-              val << 'Manuscript/Archive'
-            when 'moving image'
-              val << 'Video'
-            when 'notated music'
-              val << 'Music - Score'
-            when 'software, multimedia'
-              val << 'Computer File'
-            when 'sound recording-musical'
-              val << 'Music - Recording'
-            when 'sound recording-nonmusical', 'sound recording'
-              val << 'Sound Recording'
-            when 'still image'
-              val << 'Image'
-            when 'text'
-              val << 'Book' if issuance && issuance.include?('monographic')
-              book_genres = ['book chapter', 'Book chapter', 'Book Chapter',
-                'issue brief', 'Issue brief', 'Issue Brief',
-                'librettos', 'Librettos',
-                'project report', 'Project report', 'Project Report',
-                'technical report', 'Technical report', 'Technical Report',
-                'working paper', 'Working paper', 'Working Paper']
-              val << 'Book' if genres && !(genres & book_genres).empty?
-              conf_pub = ['conference publication', 'Conference publication', 'Conference Publication']
-              val << 'Conference Proceedings' if genres && !(genres & conf_pub).empty?
-              val << 'Journal/Periodical' if issuance && issuance.include?('continuing')
-              article = ['article', 'Article']
-              val << 'Journal/Periodical' if genres && !(genres & article).empty?
-              stu_proj_rpt = ['student project report', 'Student project report', 'Student Project report', 'Student Project Report']
-              val << 'Other' if genres && !(genres & stu_proj_rpt).empty?
-              thesis = ['thesis', 'Thesis']
-              val << 'Thesis' if genres && !(genres & thesis).empty?
-            when 'three dimensional object'
-              val << 'Other'
-          end
-        end
-        val.uniq
-      end
-
       # select one or more format values from the controlled vocabulary per JVine Summer 2014
       #   http://searchworks-solr-lb.stanford.edu:8983/solr/select?facet.field=format_main_ssim&rows=0&facet.sort=index
       # https://github.com/sul-dlss/stanford-mods/issues/66 - For geodata, the
       # resource type should be only Map and not include Software, multimedia.
       # @return <Array[String]> value in the SearchWorks controlled vocabulary
       def format_main
-        types = term_values(:typeOfResource)
+        types = typeOfResource
         return [] unless types
+
         article_genres = ['article', 'Article',
           'book chapter', 'Book chapter', 'Book Chapter',
           'issue brief', 'Issue brief', 'Issue Brief',
@@ -303,13 +259,18 @@ module Stanford
           'thesis', 'Thesis'
         ]
         val = []
-        genres = term_values(:genre)
-        issuance = term_values([:origin_info, :issuance])
+        genres = term_values(:genre) || []
+        issuance = term_values([:origin_info, :issuance]) || []
+        frequency = term_values([:origin_info, :frequency]) || []
+
+        val << 'Dataset' if genres.include?('dataset') || genres.include?('Dataset')
+
         types.each do |type|
-          case type
+          val << 'Archive/Manuscript' if type.manuscript == 'yes'
+
+          case type.text
             when 'cartographic'
               val << 'Map'
-              val.delete 'Software/Multimedia'
             when 'mixed material'
               val << 'Archive/Manuscript'
             when 'moving image'
@@ -317,11 +278,7 @@ module Stanford
             when 'notated music'
               val << 'Music score'
             when 'software, multimedia'
-              if genres && (genres.include?('dataset') || genres.include?('Dataset'))
-                val << 'Dataset'
-              elsif !val.include?('Map')
-                val << 'Software/Multimedia'
-              end
+              val << 'Software/Multimedia' unless types.map(&:text).include?('cartographic') || (genres.include?('dataset') || genres.include?('Dataset'))
             when 'sound recording-musical'
               val << 'Music recording'
             when 'sound recording-nonmusical', 'sound recording'
@@ -329,11 +286,14 @@ module Stanford
             when 'still image'
               val << 'Image'
             when 'text'
-              val << 'Book' if genres && !(genres & article_genres).empty?
-              val << 'Book' if issuance && issuance.include?('monographic')
-              val << 'Book' if genres && !(genres & book_genres).empty?
-              val << 'Journal/Periodical' if issuance && issuance.include?('continuing')
-              val << 'Archived website' if genres && genres.include?('archived website')
+              is_explicitly_a_book = type.manuscript != 'yes' && (issuance.include?('monographic') || !(genres & article_genres).empty? || !(genres & book_genres).empty?)
+              is_periodical = issuance.include?('continuing') || issuance.include?('serial') || frequency.any? { |x| !x.empty? }
+              is_archived_website = genres.any? { |x| x.casecmp('archived website') == 0 }
+
+              val << 'Book' if is_explicitly_a_book
+              val << 'Journal/Periodical' if is_periodical
+              val << 'Archived website' if is_archived_website
+              val << 'Book' unless is_explicitly_a_book || is_periodical || is_archived_website
             when 'three dimensional object'
               val << 'Object'
           end
@@ -341,24 +301,23 @@ module Stanford
         val.uniq
       end
 
-      # https://github.com/sul-dlss/stanford-mods/issues/66
-      # Limit genre values to Government document, Conference proceedings,
-      # Technical report and Thesis/Dissertation
       # @return <Array[String]> values for the genre facet in SearchWorks
       def sw_genre
         genres = term_values(:genre)
         return [] unless genres
-        types = term_values(:typeOfResource)
-        val = []
-        val << 'Thesis/Dissertation' if genres.include?('thesis') || genres.include?('Thesis')
-        if genres && types && types.include?('text')
-          conf_pub = ['conference publication', 'Conference publication', 'Conference Publication']
-          gov_pub  = ['government publication', 'Government publication', 'Government Publication']
-          tech_rpt = ['technical report', 'Technical report', 'Technical Report']
-          val << 'Conference proceedings' unless (genres & conf_pub).empty?
-          val << 'Government document' unless (genres & gov_pub).empty?
-          val << 'Technical report' unless (genres & tech_rpt).empty?
-        end
+
+        val = genres.map(&:to_s)
+        thesis_pub = ['thesis', 'Thesis']
+        val << 'Thesis/Dissertation' if (genres & thesis_pub).any?
+
+        conf_pub = ['conference publication', 'Conference publication', 'Conference Publication']
+        gov_pub  = ['government publication', 'Government publication', 'Government Publication']
+        tech_rpt = ['technical report', 'Technical report', 'Technical Report']
+
+        val << 'Conference proceedings' if (genres & conf_pub).any?
+        val << 'Government document' if (genres & gov_pub).any?
+        val << 'Technical report' if (genres & tech_rpt).any?
+
         val.uniq
       end
 
@@ -366,6 +325,7 @@ module Stanford
       def catkey
         catkey = term_values([:record_info, :recordIdentifier])
         return nil unless catkey && !catkey.empty?
+
         catkey.first.tr('a', '') # ensure catkey is numeric only
       end
     end # class Record