stanford-mods 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0228a5039c07e8a14dc5b3e3c2ab8406695335ab'
-  data.tar.gz: 4ab66f765c29758620f0d30d4d94916ec19bd873
+  metadata.gz: cee6b06bb95f5c410a2b021f8d2b2d82254e52d5
+  data.tar.gz: cb1d846be2f33d5420edeef5705f704fadb9d804
 SHA512:
-  metadata.gz: b93ffbd727cb1b2981aecfc859afc3e736186b84fb0e6286b56d297132a2abbba86b8f06251e869b070f54c7b5b74c31a0b32c505008c7f8a7baee12079b6513
-  data.tar.gz: 74d357cfe005638a9f4292f7340b492aec00b4854562a01bda30b8355b5fa9d94ce08d4c7515a9a4e5b9e91c1ef48493436b97fa7d4f187524fae8baf8c912b4
+  metadata.gz: 5b28846bce27f831c74cb88d708691643a24fc1183e593e42068c4b032254dd3ab47094550e45a8c4a2eb43fd02a866e06343506817c22d7f0bdb27dbb5c907a
+  data.tar.gz: 54f09f4ec848dfe215bea0559a6e0ae62d17d186e2fa8483aa155495ee27b4b34b3db7de9f0c7e7b102f65dbcd59f4a51ccb7fe97c7eadd640cba1e6c5e4ebcb

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-11-16 11:34:11 -0800 using RuboCop version 0.51.0.
+# on 2018-08-08 21:42:13 -0700 using RuboCop version 0.57.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -9,14 +9,14 @@
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: Include, TreatCommentsAsGroupSeparators.
-# Include: **/Gemfile, **/gems.rb
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
 Bundler/OrderedGems:
   Exclude:
     - 'Gemfile'
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: outdent, indent
 Layout/AccessModifierIndentation:
   Exclude:
@@ -31,7 +31,7 @@ Layout/AlignArray:
 
 # Offense count: 4
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedHashRocketStyle, SupportedHashRocketStyles, EnforcedColonStyle, SupportedColonStyles, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
+# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
 # SupportedColonStyles: key, separator, table
 # SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
@@ -49,7 +49,7 @@ Layout/BlockEndNewline:
 
 # Offense count: 20
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentOneStep, IndentationWidth.
+# Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth.
 # SupportedStyles: case, end
 Layout/CaseIndentation:
   Exclude:
@@ -78,7 +78,7 @@ Layout/ExtraSpacing:
 
 # Offense count: 6
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: symmetrical, new_line, same_line
 Layout/MultilineArrayBraceLayout:
   Exclude:
@@ -93,7 +93,7 @@ Layout/MultilineBlockLayout:
 
 # Offense count: 5
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented, indented_relative_to_receiver
 Layout/MultilineMethodCallIndentation:
   Exclude:
@@ -101,7 +101,7 @@ Layout/MultilineMethodCallIndentation:
 
 # Offense count: 882
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented
 Layout/MultilineOperationIndentation:
   Exclude:
@@ -112,6 +112,12 @@ Layout/MultilineOperationIndentation:
     - 'spec/fixtures/spotlight_pub_date_data.rb'
     - 'spec/origin_info_spec.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/SpaceAfterComma:
+  Exclude:
+    - 'spec/imprint_spec.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment.
@@ -121,7 +127,7 @@ Layout/SpaceAroundOperators:
 
 # Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideBlockBraces:
@@ -130,31 +136,27 @@ Layout/SpaceInsideBlockBraces:
 
 # Offense count: 11
 # Cop supports --auto-correct.
+# Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
   Exclude:
     - 'lib/stanford-mods/searchworks.rb'
     - 'spec/searchworks_spec.rb'
 
-# Offense count: 4
-Lint/RescueWithoutErrorClass:
-  Exclude:
-    - 'lib/stanford-mods/imprint.rb'
-
-# Offense count: 32
+# Offense count: 33
 Metrics/AbcSize:
-  Max: 51
+  Max: 56
 
-# Offense count: 101
+# Offense count: 102
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 791
+  Max: 795
 
 # Offense count: 5
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 344
+  Max: 377
 
-# Offense count: 19
+# Offense count: 20
 Metrics/CyclomaticComplexity:
   Max: 26
 
@@ -164,25 +166,18 @@ Metrics/CyclomaticComplexity:
 Metrics/LineLength:
   Max: 199
 
-# Offense count: 31
+# Offense count: 32
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 52
 
-# Offense count: 15
+# Offense count: 16
 Metrics/PerceivedComplexity:
   Max: 20
 
-# Offense count: 1
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
-# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
-Naming/FileName:
-  Exclude:
-    - 'lib/stanford-mods.rb'
-
 # Offense count: 24
 # Configuration parameters: Blacklist.
-# Blacklist: END, (?-mix:EO[A-Z]{1})
+# Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'spec/geo_spatial_spec.rb'
@@ -192,7 +187,7 @@ Naming/HeredocDelimiterNaming:
     - 'spec/searchworks_basic_spec.rb'
 
 # Offense count: 3
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: snake_case, camelCase
 Naming/MethodName:
   Exclude:
@@ -210,8 +205,15 @@ Naming/PredicateName:
     - 'spec/**/*'
     - 'lib/stanford-mods/origin_info.rb'
 
+# Offense count: 2
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: io, id, to, by, on, in, at
+Naming/UncommunicativeMethodParamName:
+  Exclude:
+    - 'lib/stanford-mods/imprint.rb'
+
 # Offense count: 8
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: snake_case, camelCase
 Naming/VariableName:
   Exclude:
@@ -219,12 +221,11 @@ Naming/VariableName:
     - 'lib/stanford-mods/origin_info.rb'
     - 'lib/stanford-mods/searchworks.rb'
 
-# Offense count: 11
+# Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect.
-Performance/HashEachMethods:
+Performance/UnneededSort:
   Exclude:
-    - 'spec/date_parsing_spec.rb'
+    - 'lib/stanford-mods/origin_info.rb'
 
 # Offense count: 3
 RSpec/AnyInstance:
@@ -323,7 +324,7 @@ RSpec/FilePath:
     - 'spec/lib/stanford-mods/coordinate_spec.rb'
 
 # Offense count: 2
-# Configuration parameters: SupportedStyles.
+# Configuration parameters: .
 # SupportedStyles: implicit, each, example
 RSpec/HookArgument:
   EnforcedStyle: each
@@ -346,7 +347,7 @@ RSpec/LetBeforeExamples:
     - 'spec/origin_info_spec.rb'
 
 # Offense count: 25
-# Configuration parameters: SupportedStyles.
+# Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
   EnforcedStyle: receive
@@ -357,6 +358,7 @@ RSpec/MultipleDescribes:
     - 'spec/geo_spatial_spec.rb'
 
 # Offense count: 114
+# Configuration parameters: AggregateFailuresByDefault.
 RSpec/MultipleExpectations:
   Max: 9
 
@@ -366,15 +368,8 @@ RSpec/NamedSubject:
     - 'spec/lib/stanford-mods/coordinate_spec.rb'
 
 # Offense count: 38
-# Configuration parameters: Max.
 RSpec/NestedGroups:
-  Exclude:
-    - 'spec/origin_info_spec.rb'
-    - 'spec/physical_location_spec.rb'
-    - 'spec/searchworks_format_spec.rb'
-    - 'spec/searchworks_subject_raw_spec.rb'
-    - 'spec/searchworks_subject_spec.rb'
-    - 'spec/searchworks_title_spec.rb'
+  Max: 5
 
 # Offense count: 7
 RSpec/RepeatedExample:
@@ -393,7 +388,7 @@ RSpec/VoidExpect:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: prefer_alias, prefer_alias_method
 Style/Alias:
   Exclude:
@@ -401,7 +396,7 @@ Style/Alias:
 
 # Offense count: 30
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining
 # ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
 # FunctionalMethods: let, let!, subject, watch
@@ -434,7 +429,7 @@ Style/CommentedKeyword:
 
 # Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly, IncludeTernaryExpressions.
+# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
 # SupportedStyles: assign_to_condition, assign_inside_condition
 Style/ConditionalAssignment:
   Exclude:
@@ -468,6 +463,12 @@ Style/EmptyCaseCondition:
 Style/Encoding:
   Enabled: false
 
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ExpandPathArguments:
+  Exclude:
+    - 'stanford-mods.gemspec'
+
 # Offense count: 3
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
@@ -479,6 +480,13 @@ Style/IdenticalConditionalBranches:
   Exclude:
     - 'lib/stanford-mods/searchworks.rb'
 
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/stanford-mods/date_parsing.rb'
+    - 'lib/stanford-mods/imprint.rb'
+
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: InverseMethods, InverseBlocks.
@@ -503,7 +511,7 @@ Style/MultilineTernaryOperator:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedOctalStyle, SupportedOctalStyles.
+# Configuration parameters: EnforcedOctalStyle.
 # SupportedOctalStyles: zero_with_o, zero_only
 Style/NumericLiteralPrefix:
   Exclude:
@@ -517,7 +525,7 @@ Style/PerlBackrefs:
 
 # Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: short, verbose
 Style/PreferredHashMethods:
   Exclude:
@@ -525,7 +533,7 @@ Style/PreferredHashMethods:
 
 # Offense count: 6
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
   Exclude:
@@ -539,9 +547,17 @@ Style/RescueModifier:
   Exclude:
     - 'lib/stanford-mods/origin_info.rb'
 
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: implicit, explicit
+Style/RescueStandardError:
+  Exclude:
+    - 'lib/stanford-mods/imprint.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: only_raise, only_fail, semantic
 Style/SignalException:
   Exclude:
@@ -549,7 +565,7 @@ Style/SignalException:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles.
+# Configuration parameters: .
 # SupportedStyles: use_perl_names, use_english_names
 Style/SpecialGlobalVars:
   EnforcedStyle: use_perl_names
@@ -562,7 +578,7 @@ Style/StderrPuts:
 
 # Offense count: 13
 # Cop supports --auto-correct.
-# Configuration parameters: MinSize, SupportedStyles.
+# Configuration parameters: MinSize.
 # SupportedStyles: percent, brackets
 Style/SymbolArray:
   EnforcedStyle: brackets
@@ -576,16 +592,23 @@ Style/SymbolProc:
     - 'lib/stanford-mods/searchworks.rb'
     - 'lib/stanford-mods/searchworks_subjects.rb'
 
+# Offense count: 5
+# Cop supports --auto-correct.
+Style/UnneededCondition:
+  Exclude:
+    - 'lib/stanford-mods/origin_info.rb'
+    - 'lib/stanford-mods/searchworks.rb'
+
 # Offense count: 125
 # Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, MinSize, WordRegex.
+# Configuration parameters: MinSize, WordRegex.
 # SupportedStyles: percent, brackets
 Style/WordArray:
   EnforcedStyle: brackets
 
 # Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: all_comparison_operators, equality_operators_only
 Style/YodaCondition:
   Exclude:

data/.travis.yml

@@ -1,16 +1,12 @@
 language: ruby
 script: rake
 rvm:
+  - 2.4.4
   - 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
+  - jruby-9.2.0.0
 matrix:
   allow_failures:
-    - rvm: jruby-head
-    - rvm: ruby-head
+    - rvm: jruby-9.2.0.0
 notifications: false
 sudo: false

data/lib/stanford-mods/searchworks.rb

@@ -139,24 +139,24 @@ 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
-      
+
       # @return [String] value for title_245_search, title_full_display
       def sw_full_title
-        
-        return nil unless first_title_info_node        
+
+        return nil unless first_title_info_node
         preSubTitle = nonSort_title ? [nonSort_title, title].compact.join(" ") : title
         preSubTitle.sub!(/:$/, '') if preSubTitle # remove trailing colon
 
@@ -227,67 +227,13 @@ 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',
@@ -303,13 +249,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 +268,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 +276,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 +291,22 @@ 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
 

data/lib/stanford-mods/searchworks_subjects.rb

@@ -55,12 +55,11 @@ module Stanford
       end
 
       # Values are the contents of:
-      #   mods/genre
       #   mods/subject/topic
       # @return [Array<String>] values for the topic_search Solr field for this document or nil if none
       def topic_search
         @topic_search ||= begin
-          vals = term_values(:genre) || []
+          vals = []
           vals.concat(subject_topics) if subject_topics
           vals.empty? ? nil : vals
         end

data/lib/stanford-mods/version.rb

@@ -1,6 +1,6 @@
 module Stanford
   module Mods
     # this is the Ruby Gem version
-    VERSION = "2.5.1".freeze
+    VERSION = "2.6.0".freeze
   end
 end

data/spec/imprint_spec.rb

@@ -18,7 +18,8 @@ describe Stanford::Mods::Imprint do
         '<dateCreated keyDate="yes">1964</dateCreated><dateIssued>195u</dateIssued>' => [1964],
         '<dateIssued>1964</dateIssued><dateCreated>195u</dateCreated>' => [1964],
         '<dateIssued point="start">195u</dateIssued><dateIssued point="end">1964</dateIssued>' => (1950..1964).to_a,
-        '<dateIssued>1964</dateIssued><dateIssued>195u</dateIssued>' => [1964] + (1950..1959).to_a
+        '<dateIssued>1964</dateIssued><dateIssued>195u</dateIssued>' => [1964] + (1950..1959).to_a,
+        '<dateCreated keyDate="yes" encoding="w3cdtf" point="start">1966</dateCreated><dateCreated encoding="w3cdtf" point="end">1967</dateCreated>' => [1966,1967]
       }.each do |example, expected|
         it 'works' do
           smods_rec.from_str("#{mods_origin_info_start_str}

data/spec/searchworks_format_spec.rb

@@ -5,269 +5,6 @@ describe "Format fields (searchworks.rb)" do
     @ns_decl = "xmlns='#{Mods::MODS_NS}'"
   end
 
-  # @deprecated:  this is no longer used in SW, Revs or Spotlight Jan 2016
-  context "format" do
-    context "Book:" do
-      context "typeOfResource text," do
-        it 'originInfo/issuance monographic' do
-          m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><originInfo><issuance>monographic</issuance></originInfo></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-        end
-        context "genre" do
-          it "'book chapter'", email: 'mods-squad 2014-05-22, Joanna Dyla' do
-            m = "<mods #{@ns_decl}><genre>book chapter</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-            m = "<mods #{@ns_decl}><genre>Book chapter</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-            m = "<mods #{@ns_decl}><genre>Book Chapter</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-          end
-          it "'issue brief'", email: 'mods-squad 2014-05-22, Joanna Dyla' do
-            m = "<mods #{@ns_decl}><genre>issue brief</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-            m = "<mods #{@ns_decl}><genre>Issue brief</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-            m = "<mods #{@ns_decl}><genre>Issue Brief</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-          end
-          it "'librettos'", jira: 'INDEX-98' do
-            m = "<mods #{@ns_decl}><genre>librettos</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-            m = "<mods #{@ns_decl}><genre>Librettos</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-          end
-          it "'libretto' isn't valid", jira: 'INDEX-98' do
-            m = "<mods #{@ns_decl}><genre>libretto</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq []
-          end
-          it "'project report'", jira: 'GRYP-170', github: 'gdor-indexer/#7' do
-            m = "<mods #{@ns_decl}><genre>project report</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-            m = "<mods #{@ns_decl}><genre>Project report</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-            m = "<mods #{@ns_decl}><genre>Project Report</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-          end
-          it "'report' isn't valid", jira: 'GRYP-170', github: 'gdor-indexer/#7' do
-            m = "<mods #{@ns_decl}><genre>report</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq []
-          end
-          it "'technical report'", jira: 'GRYPHONDOR-207' do
-            m = "<mods #{@ns_decl}><genre>technical report</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-            m = "<mods #{@ns_decl}><genre>Technical report</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-            m = "<mods #{@ns_decl}><genre>Technical Report</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-          end
-          it "'working paper'", email: 'mods-squad 2014-05-22, Joanna Dyla' do
-            m = "<mods #{@ns_decl}><genre>working paper</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-            m = "<mods #{@ns_decl}><genre>Working paper</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-            m = "<mods #{@ns_decl}><genre>Working Paper</genre><typeOfResource>text</typeOfResource></mods>"
-            @smods_rec.from_str(m)
-            expect(@smods_rec.format).to eq ['Book']
-          end
-        end
-      end
-    end # 'Book'
-
-    context "Computer File: typeOfResource 'software, multimedia'" do
-      it "no genre (e.g. Dataset)" do
-        m = "<mods #{@ns_decl}><typeOfResource>software, multimedia</typeOfResource></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Computer File']
-      end
-      it "genre 'game'", jira: 'GRYPHONDOR-207' do
-        m = "<mods #{@ns_decl}><genre>game</genre><typeOfResource>software, multimedia</typeOfResource></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Computer File']
-        m = "<mods #{@ns_decl}><genre>Game</genre><typeOfResource>software, multimedia</typeOfResource></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Computer File']
-      end
-    end
-
-    it "Conference Proceedings: typeOfResource 'text', genre 'conference publication'", jira: 'GRYPHONDOR-207' do
-      m = "<mods #{@ns_decl}><genre>conference publication</genre><typeOfResource>text</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Conference Proceedings']
-      m = "<mods #{@ns_decl}><genre>Conference publication</genre><typeOfResource>text</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Conference Proceedings']
-      m = "<mods #{@ns_decl}><genre>Conference Publication</genre><typeOfResource>text</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Conference Proceedings']
-    end
-
-    context "Journal/Periodical: typeOfResource 'text'," do
-      it "genre 'article" do
-        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>article</genre></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Journal/Periodical']
-        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>Article</genre></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Journal/Periodical']
-      end
-      it "originInfo/issuance 'continuing'" do
-        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><originInfo><issuance>continuing</issuance></originInfo></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Journal/Periodical']
-      end
-    end
-
-    it "Image: typeOfResource 'still image'" do
-      m = "<mods #{@ns_decl}><typeOfResource>still image</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Image']
-    end
-
-    it "Manuscript/Archive: typeOfResource 'mixed material'" do
-      m = "<mods #{@ns_decl}><typeOfResource>mixed material</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Manuscript/Archive']
-    end
-
-    it "Map/Globe: typeOfResource 'cartographic'" do
-      m = "<mods #{@ns_decl}><typeOfResource>cartographic</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Map/Globe']
-    end
-
-    it "Music - Recording: typeOfResource 'sound recording-musical'", jira: 'GRYPHONDOR-207' do
-      m = "<mods #{@ns_decl}><typeOfResource>sound recording-musical</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Music - Recording']
-    end
-
-    it "Music - Score: typeOfResource 'notated music'" do
-      m = "<mods #{@ns_decl}><typeOfResource>notated music</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Music - Score']
-    end
-
-    it "Other: typeOfResource 'text', genre 'student project report'", email: 'from Vitus, August 16, 2013' do
-      m = "<mods #{@ns_decl}><genre>student project report</genre><typeOfResource>text</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Other']
-      m = "<mods #{@ns_decl}><genre>Student project report</genre><typeOfResource>text</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Other']
-      m = "<mods #{@ns_decl}><genre>Student Project report</genre><typeOfResource>text</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Other']
-      m = "<mods #{@ns_decl}><genre>Student Project Report</genre><typeOfResource>text</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Other']
-    end
-
-    context "Sound Recording:" do
-      it "typeOfResource 'sound recording-nonmusical', genre 'sound", jira: 'GRYPHONDOR-207' do
-        m = "<mods #{@ns_decl}><genre>sound</genre><typeOfResource>sound recording-nonmusical</typeOfResource></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Sound Recording']
-        m = "<mods #{@ns_decl}><genre>Sound</genre><typeOfResource>sound recording-nonmusical</typeOfResource></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Sound Recording']
-      end
-      it "typeOfResource 'sound recording', genre 'sound", jira: 'INDEX-94' do
-        m = "<mods #{@ns_decl}><genre>sound</genre><typeOfResource>sound recording</typeOfResource></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Sound Recording']
-        m = "<mods #{@ns_decl}><genre>Sound</genre><typeOfResource>sound recording</typeOfResource></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Sound Recording']
-      end
-    end
-
-    it "Thesis: typeOfResource 'text', genre 'thesis'" do
-      m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>thesis</genre></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Thesis']
-      m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>Thesis</genre></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Thesis']
-    end
-
-    context "Video: typeOfResource 'moving image'" do
-      it "no genre" do
-        m = "<mods #{@ns_decl}><typeOfResource>moving image</typeOfResource></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Video']
-      end
-      it "genre 'motion picture'", jira: 'GRYPHONDOR-207' do
-        m = "<mods #{@ns_decl}><genre>motion picture</genre><typeOfResource>moving image</typeOfResource></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Video']
-        m = "<mods #{@ns_decl}><genre>Motion Picture</genre><typeOfResource>moving image</typeOfResource></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Video']
-        m = "<mods #{@ns_decl}><genre>Motion Picture</genre><typeOfResource>moving image</typeOfResource></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Video']
-      end
-    end
-
-    context "multiple format values", jira: 'INDEX-32' do
-      it "multiple typeOfResource elements" do
-        m = "<mods #{@ns_decl}><typeOfResource>moving image</typeOfResource><typeOfResource>sound recording</typeOfResource></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Video', 'Sound Recording']
-      end
-      it "multiple genre elements, single typeOfResource" do
-        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>librettos</genre><genre>article</genre></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Book', 'Journal/Periodical']
-      end
-      it "mish mash" do
-        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><typeOfResource>still image</typeOfResource><genre>librettos</genre><genre>article</genre></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Book', 'Journal/Periodical', 'Image']
-      end
-      it "doesn't give duplicate values" do
-        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>librettos</genre><genre>issue brief</genre></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Book']
-      end
-    end
-
-    it "empty Array if no typeOfResource field" do
-      m = "<mods #{@ns_decl}><originInfo>
-      <dateCreated>1904</dateCreated>
-      </originInfo></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq []
-    end
-
-    it "empty Array if weird typeOfResource value" do
-      m = "<mods #{@ns_decl}>
-      <typeOfResource>foo</typeOfResource>
-      </mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq []
-    end
-  end # format
-
   context "format_main" do
     it "3D object: typeOfResource 'three dimensional object'" do
       m = "<mods #{@ns_decl}><typeOfResource>three dimensional object</typeOfResource></mods>"
@@ -329,10 +66,10 @@ describe "Format fields (searchworks.rb)" do
         @smods_rec.from_str(m)
         expect(@smods_rec.format_main).to eq ['Book']
       end
-      it "'report' isn't valid", jira: 'GRYP-170', github: 'gdor-indexer/#7' do
+      it "'report' isn't valid, so defaults to book", jira: 'GRYP-170', github: 'gdor-indexer/#7' do
         m = "<mods #{@ns_decl}><genre>report</genre><typeOfResource>text</typeOfResource></mods>"
         @smods_rec.from_str(m)
-        expect(@smods_rec.format_main).to eq []
+        expect(@smods_rec.format_main).to eq ['Book']
       end
       it "'student project report'", consul: '/NGDE/Format 2014-05-28' do
         m = "<mods #{@ns_decl}><genre authority=\"local\">student project report</genre><typeOfResource>text</typeOfResource></mods>"
@@ -400,10 +137,10 @@ describe "Format fields (searchworks.rb)" do
             @smods_rec.from_str(m)
             expect(@smods_rec.format_main).to eq ['Book']
           end
-          it "'libretto' isn't valid", jira: 'INDEX-98' do
+          it "'libretto' isn't valid, so it defaults to book", jira: 'INDEX-98' do
             m = "<mods #{@ns_decl}><genre>libretto</genre><typeOfResource>text</typeOfResource></mods>"
             @smods_rec.from_str(m)
-            expect(@smods_rec.format_main).to eq []
+            expect(@smods_rec.format_main).to eq ['Book']
           end
           it "'librettos'", jira: 'INDEX-98' do
             m = "<mods #{@ns_decl}><genre>librettos</genre><typeOfResource>text</typeOfResource></mods>"
@@ -578,57 +315,57 @@ describe "Format fields (searchworks.rb)" do
   end # format_main
 
   context "sw_genre" do
-    it "ignores values that are not in the prescribed list" do
+    it "includes values that are not in the prescribed list" do
       m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Not on the list</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq []
+      expect(@smods_rec.sw_genre).to eq ['Not on the list']
     end
     it "Conference proceedings: typeOfResource 'text', genre 'conference publication'" do
       m = "<mods #{@ns_decl}><genre authority=\"marcgt\">conference publication</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Conference proceedings']
+      expect(@smods_rec.sw_genre).to eq ['conference publication', 'Conference proceedings']
       m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Conference publication</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Conference proceedings']
+      expect(@smods_rec.sw_genre).to eq ['Conference publication', 'Conference proceedings']
       m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Conference Publication</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Conference proceedings']
+      expect(@smods_rec.sw_genre).to eq ['Conference Publication', 'Conference proceedings']
     end
     it "Thesis/Dissertation: typeOfResource 'text', genre 'thesis'" do
       m = "<mods #{@ns_decl}><genre authority=\"marcgt\">thesis</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Thesis/Dissertation']
+      expect(@smods_rec.sw_genre).to eq ['thesis', 'Thesis/Dissertation']
       m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Thesis</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Thesis/Dissertation']
+      expect(@smods_rec.sw_genre).to eq ['Thesis', 'Thesis/Dissertation']
     end
     it "Government Document: typeOfResource 'text', genre 'government publication'" do
       m = "<mods #{@ns_decl}><genre authority=\"marcgt\">government publication</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Government document']
+      expect(@smods_rec.sw_genre).to eq ['government publication', 'Government document']
       m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Government publication</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Government document']
+      expect(@smods_rec.sw_genre).to eq ['Government publication', 'Government document']
       m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Government Publication</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Government document']
+      expect(@smods_rec.sw_genre).to eq ['Government Publication', 'Government document']
       m = "<mods #{@ns_decl}><genre>government publication</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Government document']
+      expect(@smods_rec.sw_genre).to eq ['government publication', 'Government document']
     end
     it "Technical Report: typeOfResource 'text', genre 'technical report'" do
       m = "<mods #{@ns_decl}><genre authority=\"marcgt\">technical report</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Technical report']
+      expect(@smods_rec.sw_genre).to eq ['technical report', 'Technical report']
       m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Technical report</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
       expect(@smods_rec.sw_genre).to eq ['Technical report']
       m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Technical Report</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Technical report']
+      expect(@smods_rec.sw_genre).to eq ['Technical Report', 'Technical report']
       m = "<mods #{@ns_decl}><genre>technical report</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Technical report']
+      expect(@smods_rec.sw_genre).to eq ['technical report', 'Technical report']
     end
     it "it does not include Archived website: typeOfResource 'text', genre 'archived website'" do
       m = "<mods #{@ns_decl}><genre authority=\"marcgt\">archived website</genre><typeOfResource>text</typeOfResource></mods>"
@@ -638,13 +375,13 @@ describe "Format fields (searchworks.rb)" do
     it "capitalizes the first letter of a genre value" do
       m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre authority=\"marcgt\">technical report</genre></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Technical report']
+      expect(@smods_rec.sw_genre).to eq ['technical report', 'Technical report']
       m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre authority=\"marcgt\">Technical report</genre></mods>"
       @smods_rec.from_str(m)
       expect(@smods_rec.sw_genre).to eq ['Technical report']
       m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre authority=\"marcgt\">Technical Report</genre></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Technical report']
+      expect(@smods_rec.sw_genre).to eq ['Technical Report', 'Technical report']
     end
     # NOTE: may need to remove plurals and/or trailing punctuation in future
     it "returns all genre values" do
@@ -655,7 +392,7 @@ describe "Format fields (searchworks.rb)" do
             <genre>thesis</genre>
           </mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Thesis/Dissertation', 'Conference proceedings', 'Government document']
+      expect(@smods_rec.sw_genre).to eq ['government publication', 'conference publication', 'thesis', 'Thesis/Dissertation', 'Conference proceedings', 'Government document']
     end
     it "doesn't have duplicates" do
       m = "<mods #{@ns_decl}>
@@ -665,7 +402,7 @@ describe "Format fields (searchworks.rb)" do
             <genre>Conference publication</genre>
           </mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Conference proceedings', 'Technical report']
+      expect(@smods_rec.sw_genre).to eq ['conference publication', 'technical report', 'Conference publication', 'Conference proceedings', 'Technical report']
     end
     it "empty Array if no genre values" do
       m = "<mods #{@ns_decl}>

data/spec/searchworks_subject_spec.rb

@@ -44,9 +44,6 @@ describe "Subject fields (searchworks.rb)" do
       it "should contain subject <topic> subelement data" do
         expect(@smods_rec.topic_search).to include(@topic)
       end
-      it "should contain top level <genre> element data" do
-        expect(@smods_rec.topic_search).to include(@genre)
-      end
       it "should not contain other subject element data" do
         expect(@smods_rec.topic_search).not_to include(@cart_coord)
         expect(@smods_rec.topic_search).not_to include(@s_genre)
@@ -64,12 +61,6 @@ describe "Subject fields (searchworks.rb)" do
         @smods_rec.from_str(m)
         expect(@smods_rec.topic_search).to eq([@topic])
       end
-      it "should not be nil if there are only <genre> elements (no subject/topic elements)" do
-        m = "<mods #{@ns_decl}><genre>#{@genre}</genre></mods>"
-        @smods_rec = Stanford::Mods::Record.new
-        @smods_rec.from_str(m)
-        expect(@smods_rec.topic_search).to eq([@genre])
-      end
       context "topic subelement" do
         it "should have a separate value for each topic element" do
           m = "<mods #{@ns_decl}>
@@ -280,9 +271,6 @@ describe "Subject fields (searchworks.rb)" do
         @smods_rec.from_str(@ng_mods_no_subject.to_s)
         expect(@smods_rec.subject_all_search).to be_nil
       end
-      it "should contain top level <genre> element data" do
-        expect(@smods_rec.subject_all_search).to include(@genre)
-      end
       it "should not contain cartographic sub element" do
         expect(@smods_rec.subject_all_search).not_to include(@cart_coord)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mods