hyrax 2.2.0 → 2.2.1

data/config/locales/hyrax.zh.yml

@@ -418,6 +418,10 @@ zh:
         header: 关联
       relationships_parent_row:
         label: '属于 %{type}:'
+      share_with:
+        definition_heading: 许可定义
+        definitions_html: "<strong>查看/下载：</strong>可以从%{application_name}中访问此文件（内容和元数据）。 <br /> <strong>编辑：</strong>可以<strong>编辑</strong>此文件（包括内容和元数据）。您只能将此权限授予%{institution_name}用户和/或组。"
+        share_with_html: 您可以为特定用户和/或组授予对文件的“查看/下载”或“编辑”访问权限。输入有效的%{account_name}，一次选择一个，选择该用户的访问级别，然后单击+添加。
       show:
         last_modified: 最新修改
       social_media:
@@ -840,8 +844,39 @@ zh:
         header: 选择一个动作
         versions: 版本
         versions_title: 显示以前的版本
+      edit:
+        descriptions: 说明
+        header: 编辑%{file_set}
+        permissions: 权限
+        versions: 版本
+      form:
+        attach_to: 附加到%{parent}
+        cancel: 取消
+        save: 保存
+        title: 标题
       groups_description:
         description_html: 标有"选择一个群"的下拉框内是您所属的一组用户管理群的清单。您可以选择一个特定的群，指定对%{application_name}中文件的访问级别，类似于添加用户访问级别。
+      permission:
+        save: 保存
+      permission_form:
+        applied_to: "（适用于刚刚上传的所有文件）"
+        depositor: 储户
+        enter: 输入%{account_label}（一次一个）
+        header: 权限
+        optional: "（可选的）"
+        save_note_html: 在页面底部按“保存”按钮之前， <strong>不会</strong>保存权限。
+        select_group: 选择一个组
+        share_with: 与某人分享
+        table_title_access: 访问权限
+        table_title_user: 人/组
+        user_search: 搜索用户
+      versioning:
+        current: 当前版本
+        header: 版本
+        restore: 恢复以前的版本
+        restore_from: 还原自
+        save: 保存修订
+        upload: 上传新版本
     help:
       header: 用户支持
       override_text: 用 app/views/static/help.html.erb 取代此文件。

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.2.1'.freeze
 end

data/spec/controllers/hyrax/homepage_controller_spec.rb

@@ -52,7 +52,7 @@ RSpec.describe Hyrax::HomepageController, type: :controller do
       end
     end
 
-    context "with a document not created this second" do
+    context "with a document not created this second", clean_repo: true do
       before do
         gw3 = GenericWork.new(title: ['Test 3 Document'], read_groups: ['public'])
         gw3.apply_depositor_metadata('mjg36')
@@ -60,7 +60,8 @@ RSpec.describe Hyrax::HomepageController, type: :controller do
         old_to_solr = gw3.method(:to_solr)
         allow(gw3).to receive(:to_solr) do
           old_to_solr.call.merge(
-            Solrizer.solr_name('system_create', :stored_sortable, type: :date) => 1.day.ago.iso8601
+            Solrizer.solr_name('system_create', :stored_sortable, type: :date) => 1.day.ago.iso8601,
+            Solrizer.solr_name('date_uploaded', :stored_sortable, type: :date) => 1.day.ago.iso8601
           )
         end
         gw3.save

data/spec/factories/admin_sets.rb

@@ -19,7 +19,7 @@ FactoryBot.define do
 
     transient do
       # false, true, or Hash with keys for permission_template
-      with_permission_template false
+      with_permission_template { false }
     end
   end
 end

data/spec/factories/admin_sets_lw.rb

@@ -58,8 +58,8 @@ FactoryBot.define do
     transient do
       user { create(:user) }
 
-      with_permission_template false
-      with_solr_document false
+      with_permission_template { false }
+      with_solr_document { false }
     end
     sequence(:title) { |n| ["Collection Title #{n}"] }
 
@@ -87,10 +87,10 @@ FactoryBot.define do
             manage_groups: [::Ability.admin_group_name]
           }
         end
-        with_solr_document true
+        with_solr_document { true }
       end
-      id AdminSet::DEFAULT_ID
-      title AdminSet::DEFAULT_TITLE
+      id { AdminSet::DEFAULT_ID }
+      title { AdminSet::DEFAULT_TITLE }
     end
   end
 
@@ -99,8 +99,8 @@ FactoryBot.define do
     # Do not use with create because the save will cause the solr grants to be created.
     transient do
       user { create(:user) }
-      with_permission_template true
-      with_solr_document true
+      with_permission_template { true }
+      with_solr_document { true }
     end
 
     sequence(:title) { |n| ["No Solr Grant Admin Set Title #{n}"] }

data/spec/factories/api_items.rb

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :post_item, class: Hash do
     skip_create
 
-    token 'mock_token'
+    token { 'mock_token' }
 
     metadata do
       {

data/spec/factories/collection_branding_infos.rb

@@ -1,11 +1,11 @@
 FactoryBot.define do
   factory :collection_branding_info do
-    collection_id "1"
-    role "banner"
-    local_path "/fake/path/to/banner.png"
-    alt_text "This is the banner"
-    target_url "http://example.com/"
-    height ""
-    width ""
+    collection_id { "1" }
+    role { "banner" }
+    local_path { "/fake/path/to/banner.png" }
+    alt_text { "This is the banner" }
+    target_url { "http://example.com/" }
+    height { "" }
+    width { "" }
   end
 end

data/spec/factories/collection_type_participants.rb

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :collection_type_participant, class: Hyrax::CollectionTypeParticipant do
     association :hyrax_collection_type, factory: :collection_type
     sequence(:agent_id) { |n| "user#{n}@example.com" }
-    agent_type  'user'
-    access      Hyrax::CollectionTypeParticipant::MANAGE_ACCESS
+    agent_type  { 'user' }
+    access      { Hyrax::CollectionTypeParticipant::MANAGE_ACCESS }
   end
 end

data/spec/factories/collection_types.rb

@@ -3,22 +3,22 @@ FactoryBot.define do
     sequence(:title) { |n| "Collection Type #{n}" }
     sequence(:machine_id) { |n| "title_#{n}" }
 
-    description 'Collection type with all options'
-    nestable true
-    discoverable true
-    sharable true
-    brandable true
-    share_applies_to_new_works true
-    allow_multiple_membership true
-    require_membership false
-    assigns_workflow false
-    assigns_visibility false
+    description { 'Collection type with all options' }
+    nestable { true }
+    discoverable { true }
+    sharable { true }
+    brandable { true }
+    share_applies_to_new_works { true }
+    allow_multiple_membership { true }
+    require_membership { false }
+    assigns_workflow { false }
+    assigns_visibility { false }
 
     transient do
-      creator_user nil
-      creator_group nil
-      manager_user nil
-      manager_group nil
+      creator_user { nil }
+      creator_group { nil }
+      manager_user { nil }
+      manager_group { nil }
     end
 
     after(:create) do |collection_type, evaluator|
@@ -56,50 +56,50 @@ FactoryBot.define do
     end
 
     trait :nestable do
-      nestable true
+      nestable { true }
     end
 
     trait :not_nestable do
-      nestable false
+      nestable { false }
     end
 
     trait :discoverable do
-      discoverable true
+      discoverable { true }
     end
 
     trait :not_discoverable do
-      discoverable false
+      discoverable { false }
     end
 
     trait :brandable do
-      brandable true
+      brandable { true }
     end
 
     trait :not_brandable do
-      brandable false
+      brandable { false }
     end
 
     trait :sharable do
-      sharable true
-      share_applies_to_new_works true
+      sharable { true }
+      share_applies_to_new_works { true }
     end
 
     trait :sharable_no_work_permissions do
-      sharable true
-      share_applies_to_new_works false
+      sharable { true }
+      share_applies_to_new_works { false }
     end
 
     trait :not_sharable do
-      sharable false
-      share_applies_to_new_works false
+      sharable { false }
+      share_applies_to_new_works { false }
     end
 
     trait :allow_multiple_membership do
-      allow_multiple_membership true
+      allow_multiple_membership { true }
     end
 
     trait :not_allow_multiple_membership do
-      allow_multiple_membership false
+      allow_multiple_membership { false }
     end
   end
 

data/spec/factories/collections.rb

@@ -102,10 +102,10 @@ FactoryBot.define do
     transient do
       user { create(:user) }
 
-      collection_type_settings nil
-      with_permission_template false
-      with_nesting_attributes nil
-      with_solr_document false
+      collection_type_settings { nil }
+      with_permission_template { false }
+      with_nesting_attributes { nil }
+      with_solr_document { false }
     end
     sequence(:title) { |n| ["Collection Title #{n}"] }
 
@@ -130,32 +130,32 @@ FactoryBot.define do
     factory :public_collection_lw, traits: [:public_lw]
 
     factory :private_collection_lw do
-      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+      visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
     end
 
     factory :institution_collection_lw do
-      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+      visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
     end
 
     factory :named_collection_lw do
-      title ['collection title']
-      description ['collection description']
+      title { ['collection title'] }
+      description { ['collection description'] }
     end
 
     trait :public_lw do
-      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+      visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
     end
 
     trait :private_lw do
-      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+      visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
     end
 
     trait :institution_lw do
-      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+      visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
     end
 
     trait :public_lw do
-      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+      visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
     end
   end
 
@@ -179,8 +179,8 @@ FactoryBot.define do
     #   col.save(validate: false)
     transient do
       user { create(:user) }
-      with_permission_template false
-      do_save false
+      with_permission_template { false }
+      do_save { false }
     end
 
     sequence(:title) { |n| ["Typeless Collection Title #{n}"] }

data/spec/factories/collections_factory.rb

@@ -20,10 +20,10 @@ FactoryBot.define do
     transient do
       user { create(:user) }
       # allow defaulting to default user collection
-      collection_type_settings nil
-      with_permission_template false
-      create_access false
-      with_nesting_attributes nil
+      collection_type_settings { nil }
+      with_permission_template { false }
+      create_access { false }
+      with_nesting_attributes { nil }
     end
     sequence(:title) { |n| ["Collection Title #{n}"] }
 
@@ -66,20 +66,20 @@ FactoryBot.define do
     factory :public_collection, traits: [:public]
 
     trait :public do
-      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+      visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
     end
 
     factory :private_collection do
-      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+      visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
     end
 
     factory :institution_collection do
-      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+      visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
     end
 
     factory :named_collection do
-      title ['collection title']
-      description ['collection description']
+      title { ['collection title'] }
+      description { ['collection description'] }
     end
   end
 
@@ -103,9 +103,9 @@ FactoryBot.define do
     #   col.save(validate: false)
     transient do
       user { create(:user) }
-      with_permission_template false
-      create_access false
-      do_save false
+      with_permission_template { false }
+      create_access { false }
+      do_save { false }
     end
 
     sequence(:title) { |n| ["Typeless Collection Title #{n}"] }

data/spec/factories/file_sets.rb

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :file_set do
     transient do
       user { create(:user) }
-      content nil
+      content { nil }
     end
     after(:build) do |fs, evaluator|
       fs.apply_depositor_metadata evaluator.user.user_key
@@ -13,11 +13,11 @@ FactoryBot.define do
     end
 
     trait :public do
-      read_groups ["public"]
+      read_groups { ["public"] }
     end
 
     trait :registered do
-      read_groups ["registered"]
+      read_groups { ["registered"] }
     end
 
     factory :file_with_work do

data/spec/factories/generic_works.rb

@@ -3,7 +3,7 @@ FactoryBot.define do
     transient do
       user { create(:user) }
       # Set to true (or a hash) if you want to create an admin set
-      with_admin_set false
+      with_admin_set { false }
     end
 
     # It is reasonable to assume that a work has an admin set; However, we don't want to
@@ -22,8 +22,8 @@ FactoryBot.define do
       work.save! if work.member_of_collections.present?
     end
 
-    title ["Test title"]
-    visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+    title { ["Test title"] }
+    visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
 
     after(:build) do |work, evaluator|
       work.apply_depositor_metadata(evaluator.user.user_key)
@@ -32,15 +32,15 @@ FactoryBot.define do
     factory :public_generic_work, aliases: [:public_work], traits: [:public]
 
     trait :public do
-      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+      visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
     end
 
     factory :private_work do
-      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+      visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
     end
 
     factory :registered_generic_work do
-      read_groups ["registered"]
+      read_groups { ["registered"] }
     end
 
     factory :work_with_one_file do
@@ -100,7 +100,7 @@ FactoryBot.define do
       # let(:work) { create(:embargoed_work, with_embargo_attributes: embargo_attributes) }
 
       transient do
-        with_embargo_attributes false
+        with_embargo_attributes { false }
         embargo_date { Date.tomorrow.to_s }
         current_state { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
         future_state { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
@@ -147,7 +147,7 @@ FactoryBot.define do
       # let(:work) { create(:leased_work, with_lease_attributes: lease_attributes) }
 
       transient do
-        with_lease_attributes false
+        with_lease_attributes { false }
         lease_date { Date.tomorrow.to_s }
         current_state { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
         future_state { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
@@ -184,7 +184,7 @@ FactoryBot.define do
 
   # Doesn't set up any edit_users
   factory :work_without_access, class: GenericWork do
-    title ['Test title']
+    title { ['Test title'] }
     depositor { create(:user).user_key }
   end
 end