IUS-2613 DataCore hyrax services unit tests

app/services/hyrax/affiliationumcampus_service.rb

@@ -1,15 +1,8 @@
 module Hyrax
-  class AffiliationumcampusService < QaSelectService
+  class AffiliationumcampusService < RenderCurrentValueService
     def initialize
       super('contributor_affiliationumcampus')
     end
 
-    def include_current_value(value, _index, render_options, html_options)
-      unless value.blank? || active?(value)
-        html_options[:class] << ' force-select'
-        render_options += [[label(value), value]]
-      end
-      [render_options, html_options]
-    end
   end
-end
+end

app/services/hyrax/degree_service.rb

@@ -1,15 +1,8 @@
 module Hyrax
-  class DegreeService < QaSelectService
+  class DegreeService < RenderCurrentValueService
     def initialize
       super('description_thesisdegreename')
     end
 
-    def include_current_value(value, _index, render_options, html_options)
-      unless value.blank? || active?(value)
-        html_options[:class] << ' force-select'
-        render_options += [[label(value), value]]
-      end
-      [render_options, html_options]
-    end
   end
-end
+end

app/services/hyrax/fundedby_service.rb

@@ -2,20 +2,12 @@
 
 module Hyrax
 
-  class FundedbyService < QaSelectService
+  class FundedbyService < RenderPresentValueService
 
     def initialize
       super('fundedbys' )
     end
 
-    def include_current_value( value, _index, render_options, html_options )
-      # unless value.blank? || active?(value)
-      if value.present?
-        html_options[:class] << ' force-select'
-        render_options += [[label(value), value]]
-      end
-      [render_options, html_options]
-    end
 
   end
 

app/services/hyrax/gentype_service.rb

@@ -1,15 +1,8 @@
 module Hyrax
-  class GentypeService < QaSelectService
+  class GentypeService < RenderCurrentValueService
     def initialize
       super('type_none')
     end
 
-    def include_current_value(value, _index, render_options, html_options)
-      unless value.blank? || active?(value)
-        html_options[:class] << ' force-select'
-        render_options += [[label(value), value]]
-      end
-      [render_options, html_options]
-    end
   end
 end

app/services/hyrax/language_service.rb

@@ -1,15 +1,8 @@
 module Hyrax
-  class LanguageService < QaSelectService
+  class LanguageService < RenderCurrentValueService
     def initialize
       super('language_none')
     end
 
-    def include_current_value(value, _index, render_options, html_options)
-      unless value.blank? || active?(value)
-        html_options[:class] << ' force-select'
-        render_options += [[label(value), value]]
-      end
-      [render_options, html_options]
-    end
   end
 end

app/services/hyrax/peerreviewed_service.rb

@@ -1,15 +1,8 @@
 module Hyrax
-  class PeerreviewedService < QaSelectService
+  class PeerreviewedService < RenderCurrentValueService
     def initialize
       super('peerreviewed')
     end
 
-    def include_current_value(value, _index, render_options, html_options)
-      unless value.blank? || active?(value)
-        html_options[:class] << ' force-select'
-        render_options += [[label(value), value]]
-      end
-      [render_options, html_options]
-    end
   end
-end
+end

app/services/hyrax/render_current_value_service.rb

@@ -0,0 +1,17 @@
+module Hyrax
+  class RenderCurrentValueService < QaSelectService
+
+    def initialize(service_name)
+      super(service_name)
+    end
+
+    def include_current_value(value, _index, render_options, html_options)
+      unless value.blank? || active?(value)
+        html_options[:class] << ' force-select'
+        render_options += [[label(value), value]]
+      end
+      [render_options, html_options]
+    end
+  end
+
+end

app/services/hyrax/render_present_value_service.rb

@@ -0,0 +1,18 @@
+module Hyrax
+  class RenderPresentValueService < QaSelectService
+
+    def initialize(service_name)
+      super(service_name)
+    end
+
+    def include_current_value( value, _index, render_options, html_options )
+      # unless value.blank? || active?(value)
+      if value.present?
+        html_options[:class] << ' force-select'
+        render_options += [[label(value), value]]
+      end
+      [render_options, html_options]
+    end
+  end
+
+end

app/services/hyrax/rights_license_service.rb

@@ -1,18 +1,11 @@
 module Hyrax
 
-  class RightsLicenseService < QaSelectService
+  class RightsLicenseService < RenderCurrentValueService
 
     def initialize
       super('rights_licenses' )
     end
 
-    def include_current_value( value, _index, render_options, html_options )
-      unless value.blank? || active?(value)
-        html_options[:class] << ' force-select'
-        render_options += [[label(value), value]]
-      end
-      [render_options, html_options]
-    end
 
   end
 

app/services/hyrax/snre_service.rb

@@ -1,15 +1,8 @@
 module Hyrax
-  class SnreService < QaSelectService
+  class SnreService < RenderCurrentValueService
     def initialize
       super('type_snre')
     end
 
-    def include_current_value(value, _index, render_options, html_options)
-      unless value.blank? || active?(value)
-        html_options[:class] << ' force-select'
-        render_options += [[label(value), value]]
-      end
-      [render_options, html_options]
-    end
   end
-end
+end

app/services/hyrax/subject_discipline_service.rb

@@ -1,19 +1,11 @@
 module Hyrax
 
-  class SubjectDisciplineService < QaSelectService
+  class SubjectDisciplineService < RenderPresentValueService
 
     def initialize
       super('subject_disciplines' )
     end
 
-    def include_current_value( value, _index, render_options, html_options )
-      if value.present? # || active?(value)
-        html_options[:class] << ' force-select'
-        render_options += [[label(value), value]]
-      end
-      [render_options, html_options]
-    end
-
   end
 
 end