darlingtonia 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b417d442d5f092672b0843b6e4f724a6fed90c0913a8470976edb5b17c367b25
-  data.tar.gz: b6240dd8d7c293f128f8905bd2dcd1e664ef90d0b81b892ee3a3e30a3d67b9bc
+  metadata.gz: 6be5042f9ac88ade67585052eae9cc2dfa30855be0356bbee2f2895150c5d9a5
+  data.tar.gz: 0466ed8a2f5fd289c591ca230f987d294b3710cac3becc4a0a3194c6c73ea31f
 SHA512:
-  metadata.gz: 39cb14bd001b7359b69284a45fbe8642a0e4a797a67ecccd66bc3e1722576eb63994e8efa16cfad8257c6e1fdbcb94a5141d1224b6ac05b2a360ca897ed88a8f
-  data.tar.gz: 4b99fc45b3434de8fbf398a8397c689ce49617bb081f2047dc4f483cbcc8fdd2922f26d356b81c54debc4943c084ffd52d75805e6cf6570cd04db465c7a3d2cf
+  metadata.gz: 18b96a5efae6c3f30c5965c88cd35e974db44e1abd155ab01fb19cdd1b53719d24c6ed4e0e29b45c4744f7534bd18fe18a7c674d4e9d1bc2cb92f07e7a200233
+  data.tar.gz: 7a3a556e44d1ca0552b84f3db46abe19ec35260c2c6ddfbd0fe370341748e927e1345162bac1e5aba939a9b78343d8a4b1b85d0b2929991729d36ba07e0d6553

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+3.0.5 - Tue Feb 26, 2019
+
+When setting the depositor, query for user with `find_by_user_key`, which is the Hyrax convention. 
+If user_key isn't found, fall back to querying by User.id for backward compatibility.
+
 3.0.4 - Fri Feb 22, 2019
 
 * Allow subclassed libraries not to have a files field

data/lib/darlingtonia/hyrax_record_importer.rb

@@ -48,8 +48,9 @@ module Darlingtonia
     # "depositor" is a required field for Hyrax.  If
     # it hasn't been set, set it to the Hyrax default
     # batch user.
-    def set_depositor(user_id)
-      user = User.find(user_id) if user_id
+    def set_depositor(user_key)
+      user = ::User.find_by_user_key(user_key) if user_key
+      user ||= ::User.find(user_key) if user_key
       user ||= ::User.find_or_create_system_user(DEFAULT_CREATOR_KEY)
       self.depositor = user
     end

data/lib/darlingtonia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Darlingtonia
-  VERSION = '3.0.4'
+  VERSION = '3.0.5'
 end

data/spec/darlingtonia/hyrax_record_importer_spec.rb

@@ -128,7 +128,7 @@ describe Darlingtonia::HyraxRecordImporter, :clean do
     end
 
     context 'when depositor is passed to initializer' do
-      subject(:importer) { described_class.new(error_stream: error_stream, info_stream: info_stream, attributes: { depositor_id: user.id }) }
+      subject(:importer) { described_class.new(error_stream: error_stream, info_stream: info_stream, attributes: { depositor_id: user.user_key }) }
 
       let(:user) { ::User.new(id: '123', user_key: 'special_user@example.com') }
       before { allow(::User).to receive(:find).and_return(user) }

data/spec/support/shared_contexts/with_work_type.rb

@@ -19,6 +19,10 @@ shared_context 'with a work type' do
         self.user_key = inputs[:user_key] || batch_user_key
       end
 
+      def self.find_by_user_key(email)
+        User.new(user_key: email)
+      end
+
       def self.find_or_create_system_user(_email)
         User.new
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: darlingtonia
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Data Curation Experts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora