update to hyrax 2.2 (samvera#1543)

* update to hyrax 2.2

Gemfile

@@ -81,7 +81,7 @@ end
 gem 'blacklight', '~> 6.7'
 gem 'blacklight_oai_provider', '~> 6.0'
 
-gem 'hyrax', '2.1.0'
+gem 'hyrax', '2.2.0'
 gem 'rsolr', '~> 2.0'
 
 gem 'devise'

Gemfile.lock

@@ -54,7 +54,7 @@ GEM
       activemodel (= 5.1.6)
       activesupport (= 5.1.6)
       arel (~> 8.0)
-    activerecord-import (0.24.0)
+    activerecord-import (0.25.0)
       activerecord (>= 3.2)
     activesupport (5.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -106,7 +106,7 @@ GEM
       blacklight (~> 6.0)
       cancancan (~> 1.8)
       deprecation (~> 1.0)
-    blacklight-gallery (0.10.0)
+    blacklight-gallery (0.11.0)
       blacklight (~> 6.3)
       bootstrap-sass (~> 3.0)
       openseadragon (>= 0.2.0)
@@ -218,7 +218,7 @@ GEM
       dry-container (~> 0.2, >= 0.2.6)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-struct (0.5.0)
+    dry-struct (0.5.1)
       dry-core (~> 0.4, >= 0.4.3)
       dry-equalizer (~> 0.2)
       dry-types (~> 0.13)
@@ -276,7 +276,7 @@ GEM
       raabro (~> 1.1)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    google-api-client (0.23.0)
+    google-api-client (0.23.4)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
@@ -287,13 +287,12 @@ GEM
       google-api-client (>= 0.11.0, < 1.0.0)
       googleauth (>= 0.5.0, < 1.0.0)
       nokogiri (>= 1.5.3, < 2.0.0)
-    googleauth (0.6.2)
+    googleauth (0.6.5)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
-      logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
-      os (~> 0.9)
+      os (>= 0.9, < 2.0)
       signet (~> 0.7)
     haml (5.0.4)
       temple (>= 0.8.0)
@@ -352,14 +351,14 @@ GEM
       hydra-file_characterization (~> 0.3, >= 0.3.3)
       hydra-pcdm (>= 0.9)
       om (~> 3.1)
-    hyrax (2.1.0)
+    hyrax (2.2.0)
       active-fedora (~> 11.5, >= 11.5.2)
       almond-rails (~> 0.1)
       awesome_nested_set (~> 3.1)
       blacklight (~> 6.14)
       blacklight-gallery (~> 0.7)
       breadcrumbs_on_rails (~> 3.0)
-      browse-everything (>= 0.10.5)
+      browse-everything (< 0.16)
       carrierwave (~> 1.0)
       clipboard-rails (~> 1.5)
       dry-equalizer (~> 0.2)
@@ -511,10 +510,6 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
     lograge (0.5.1)
       actionpack (>= 4, < 5.2)
       activesupport (>= 4, < 5.2)
@@ -578,7 +573,7 @@ GEM
     openseadragon (0.5.0)
       rails (> 3.2.0)
     orm_adapter (0.5.0)
-    os (0.9.6)
+    os (1.0.0)
     parallel (1.12.1)
     parser (2.4.0.2)
       ast (~> 2.3)
@@ -784,10 +779,14 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.3, >= 3.3.3)
+<<<<<<< HEAD
     sidekiq-cron (1.0.4)
       fugit (~> 1.1)
       sidekiq (>= 4.2.1)
     signet (0.8.1)
+=======
+    signet (0.9.0)
+>>>>>>> update to hyrax 2.2 (#1543)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
@@ -856,7 +855,7 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.8)
     tins (1.14.0)
-    tinymce-rails (4.7.13)
+    tinymce-rails (4.8.2)
       railties (>= 3.1.1)
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
@@ -919,7 +918,7 @@ DEPENDENCIES
   fcrepo_wrapper (~> 0.4)
   flipflop (~> 2.3)
   httparty (~> 0.16.3)
-  hyrax (= 2.0.2)
+
   i18n-debug
   i18n-tasks
   iiif_manifest (~> 0.3.0)

lib/importer/factory/object_factory.rb

@@ -34,7 +34,11 @@ def update
       end
 
       def create_attributes
-        { collection_type: collection_type }.merge(transform_attributes)
+        if klass == Collection
+          { collection_type: collection_type }.merge(transform_attributes)
+        else
+          transform_attributes
+        end
       end
 
       def update_attributes