hyrax 2.0.0.beta1 → 2.0.0.beta2

data/spec/views/_user_util_links.html.erb_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 RSpec.describe '/_user_util_links.html.erb', type: :view do
   let(:join_date) { 5.days.ago }
   let(:can_create_file) { true }
@@ -6,7 +8,6 @@ RSpec.describe '/_user_util_links.html.erb', type: :view do
     allow(view).to receive(:user_signed_in?).and_return(true)
     allow(view).to receive(:current_user).and_return(stub_model(User, user_key: 'userX'))
     allow(view).to receive(:can?).with(:create, GenericWork).and_return(can_create_file)
-    assign :notify_number, 8
   end
 
   it 'has dropdown list of links' do
@@ -19,7 +20,7 @@ RSpec.describe '/_user_util_links.html.erb', type: :view do
   it 'shows the number of outstanding messages' do
     render
     expect(rendered).to have_selector "a[aria-label='You have no unread notifications'][href='#{hyrax.notifications_path}']"
-    expect(rendered).to have_selector 'a.notify-number span.label-danger.invisible', text: '0'
+    expect(rendered).to have_selector 'a.notify-number span.label-default.invisible', text: '0'
   end
 
   describe 'translations' do

data/spec/views/hyrax/homepage/index.html.erb_spec.rb

@@ -25,6 +25,10 @@ RSpec.describe "hyrax/homepage/index.html.erb", type: :view do
         it "displays" do
           expect(rendered).to have_content t("hyrax.share_button")
         end
+
+        it 'links to the my works path' do
+          expect(rendered).to have_selector('a[href="/dashboard/my/works"]')
+        end
       end
       context "when the button displays for users with rights" do
         let(:display_share_button) { false }

data/template.rb

@@ -1,4 +1,4 @@
-gem 'hyrax', '2.0.0.beta1'
+gem 'hyrax', '2.0.0.beta2'
 run 'bundle install'
 generate 'hyrax:install', '-f'
 rails_command 'db:migrate'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1000,7 +1000,7 @@ files:
 - app/assets/javascripts/hyrax/admin/admin_set/visibility.es6
 - app/assets/javascripts/hyrax/admin/admin_set_controls.es6
 - app/assets/javascripts/hyrax/admin/graphs.es6
-- app/assets/javascripts/hyrax/app.js
+- app/assets/javascripts/hyrax/app.js.erb
 - app/assets/javascripts/hyrax/authority_select.es6
 - app/assets/javascripts/hyrax/autocomplete.es6
 - app/assets/javascripts/hyrax/autocomplete/default.es6
@@ -1011,6 +1011,7 @@ files:
 - app/assets/javascripts/hyrax/batch_select.es6
 - app/assets/javascripts/hyrax/batch_select_all.js
 - app/assets/javascripts/hyrax/browse_everything.js
+- app/assets/javascripts/hyrax/channels/notifications.js
 - app/assets/javascripts/hyrax/collections.js
 - app/assets/javascripts/hyrax/collections/editor.es6
 - app/assets/javascripts/hyrax/config.js.erb
@@ -1031,7 +1032,6 @@ files:
 - app/assets/javascripts/hyrax/initialize.js
 - app/assets/javascripts/hyrax/monkey_patch_turbolinks.js.coffee
 - app/assets/javascripts/hyrax/notification.es6
-- app/assets/javascripts/hyrax/notifications.es6
 - app/assets/javascripts/hyrax/per_page.es6
 - app/assets/javascripts/hyrax/permissions.js
 - app/assets/javascripts/hyrax/permissions/control.es6
@@ -1108,6 +1108,9 @@ files:
 - app/authorities/qa/authorities/find_works.rb
 - app/builders/hyrax/bootstrap_breadcrumbs_builder.rb
 - app/builders/hyrax/form_builder.rb
+- app/channels/hyrax/application_cable/channel.rb
+- app/channels/hyrax/application_cable/connection.rb
+- app/channels/hyrax/notifications_channel.rb
 - app/connections/hyrax/clean_connection.rb
 - app/controlled_vocabularies/hyrax/controlled_vocabularies/location.rb
 - app/controllers/concerns/hyrax/admin/stats_behavior.rb
@@ -1268,6 +1271,7 @@ files:
 - app/jobs/ingest_local_file_job.rb
 - app/jobs/inherit_permissions_job.rb
 - app/jobs/resolrize_job.rb
+- app/jobs/stream_notifications_job.rb
 - app/jobs/user_edit_profile_event_job.rb
 - app/jobs/visibility_copy_job.rb
 - app/mailers/hyrax/contact_mailer.rb
@@ -1442,6 +1446,7 @@ files:
 - app/search_builders/hyrax/work_relation.rb
 - app/search_builders/hyrax/work_search_builder.rb
 - app/search_builders/hyrax/works_search_builder.rb
+- app/services/hyrax/abstract_message_service.rb
 - app/services/hyrax/admin_set_create_service.rb
 - app/services/hyrax/admin_set_service.rb
 - app/services/hyrax/analytics.rb
@@ -1474,7 +1479,7 @@ files:
 - app/services/hyrax/local_file_service.rb
 - app/services/hyrax/lock_manager.rb
 - app/services/hyrax/lockable.rb
-- app/services/hyrax/message_user_service.rb
+- app/services/hyrax/messenger_service.rb
 - app/services/hyrax/microdata.rb
 - app/services/hyrax/noid.rb
 - app/services/hyrax/parent_service.rb
@@ -1832,7 +1837,6 @@ files:
 - app/views/hyrax/users/_activity_log.html.erb
 - app/views/hyrax/users/_contributions.html.erb
 - app/views/hyrax/users/_left_sidebar.html.erb
-- app/views/hyrax/users/_notify_number.html.erb
 - app/views/hyrax/users/_profile_tabs.html.erb
 - app/views/hyrax/users/_proxies.html.erb
 - app/views/hyrax/users/_search_form.html.erb
@@ -1843,15 +1847,7 @@ files:
 - app/views/hyrax/users/_vitals.html.erb
 - app/views/hyrax/users/index.html.erb
 - app/views/hyrax/users/index.json.jbuilder
-- app/views/hyrax/users/notifications_number.json.jbuilder
 - app/views/hyrax/users/show.html.erb
-- app/views/kaminari/blacklight/_first_page.html.erb
-- app/views/kaminari/blacklight/_gap.html.erb
-- app/views/kaminari/blacklight/_last_page.html.erb
-- app/views/kaminari/blacklight/_next_page.html.erb
-- app/views/kaminari/blacklight/_page.html.erb
-- app/views/kaminari/blacklight/_paginator.html.erb
-- app/views/kaminari/blacklight/_prev_page.html.erb
 - app/views/kaminari/blacklight_compact/_paginator.html.erb
 - app/views/layouts/_head_tag_content.html.erb
 - app/views/layouts/dashboard.html.erb
@@ -1948,6 +1944,7 @@ files:
 - db/migrate/20170308175556_add_allows_access_grant_to_workflow.rb
 - db/migrate/20170504192714_change_checksum_audit_log.rb
 - db/migrate/20170621201939_create_job_io_wrappers.rb
+- db/migrate/20170905135339_add_preferred_locale_to_users.rb
 - hyrax.gemspec
 - lib/generators/hyrax/arkivo_api_generator.rb
 - lib/generators/hyrax/assets_generator.rb
@@ -2101,6 +2098,9 @@ files:
 - spec/actors/hyrax/actors/optimistic_lock_validator_spec.rb
 - spec/actors/hyrax/actors/transactional_request_spec.rb
 - spec/authorities/qa/authorities/find_works_spec.rb
+- spec/channels/hyrax/application_cable/channel_spec.rb
+- spec/channels/hyrax/application_cable/connection_spec.rb
+- spec/channels/hyrax/notifications_channel_spec.rb
 - spec/config/hyrax_events_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/hyrax/accepts_batches_controller_spec.rb
@@ -2322,6 +2322,7 @@ files:
 - spec/jobs/import_url_job_spec.rb
 - spec/jobs/ingest_local_file_job_spec.rb
 - spec/jobs/inherit_permissions_job_spec.rb
+- spec/jobs/stream_notifications_job_spec.rb
 - spec/jobs/user_edit_profile_event_job_spec.rb
 - spec/jobs/visibility_copy_job_spec.rb
 - spec/lib/hyrax/analytics_spec.rb
@@ -2459,6 +2460,7 @@ files:
 - spec/search_builders/hyrax/work_relation_spec.rb
 - spec/search_builders/hyrax/work_search_builder_spec.rb
 - spec/search_builders/hyrax/works_search_builder_spec.rb
+- spec/services/hyrax/abstract_message_service_spec.rb
 - spec/services/hyrax/admin_set_create_service_spec.rb
 - spec/services/hyrax/admin_set_service_spec.rb
 - spec/services/hyrax/batch_create_failure_service_spec.rb
@@ -2481,6 +2483,7 @@ files:
 - spec/services/hyrax/lease_service_spec.rb
 - spec/services/hyrax/license_service_spec.rb
 - spec/services/hyrax/lock_manager_spec.rb
+- spec/services/hyrax/messenger_service_spec.rb
 - spec/services/hyrax/microdata_spec.rb
 - spec/services/hyrax/noid_spec.rb
 - spec/services/hyrax/parent_service_spec.rb
@@ -2729,6 +2732,9 @@ test_files:
 - spec/actors/hyrax/actors/optimistic_lock_validator_spec.rb
 - spec/actors/hyrax/actors/transactional_request_spec.rb
 - spec/authorities/qa/authorities/find_works_spec.rb
+- spec/channels/hyrax/application_cable/channel_spec.rb
+- spec/channels/hyrax/application_cable/connection_spec.rb
+- spec/channels/hyrax/notifications_channel_spec.rb
 - spec/config/hyrax_events_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/hyrax/accepts_batches_controller_spec.rb
@@ -2950,6 +2956,7 @@ test_files:
 - spec/jobs/import_url_job_spec.rb
 - spec/jobs/ingest_local_file_job_spec.rb
 - spec/jobs/inherit_permissions_job_spec.rb
+- spec/jobs/stream_notifications_job_spec.rb
 - spec/jobs/user_edit_profile_event_job_spec.rb
 - spec/jobs/visibility_copy_job_spec.rb
 - spec/lib/hyrax/analytics_spec.rb
@@ -3087,6 +3094,7 @@ test_files:
 - spec/search_builders/hyrax/work_relation_spec.rb
 - spec/search_builders/hyrax/work_search_builder_spec.rb
 - spec/search_builders/hyrax/works_search_builder_spec.rb
+- spec/services/hyrax/abstract_message_service_spec.rb
 - spec/services/hyrax/admin_set_create_service_spec.rb
 - spec/services/hyrax/admin_set_service_spec.rb
 - spec/services/hyrax/batch_create_failure_service_spec.rb
@@ -3109,6 +3117,7 @@ test_files:
 - spec/services/hyrax/lease_service_spec.rb
 - spec/services/hyrax/license_service_spec.rb
 - spec/services/hyrax/lock_manager_spec.rb
+- spec/services/hyrax/messenger_service_spec.rb
 - spec/services/hyrax/microdata_spec.rb
 - spec/services/hyrax/noid_spec.rb
 - spec/services/hyrax/parent_service_spec.rb

data/app/assets/javascripts/hyrax/notifications.es6

@@ -1,63 +0,0 @@
-import Notification from './notification';
-
-export default class {
-  // If URL is not provided, do nothing.
-  // If there is a query parameter named "notification_seconds", it will
-  // use it's value as the interval in seconds to poll.
-  // Otherwise it will use the default interval passed as a parmeter
-  constructor(url, default_interval) {
-    if (!url)
-      return;
-    // First call happens immediately
-    this.fetchUpdates(url)
-    let interval = this.getIntervalSeconds(default_interval) * 1000
-    this.poller(interval, url)
-    this.notification_widget = new Notification($('.notify-number'))
-  }
-
-  poller(interval, url) {
-      setInterval(() => { this.fetchUpdates(url) }, interval);
-  }
-
-  fetchUpdates(url) {
-      $.getJSON( url, (data) => this.updatePage(data))
-  }
-
-  updatePage(data) {
-    this.notification_widget.setCount(data.notify_number)
-  }
-
-  getIntervalSeconds(default_interval) {
-      var seconds = parseInt(this.queryStringParam("notification_seconds"), 10);
-      return seconds || default_interval;
-  }
-
-  // During development allow the frequency of the notifications check to
-  // be overwritten via query string parameter notification_seconds to
-  // prevent cluttering the terminal with (mostly) meaninless messages.
-  queryStringParam(key) {
-    var queryString, pairs, i;
-    var value = null;
-    try {
-      queryString = document.location.search.substring(1);
-      if (queryString === "") {
-        return value; // nothing to do
-      }
-      pairs = queryString.split("&").map(function(el) {
-        var pair = el.split("=");
-        return {key: pair[0], value: pair[1]};
-      });
-      for(i = 0; i < pairs.length; i++) {
-        if (pairs[i].key === key) {
-          value = pairs[i].value;
-          break;
-        }
-      }
-    }
-    catch(e) {
-      // assume it's a malformed query string.
-      value = null;
-    }
-    return value;
-  }
-}

data/app/views/hyrax/users/_notify_number.html.erb

@@ -1,8 +0,0 @@
-<%= link_to hyrax.notifications_path,
-            'aria-label' => t("hyrax.toolbar.notifications"),
-            class: "notify-number",
-            data: { 'update-poll-url' => hyrax.user_notify_path,
-                    'update-poll-interval' => Hyrax.config.notifications_update_poll_interval } do %>
-    <span class="fa fa-bell"></span>
-    <span class="count invisible label label-danger">0</span>
-<% end %>

data/app/views/hyrax/users/notifications_number.json.jbuilder

@@ -1 +0,0 @@
-json.notify_number @notify_number

data/app/views/kaminari/blacklight/_first_page.html.erb

@@ -1,9 +0,0 @@
-<%# Link to the "First" page
-  - available local variables
-    url:           url to the first page
-    current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<%= link_to raw(t 'views.pagination.first'), url, remote: remote, class: current_page.first? ? 'disabled' : nil %>

data/app/views/kaminari/blacklight/_gap.html.erb

@@ -1,8 +0,0 @@
-<%# Non-link tag that stands for skipped pages...
-  - available local variables
-    current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<%= raw(t 'views.pagination.truncate') %>

data/app/views/kaminari/blacklight/_last_page.html.erb

@@ -1,9 +0,0 @@
-<%# Link to the "Last" page
-  - available local variables
-    url:           url to the last page
-    current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<%= link_to raw(t 'views.pagination.last'), url, {remote: remote, class: current_page.last? ? 'disabled' : nil} %>

data/app/views/kaminari/blacklight/_next_page.html.erb

@@ -1,9 +0,0 @@
-<%# Link to the "Next" page
-  - available local variables
-    url:           url to the next page
-    current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<%= link_to raw(t 'views.pagination.next'), url, rel: 'next', remote: remote, class: current_page.last? ? 'disabled' : nil  %>

data/app/views/kaminari/blacklight/_page.html.erb

@@ -1,10 +0,0 @@
-<%# Link showing page number
-  - available local variables
-    page:          a page object for "this" page
-    url:           url to this page
-    current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<%= link_to number_with_delimiter(page.to_s), url, opts = {remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil, class: page.current? ? 'disabled' : nil} %>

data/app/views/kaminari/blacklight/_paginator.html.erb

@@ -1,19 +0,0 @@
-<%# The container tag
-  - available local variables
-    current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
-    paginator:     the paginator that renders the pagination tags inside
--%>
-<%= paginator.render do -%> 
-    <%= prev_page_tag %>
-    <% each_relevant_page do |page| -%> 
-      <% if page.left_outer? || page.right_outer? || page.inside_window? -%> 
-        <%= page_tag page %>
-      <% elsif !page.was_truncated? -%> 
-        <%= gap_tag %>
-      <% end -%> 
-    <% end -%> 
-    <%= next_page_tag  %>
-<% end -%> 

data/app/views/kaminari/blacklight/_prev_page.html.erb

@@ -1,9 +0,0 @@
-<%# Link to the "Previous" page
-  - available local variables
-    url:           url to the previous page
-    current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<%= link_to raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote, class: current_page.first? ? 'disabled' : nil  %>