hyrax 2.0.0.beta1 → 2.0.0.beta2

data/app/services/hyrax/{message_user_service.rb → abstract_message_service.rb}

@@ -1,5 +1,5 @@
 module Hyrax
-  class MessageUserService
+  class AbstractMessageService
     attr_reader :file_set, :user
 
     def initialize(file_set, user)
@@ -8,15 +8,18 @@ module Hyrax
     end
 
     def call
-      job_user.send_message(user, message, subject)
+      Hyrax::MessengerService.deliver(job_user,
+                                      user,
+                                      message,
+                                      subject)
     end
 
-    # Passed into send_message, override to provide message body for event.
+    # Passed to Hyrax::MessengerService, override to provide message body for event.
     def message
       raise "Override #message in the service class"
     end
 
-    # Passed into send_message, override to provide subject for event.
+    # Passed to Hyrax::MessengerService, override to provide subject for event.
     def subject
       raise "Override #subject in the service class"
     end

data/app/services/hyrax/batch_create_failure_service.rb

@@ -1,5 +1,5 @@
 module Hyrax
-  class BatchCreateFailureService < MessageUserService
+  class BatchCreateFailureService < AbstractMessageService
     attr_reader :user
     def initialize(user)
       @user = user

data/app/services/hyrax/batch_create_success_service.rb

@@ -1,5 +1,5 @@
 module Hyrax
-  class BatchCreateSuccessService < MessageUserService
+  class BatchCreateSuccessService < AbstractMessageService
     attr_reader :user
 
     def initialize(user)

data/app/services/hyrax/fixity_check_failure_service.rb

@@ -1,5 +1,5 @@
 module Hyrax
-  class FixityCheckFailureService < MessageUserService
+  class FixityCheckFailureService < AbstractMessageService
     attr_reader :log_date, :checksum_audit_log, :file_set
 
     def initialize(file_set, checksum_audit_log:)

data/app/services/hyrax/import_url_failure_service.rb

@@ -1,5 +1,5 @@
 module Hyrax
-  class ImportUrlFailureService < MessageUserService
+  class ImportUrlFailureService < AbstractMessageService
     def message
       file_set.errors.full_messages.join(', ')
     end

data/app/services/hyrax/messenger_service.rb

@@ -0,0 +1,8 @@
+module Hyrax
+  class MessengerService
+    def self.deliver(sender, recipients, body, subject, *args)
+      sender.send_message(recipients, body, subject, *args)
+      StreamNotificationsJob.perform_later(recipients)
+    end
+  end
+end

data/app/services/hyrax/workflow/abstract_notification.rb

@@ -48,7 +48,7 @@ module Hyrax
 
       def call
         users_to_notify.uniq.each do |recipient|
-          user.send_message(recipient, message, subject)
+          Hyrax::MessengerService.deliver(user, recipient, message, subject)
         end
       end
 

data/app/views/_user_util_links.html.erb

@@ -2,7 +2,7 @@
   <%= render 'shared/locale_picker' if available_translations.size > 1 %>
   <% if user_signed_in? %>
     <li>
-      <%= render 'hyrax/users/notify_number' %>
+      <%= render_notifications(user: current_user) %>
     </li>
     <li class="dropdown">
       <%= link_to hyrax.dashboard_profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false} do %>

data/app/views/hyrax/homepage/index.html.erb

@@ -17,7 +17,7 @@
           <% end %>
         <% end %>
       <% else %>
-        <%= link_to hyrax.dashboard_path,
+        <%= link_to hyrax.my_works_path,
           class: "btn btn-primary btn-lg" do %>
           <i class="glyphicon glyphicon-upload"></i> <%= t('hyrax.share_button') %>
         <% end %>

data/config/locales/hyrax.de.yml

@@ -511,7 +511,7 @@ de:
       user_activity: Benutzeraktivität
       user_notifications: Benutzerbenachrichtigungen
       view_files: Dateien ansehen
-    document_language: En
+    document_language: de
     edit_profile: Profil bearbeiten
     embargoes:
       edit:
@@ -697,7 +697,10 @@ de:
       dashboard:
         menu: Instrumententafel
       language_switch: Sprache wechseln
-      notifications: Sie haben keine ungelesenen Benachrichtigungen
+      notifications:
+        many: Sie haben %{count} ungelesene Benachrichtigungen
+        one: Sie haben eine ungelesene Benachrichtigung
+        zero: Sie haben keine ungelesenen Benachrichtigungen
       profile:
         login: Anmeldung
         logout: Ausloggen

data/config/locales/hyrax.en.yml

@@ -686,7 +686,10 @@ en:
       dashboard:
         menu: "Dashboard"
       language_switch: "Switch language"
-      notifications: "You have no unread notifications"
+      notifications:
+        zero: "You have no unread notifications"
+        one: "You have one unread notification"
+        many: "You have %{count} unread notifications"
       profile:
         login: "Login"
         logout: "Logout"

data/config/locales/hyrax.es.yml

@@ -694,7 +694,10 @@ es:
       dashboard:
         menu: Panel de Control
       language_switch: Cambiar idioma
-      notifications: No hay notificaciones sin leer.
+      notifications:
+        many: Tienes notificaciones no leídas de %{count}
+        one: Tienes una notificación no leída
+        zero: No tienes notificaciones no leídas.
       profile:
         login: Iniciar sesión
         logout: Cerrar sesión

data/config/locales/hyrax.fr.yml

@@ -511,7 +511,7 @@ fr:
       user_activity: Activité de l'utilisateur
       user_notifications: Notifications de l'utilisateur
       view_files: Afficher les fichiers
-    document_language: En
+    document_language: fr
     edit_profile: Editer le profil
     embargoes:
       edit:
@@ -697,7 +697,10 @@ fr:
       dashboard:
         menu: Tableau de bord
       language_switch: Changer de langue
-      notifications: Vous n'avez aucune notification non lue
+      notifications:
+        many: Vous avez des notifications non-lues %{count}
+        one: Vous avez une notification non lue
+        zero: Vous n'avez aucune notification non lue
       profile:
         login: S'identifier
         logout: Connectez - Out

data/config/locales/hyrax.it.yml

@@ -697,7 +697,10 @@ it:
       dashboard:
         menu: Cruscotto
       language_switch: Cambiare la lingua
-      notifications: Non hai notifiche non letti
+      notifications:
+        many: Hai notifiche non letti %{count}
+        one: Hai una notifica non letti
+        zero: Non hai notifiche non letti
       profile:
         login: Accesso
         logout: Logout

data/config/locales/hyrax.pt-BR.yml

@@ -511,7 +511,7 @@ pt-BR:
       user_activity: Atividade do usuário
       user_notifications: Notificações do usuário
       view_files: Ver arquivos
-    document_language: En
+    document_language: pt-BR
     edit_profile: Editar Perfil
     embargoes:
       edit:
@@ -697,7 +697,10 @@ pt-BR:
       dashboard:
         menu: painel de controle
       language_switch: Alterar idioma
-      notifications: Você não possui notificações não lidas
+      notifications:
+        many: Você recebeu notificações não lidas do %{count}
+        one: Você tem uma notificação não lida
+        zero: Você não possui notificações não lidas
       profile:
         login: Entrar
         logout: Sair

data/config/locales/hyrax.zh.yml

@@ -512,7 +512,7 @@ zh:
       user_activity: 用户活动
       user_notifications: 用户通知
       view_files: 阅览文件
-    document_language: en
+    document_language: zh
     edit_profile: 编辑个人资料
     embargoes:
       edit:
@@ -700,7 +700,10 @@ zh:
       dashboard:
         menu: 控件板
       language_switch: 转换语言
-      notifications: 您没有未曾阅读的通知
+      notifications:
+        many: 您有%{count}未读通知
+        one: 您有一个未读通知
+        zero: 您没有未读通知
       profile:
         login: 登录
         logout: 退出登录

data/config/routes.rb

@@ -42,8 +42,6 @@ Hyrax::Engine.routes.draw do
   match 'batch_edits/:id' => 'batch_edits#add', :via => :put
   match 'batch_edits' => 'batch_edits#destroy_collection', :via => :delete
 
-  # Notifications route for catalog index view
-  get 'users/notifications_number' => 'users#notifications_number', as: :user_notify
   resources :batch_uploads, only: [:new, :create], controller: 'batch_uploads'
 
   resources :collections, only: :show do # public landing show page
@@ -94,6 +92,10 @@ Hyrax::Engine.routes.draw do
       delete 'delete_all'
     end
   end
+  namespace :notifications do
+    # WebSocket for notifications
+    mount ActionCable.server => 'endpoint', as: :endpoint
+  end
 
   # User profile
   resources :users, only: [:index, :show] do

data/db/migrate/20170905135339_add_preferred_locale_to_users.rb

@@ -0,0 +1,5 @@
+class AddPreferredLocaleToUsers < ActiveRecord::Migration[4.2]
+  def change
+    add_column :users, :preferred_locale, :string
+  end
+end

data/lib/generators/hyrax/templates/config/authorities/licenses.yml

@@ -1,28 +1,46 @@
 terms:
     - id: http://creativecommons.org/licenses/by/3.0/us/
       term: Attribution 3.0 United States
-      active: true
+      active: false
     - id: http://creativecommons.org/licenses/by-sa/3.0/us/
       term: Attribution-ShareAlike 3.0 United States
-      active: true
+      active: false
     - id: http://creativecommons.org/licenses/by-nc/3.0/us/
       term: Attribution-NonCommercial 3.0 United States
-      active: true
+      active: false
     - id: http://creativecommons.org/licenses/by-nd/3.0/us/
       term: Attribution-NoDerivs 3.0 United States
-      active: true
+      active: false
     - id: http://creativecommons.org/licenses/by-nc-nd/3.0/us/
       term: Attribution-NonCommercial-NoDerivs 3.0 United States
-      active: true
+      active: false
     - id: http://creativecommons.org/licenses/by-nc-sa/3.0/us/
       term: Attribution-NonCommercial-ShareAlike 3.0 United States
+      active: false
+    - id: http://www.europeana.eu/portal/rights/rr-r.html
+      term: All rights reserved
+      active: false
+    - id: https://creativecommons.org/licenses/by/4.0/
+      term: Creative Commons BY Attribution 4.0 International
       active: true
-    - id: http://creativecommons.org/publicdomain/mark/1.0/
-      term: Public Domain Mark 1.0
+    - id: https://creativecommons.org/licenses/by-sa/4.0/
+      term: Creative Commons BY-SA Attribution-ShareAlike 4.0 International
+      active: true
+    - id: https://creativecommons.org/licenses/by-nd/4.0/
+      term: Creative Commons BY-ND Attribution-NoDerivatives 4.0 International
+      active: true
+    - id: https://creativecommons.org/licenses/by-nc/4.0/
+      term: Creative Commons BY-NC Attribution-NonCommercial 4.0 International
+      active: true
+    - id: https://creativecommons.org/licenses/by-nc-nd/4.0/
+      term: Creative Commons BY-NC-ND Attribution-NonCommercial-NoDerivs 4.0 International
+      active: true
+    - id: https://creativecommons.org/licenses/by-nc-sa/4.0/
+      term: Creative Commons BY-NC-SA Attribution-NonCommercial-ShareAlike 4.0 International
       active: true
     - id: http://creativecommons.org/publicdomain/zero/1.0/
-      term: CC0 1.0 Universal
+      term: Creative Commons CC0 1.0 Universal
       active: true
-    - id: http://www.europeana.eu/portal/rights/rr-r.html
-      term: All rights reserved
+    - id: http://creativecommons.org/publicdomain/mark/1.0/
+      term: Creative Commons Public Domain Mark 1.0
       active: true

data/lib/generators/hyrax/templates/config/hyrax.rb

@@ -20,9 +20,6 @@ Hyrax.config do |config|
   # How many notifications should be displayed on the dashboard
   # config.max_notifications_for_dashboard = 5
 
-  # How often clients should poll for notifications
-  # config.notifications_update_poll_interval = 30.seconds
-
   # How frequently should a file be fixity checked
   # config.max_days_between_fixity_checks = 7
 

data/lib/hyrax/configuration.rb

@@ -261,11 +261,6 @@ module Hyrax
       @max_notifications_for_dashboard ||= 5
     end
 
-    attr_writer :notifications_update_poll_interval
-    def notifications_update_poll_interval
-      @notifications_update_poll_interval ||= 30.seconds
-    end
-
     attr_writer :activity_to_show_default_seconds_since_now
     def activity_to_show_default_seconds_since_now
       @activity_to_show_default_seconds_since_now ||= 24 * 60 * 60

data/lib/hyrax/engine.rb

@@ -25,6 +25,11 @@ module Hyrax
       "Blacklight::Exceptions::RecordNotFound" => :not_found
     )
 
+    config.before_initialize do
+      # ActionCable should use Hyrax's connection class instead of app's
+      config.action_cable.connection_class = -> { 'Hyrax::ApplicationCable::Connection'.safe_constantize }
+    end
+
     config.after_initialize do
       begin
         Hyrax.config.persist_registered_roles!

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.0.0.beta1'.freeze
+  VERSION = '2.0.0.beta2'.freeze
 end

data/spec/actors/hyrax/actors/file_set_actor_spec.rb

@@ -133,6 +133,80 @@ RSpec.describe Hyrax::Actors::FileSetActor do
     end
   end
 
+  describe '#create_content when from_url is true' do
+    before do
+      expect(JobIoWrapper).to receive(:create_with_varied_file_handling!).with(any_args).once.and_call_original
+    end
+
+    it 'calls ingest_file' do
+      actor.create_content(file, from_url: true)
+    end
+
+    context 'when an alternative relationship is specified' do
+      before do
+        # Relationship must be declared before being used. Inject it here.
+        FileSet.class_eval do
+          directly_contains_one :remastered, through: :files, type: ::RDF::URI("http://otherpcdm.example.org/use#Remastered"), class_name: 'Hydra::PCDM::File'
+        end
+      end
+
+      it 'calls ingest_file' do
+        actor.create_content(file, :remastered, from_url: true)
+      end
+    end
+
+    context 'using ::File' do
+      let(:file) { local_file }
+
+      before { actor.create_content(local_file, from_url: true) }
+
+      it 'sets the label and title' do
+        expect(file_set.label).to eq(File.basename(local_file))
+        expect(file_set.title).to eq([File.basename(local_file)])
+      end
+
+      it 'gets the mime_type from original_file' do
+        expect(file_set.mime_type).to eq('image/png')
+      end
+    end
+
+    context 'when file_set.title is empty and file_set.label is not' do
+      let(:long_name) do
+        'an absurdly long title that goes on way to long and messes up the display of the page which should not need ' \
+        'to be this big in order to show this impossibly long, long, long, oh so long string'
+      end
+      let(:short_name) { 'Nice Short Name' }
+
+      before do
+        allow(file_set).to receive(:label).and_return(short_name)
+        actor.create_content(file, from_url: true)
+      end
+
+      subject { file_set.title }
+
+      it { is_expected.to match_array [short_name] }
+    end
+
+    context 'when a label is already specified' do
+      let(:label) { 'test_file.png' }
+      let(:file_set) do
+        FileSet.new do |f|
+          f.apply_depositor_metadata(user.user_key)
+          f.label = label
+        end
+      end
+      let(:actor) { described_class.new(file_set, user) }
+
+      before do
+        actor.create_content(file, from_url: true)
+      end
+
+      it "retains the object's original label" do
+        expect(file_set.label).to eql(label)
+      end
+    end
+  end
+
   describe "#update_metadata" do
     it "is successful" do
       expect(actor.update_metadata("title" => ["updated title"])).to be true

data/spec/channels/hyrax/application_cable/channel_spec.rb

@@ -0,0 +1,14 @@
+RSpec.describe Hyrax::ApplicationCable::Channel, no_clean: true do
+  subject { described_class.new(connection, identifier) }
+
+  let(:connection) { double('connection', identifiers: []) }
+  let(:identifier) { double }
+
+  describe 'behaves like an ActionCable::Channel::Base' do
+    it { is_expected.to respond_to(:perform_action) }
+    it { is_expected.to respond_to(:unsubscribe_from_channel) }
+    it { is_expected.to respond_to(:stop_all_streams) }
+    it { is_expected.to respond_to(:stream_for) }
+    it { is_expected.to respond_to(:stream_from) }
+  end
+end