sufia 4.0.0.beta3 → 4.0.0.beta4

data/sufia-models/lib/generators/sufia/models/install_generator.rb

@@ -13,9 +13,8 @@ This generator makes the following changes to your application:
  1. Creates several database migrations if they do not exist in /db/migrate
  2. Adds user behavior to the user model
  3. Creates the sufia.rb configuration file
- 4. Adds Sufia::SolrDocumentBehavior to app/models/solr_document.rb
- 5. Generates mailboxer
- 6. Generates usage stats config
+ 4. Generates mailboxer
+ 5. Generates usage stats config
        """
 
   # Implement the required interface for Rails::Generators::Migration.
@@ -83,19 +82,6 @@ This generator makes the following changes to your application:
     copy_file 'config/resque_config.rb', 'config/initializers/resque_config.rb'
   end
 
-  # Add behaviors to the SolrDocument model
-  def inject_sufia_solr_document_behavior
-    file_path = "app/models/solr_document.rb"
-    if File.exists?(file_path)
-      inject_into_file file_path, after: /include Blacklight::Solr::Document.*$/ do
-        "\n  # Adds Sufia behaviors to the SolrDocument.\n" +
-          "  include Sufia::SolrDocumentBehavior\n"
-      end
-    else
-      puts "     \e[31mFailure\e[0m  Sufia requires a SolrDocument object. This generators assumes that the model is defined in the file #{file_path}, which does not exist."
-    end
-  end
-
   def install_mailboxer
     generate "mailboxer:install"
   end

data/sufia-models/lib/generators/sufia/models/templates/config/sufia.rb

@@ -48,6 +48,29 @@ Sufia.config do |config|
     "Other" => "Other",
   }
 
+  config.resource_types_to_schema = {
+    "Article" => "http://schema.org/Article",
+    "Audio" => "http://schema.org/AudioObject",
+    "Book" => "http://schema.org/Book",
+    "Capstone Project" => "http://schema.org/CreativeWork",
+    "Conference Proceeding" => "http://schema.org/ScholarlyArticle",
+    "Dataset" => "http://schema.org/Dataset",
+    "Dissertation" => "http://schema.org/ScholarlyArticle",
+    "Image" => "http://schema.org/ImageObject",
+    "Journal" => "http://schema.org/CreativeWork",
+    "Map or Cartographic Material" => "http://schema.org/Map",
+    "Masters Thesis" => "http://schema.org/ScholarlyArticle",
+    "Part of Book" => "http://schema.org/Book",
+    "Poster" => "http://schema.org/CreativeWork",
+    "Presentation" => "http://schema.org/CreativeWork",
+    "Project" => "http://schema.org/CreativeWork",
+    "Report" => "http://schema.org/CreativeWork",
+    "Research Paper" => "http://schema.org/ScholarlyArticle",
+    "Software or Program Code" => "http://schema.org/Code",
+    "Video" => "http://schema.org/VideoObject",
+    "Other" => "http://schema.org/CreativeWork",
+  }
+
   config.permission_levels = {
     "Choose Access"=>"none",
     "View/Download" => "read",

data/sufia-models/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "4.0.0.beta2"
+    VERSION = "4.0.0.beta4"
   end
 end

data/sufia-models/sufia-models.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'resque', '~> 1.23'
   spec.add_dependency 'resque-pool', '0.3.0'
   spec.add_dependency 'noid', '~> 0.6.6'
-  spec.add_dependency 'mailboxer', '~> 0.12.0.rc1'
+  spec.add_dependency 'mailboxer', '~> 0.12.0.rc2'
   spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
   spec.add_dependency 'carrierwave', '~> 0.9.0'
   spec.add_dependency 'hydra-derivatives', '~> 0.1'

data/vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js

@@ -220,18 +220,27 @@
             },
             // Callback for upload progress events:
             progress: function (e, data) {
-                if (data.context) {
-                    data.context.find('.progress .bar').css(
-                        'width',
-                        parseInt(data.loaded / data.total * 100, 10) + '%'
-                    );
-                }
+              var progress = Math.floor(data.loaded / data.total * 100);
+              if (data.context) {
+                data.context.find('.progress')
+                  .attr('aria-valuenow', progress)
+                  .children().first().css(
+                    'width',
+                    progress + '%'
+                  );
+              }
             },
             // Callback for global upload progress events:
             progressall: function (e, data) {
-                $(this).find('.fileupload-buttonbar .progress .bar').css(
-                    'width',
-                    parseInt(data.loaded / data.total * 100, 10) + '%'
+              var $this = $(this),
+                progress = Math.floor(data.loaded / data.total * 100),
+                globalProgressNode = $this.find('.fileupload-progress');
+
+              globalProgressNode.find('.progress')
+                .attr('aria-valuenow', progress)
+                .children().first().css(
+                  'width',
+                  progress + '%'
                 );
             },
             // Callback for uploads start, equivalent to the global ajaxStart event:
@@ -633,4 +642,3 @@
     });
 
 }));
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta3
+  version: 4.0.0.beta4
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta3
+        version: 4.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta3
+        version: 4.0.0.beta4
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -290,8 +290,6 @@ files:
 - app/assets/images/default.png
 - app/assets/images/favicon.ico
 - app/assets/images/folder.png
-- app/assets/images/glyphicons-halflings-white.png
-- app/assets/images/glyphicons-halflings.png
 - app/assets/images/hydra/powered_by_hydra.png
 - app/assets/images/hydra/search-button.png
 - app/assets/images/loading.gif
@@ -390,14 +388,10 @@ files:
 - app/controllers/concerns/sufia/files_controller/upload_complete_behavior.rb
 - app/controllers/concerns/sufia/files_controller_behavior.rb
 - app/controllers/concerns/sufia/homepage_controller.rb
+- app/controllers/concerns/sufia/my_controller_behavior.rb
 - app/controllers/concerns/sufia/users_controller_behavior.rb
 - app/controllers/contact_form_controller.rb
 - app/controllers/content_blocks_controller.rb
-- app/controllers/dashboard/collections_controller.rb
-- app/controllers/dashboard/files_controller.rb
-- app/controllers/dashboard/highlights_controller.rb
-- app/controllers/dashboard/lists_controller.rb
-- app/controllers/dashboard/shares_controller.rb
 - app/controllers/dashboard_controller.rb
 - app/controllers/directory_controller.rb
 - app/controllers/downloads_controller.rb
@@ -407,6 +401,11 @@ files:
 - app/controllers/generic_files_controller.rb
 - app/controllers/homepage_controller.rb
 - app/controllers/mailbox_controller.rb
+- app/controllers/my/collections_controller.rb
+- app/controllers/my/files_controller.rb
+- app/controllers/my/highlights_controller.rb
+- app/controllers/my/shares_controller.rb
+- app/controllers/my_controller.rb
 - app/controllers/pages_controller.rb
 - app/controllers/single_use_links_controller.rb
 - app/controllers/single_use_links_viewer_controller.rb
@@ -416,9 +415,11 @@ files:
 - app/helpers/batch_edits_helper.rb
 - app/helpers/contact_form_helper.rb
 - app/helpers/content_block_helper.rb
+- app/helpers/dashboard_helper.rb
 - app/helpers/generic_file_helper.rb
 - app/helpers/records_helper.rb
 - app/helpers/sufia/blacklight_override.rb
+- app/helpers/sufia/dashboard_helper_behavior.rb
 - app/helpers/sufia/records_helper_behavior.rb
 - app/helpers/sufia/sufia_helper_behavior.rb
 - app/helpers/trophy_helper.rb
@@ -531,33 +532,15 @@ files:
 - app/views/collections/_view_type_group.html.erb
 - app/views/collections/edit.html.erb
 - app/views/collections/show.html.erb
+- app/views/collections/show_fields/_creator.html.erb
+- app/views/collections/show_fields/_description.html.erb
+- app/views/collections/show_fields/_title.html.erb
 - app/views/contact_form/_directions.html.erb
 - app/views/contact_form/create.html.erb
 - app/views/contact_form/new.html.erb
-- app/views/dashboard/_action_menu.html.erb
-- app/views/dashboard/_batch_edits_actions.html.erb
-- app/views/dashboard/_collection_action_menu.html.erb
-- app/views/dashboard/_constraints.html.erb
-- app/views/dashboard/_did_you_mean.html.erb
-- app/views/dashboard/_document_list.html.erb
-- app/views/dashboard/_facet_layout.html.erb
-- app/views/dashboard/_facet_limit.html.erb
-- app/views/dashboard/_facet_pagination.html.erb
-- app/views/dashboard/_facet_selected.html.erb
-- app/views/dashboard/_facets.html.erb
-- app/views/dashboard/_heading.html.erb
-- app/views/dashboard/_index_partials/_default_group.html.erb
-- app/views/dashboard/_index_partials/_list_collections.html.erb
-- app/views/dashboard/_index_partials/_list_files.html.erb
-- app/views/dashboard/_results_pagination.html.erb
-- app/views/dashboard/_search_form.html.erb
-- app/views/dashboard/_show_partials/_default.html.erb
-- app/views/dashboard/_show_partials/_default_details.html.erb
-- app/views/dashboard/_show_partials/_facets.html.erb
-- app/views/dashboard/_sort_and_per_page.html.erb
-- app/views/dashboard/facet.html.erb
+- app/views/dashboard/_index_partials/_stats.html.erb
+- app/views/dashboard/_index_partials/_user_info.html.erb
 - app/views/dashboard/index.html.erb
-- app/views/dashboard/lists/index.html.erb
 - app/views/error/401.html.erb
 - app/views/error/404.html.erb
 - app/views/error/500.html.erb
@@ -570,7 +553,6 @@ files:
 - app/views/generic_files/_browse_everything.html.erb
 - app/views/generic_files/_descriptions.html.erb
 - app/views/generic_files/_extra_fields_modal.html.erb
-- app/views/generic_files/_field_display.html.erb
 - app/views/generic_files/_field_form.html.erb
 - app/views/generic_files/_flot_stats.js.erb
 - app/views/generic_files/_groups_description.html.erb
@@ -593,7 +575,21 @@ files:
 - app/views/generic_files/edit_fields/_suffix.html.erb
 - app/views/generic_files/new.html.erb
 - app/views/generic_files/show.html.erb
+- app/views/generic_files/show_fields/_based_near.html.erb
+- app/views/generic_files/show_fields/_contributor.html.erb
+- app/views/generic_files/show_fields/_creator.html.erb
+- app/views/generic_files/show_fields/_date_created.html.erb
 - app/views/generic_files/show_fields/_default.html.erb
+- app/views/generic_files/show_fields/_description.html.erb
+- app/views/generic_files/show_fields/_identifier.html.erb
+- app/views/generic_files/show_fields/_language.html.erb
+- app/views/generic_files/show_fields/_publisher.html.erb
+- app/views/generic_files/show_fields/_related_url.html.erb
+- app/views/generic_files/show_fields/_resource_type.html.erb
+- app/views/generic_files/show_fields/_rights.html.erb
+- app/views/generic_files/show_fields/_subject.html.erb
+- app/views/generic_files/show_fields/_tag.html.erb
+- app/views/generic_files/show_fields/_title.html.erb
 - app/views/generic_files/stats.html.erb
 - app/views/generic_files/upload/_agreement.html.erb
 - app/views/generic_files/upload/_alerts.html.erb
@@ -628,7 +624,26 @@ files:
 - app/views/layouts/sufia-dashboard.html.erb
 - app/views/layouts/sufia-one-column.html.erb
 - app/views/layouts/sufia-two-column.html.erb
+- app/views/mailbox/_notifications.html.erb
 - app/views/mailbox/index.html.erb
+- app/views/my/_action_menu.html.erb
+- app/views/my/_batch_edits_actions.html.erb
+- app/views/my/_collection_action_menu.html.erb
+- app/views/my/_did_you_mean.html.erb
+- app/views/my/_document_list.html.erb
+- app/views/my/_facet_layout.html.erb
+- app/views/my/_facet_limit.html.erb
+- app/views/my/_facet_pagination.html.erb
+- app/views/my/_facet_selected.html.erb
+- app/views/my/_facets.html.erb
+- app/views/my/_index_partials/_default_group.html.erb
+- app/views/my/_index_partials/_list_collections.html.erb
+- app/views/my/_index_partials/_list_files.html.erb
+- app/views/my/_results_pagination.html.erb
+- app/views/my/_scripts.js.erb
+- app/views/my/_sort_and_per_page.html.erb
+- app/views/my/facet.html.erb
+- app/views/my/index.html.erb
 - app/views/pages/show.html.erb
 - app/views/records/_edit_field.html.erb
 - app/views/records/edit_fields/_description.html.erb
@@ -697,10 +712,6 @@ files:
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/collections_controller_spec.rb
 - spec/controllers/content_blocks_controller_spec.rb
-- spec/controllers/dashboard/collections_controller_spec.rb
-- spec/controllers/dashboard/files_controller_spec.rb
-- spec/controllers/dashboard/highlights_controller_spec.rb
-- spec/controllers/dashboard/shares_controller_spec.rb
 - spec/controllers/dashboard_controller_spec.rb
 - spec/controllers/downloads_controller_spec.rb
 - spec/controllers/featured_work_lists_controller_spec.rb
@@ -708,6 +719,11 @@ files:
 - spec/controllers/generic_files_controller_spec.rb
 - spec/controllers/homepage_controller_spec.rb
 - spec/controllers/mailbox_controller_spec.rb
+- spec/controllers/my/collections_controller_spec.rb
+- spec/controllers/my/files_controller_spec.rb
+- spec/controllers/my/highlights_controller_spec.rb
+- spec/controllers/my/shares_controller_spec.rb
+- spec/controllers/my_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
 - spec/controllers/single_use_links_controller_spec.rb
 - spec/controllers/single_use_links_viewer_controller_spec.rb
@@ -760,6 +776,7 @@ files:
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
 - spec/helpers/content_block_helper_spec.rb
+- spec/helpers/dashboard_helper_spec.rb
 - spec/helpers/records_helper_spec.rb
 - spec/helpers/sufia_helper_spec.rb
 - spec/helpers/trophy_helper_spec.rb
@@ -807,10 +824,12 @@ files:
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
 - spec/views/batch_edits/check_all_spec.rb
-- spec/views/dashboard/facet_limit.html.erb_spec.rb
+- spec/views/catalog/sort_and_per_pange.html.erb_spec.rb
+- spec/views/dashboard/index_spec.rb
 - spec/views/generic_file/edit.html.erb_spec.rb
 - spec/views/generic_file/show.html.erb_spec.rb
 - spec/views/generic_file/stats.html.erb_spec.rb
+- spec/views/my/facet_limit.html.erb_spec.rb
 - spec/views/users/_follower_modal.html.erb_spec.rb
 - spec/views/users/_following_modal.html.erb_spec.rb
 - spec/views/users/_notify_number.html.erb_spec.rb
@@ -995,10 +1014,6 @@ test_files:
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/collections_controller_spec.rb
 - spec/controllers/content_blocks_controller_spec.rb
-- spec/controllers/dashboard/collections_controller_spec.rb
-- spec/controllers/dashboard/files_controller_spec.rb
-- spec/controllers/dashboard/highlights_controller_spec.rb
-- spec/controllers/dashboard/shares_controller_spec.rb
 - spec/controllers/dashboard_controller_spec.rb
 - spec/controllers/downloads_controller_spec.rb
 - spec/controllers/featured_work_lists_controller_spec.rb
@@ -1006,6 +1021,11 @@ test_files:
 - spec/controllers/generic_files_controller_spec.rb
 - spec/controllers/homepage_controller_spec.rb
 - spec/controllers/mailbox_controller_spec.rb
+- spec/controllers/my/collections_controller_spec.rb
+- spec/controllers/my/files_controller_spec.rb
+- spec/controllers/my/highlights_controller_spec.rb
+- spec/controllers/my/shares_controller_spec.rb
+- spec/controllers/my_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
 - spec/controllers/single_use_links_controller_spec.rb
 - spec/controllers/single_use_links_viewer_controller_spec.rb
@@ -1058,6 +1078,7 @@ test_files:
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
 - spec/helpers/content_block_helper_spec.rb
+- spec/helpers/dashboard_helper_spec.rb
 - spec/helpers/records_helper_spec.rb
 - spec/helpers/sufia_helper_spec.rb
 - spec/helpers/trophy_helper_spec.rb
@@ -1105,10 +1126,12 @@ test_files:
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
 - spec/views/batch_edits/check_all_spec.rb
-- spec/views/dashboard/facet_limit.html.erb_spec.rb
+- spec/views/catalog/sort_and_per_pange.html.erb_spec.rb
+- spec/views/dashboard/index_spec.rb
 - spec/views/generic_file/edit.html.erb_spec.rb
 - spec/views/generic_file/show.html.erb_spec.rb
 - spec/views/generic_file/stats.html.erb_spec.rb
+- spec/views/my/facet_limit.html.erb_spec.rb
 - spec/views/users/_follower_modal.html.erb_spec.rb
 - spec/views/users/_following_modal.html.erb_spec.rb
 - spec/views/users/_notify_number.html.erb_spec.rb

data/app/controllers/dashboard/lists_controller.rb

@@ -1,13 +0,0 @@
-module Dashboard
-  class ListsController < DashboardController
-    # specify the controller_name here to specify where we should look for
-    # the batch_edit menu options (_batch_edits_actions.html.erb)
-    def controller_name
-      :dashboard
-    end
-
-    def search_action_url(opts={})
-      sufia.url_for(opts)
-    end
-  end
-end

data/app/views/dashboard/_constraints.html.erb

@@ -1,6 +0,0 @@
-<!--
-<div id="appliedParams">
-  <h3 class="label">You searched for:</h3>
-  <%# render_constraints(localized_params) %>
-</div>
--->

data/app/views/dashboard/_document_list.html.erb

@@ -1,4 +0,0 @@
-<% # container for all documents in index view -%>
-<div id="documents" class="clear">
-  <%= render partial: 'dashboard/_index_partials/default_group', locals: {docs: @response.docs.map { |x| SolrDocument.new(x) }, facet_value: nil} %>
-</div>

data/app/views/dashboard/_heading.html.erb

@@ -1 +0,0 @@
-<div class="col-sm-12 col-md-6 col-lg-6"><h1>My Dashboard</h1></div>

data/app/views/dashboard/_search_form.html.erb

@@ -1,14 +0,0 @@
-<div class="col-xs-12 col-md-6">
-  <%= form_tag search_action_url, method: :get, role: "search" do %>
-    <label for="dashboard_search" class="sr-only">Search My Dashboard</label>
-    <%= hidden_field_tag :search_field, 'all_fields' %>
-    <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
-    <div class="input-group">
-      <%= text_field_tag :q, params[:q], class: "q form-control", placeholder: "Search My Dashboard", id: "dashboard_search" %>
-      <span class="input-group-btn">
-        <button type="submit" class="btn btn-default" id="dashboard_submit"><i class="glyphicon glyphicon-search"></i> Go</button>
-      </span><!-- / .input-group-btn -->
-    </div> <!-- /.input-group -->
-
-  <% end %>
-</div>

data/app/views/dashboard/_show_partials/_default.html.erb

@@ -1,20 +0,0 @@
-<%# default partial to display solr document fields in catalog show view -%>
-<div class="document_viewer" id="cover_container">
-  <dl class="defList">
-    <dt>ID: </dt>
-    <dd><%= render_document_show_field_value(document: document, field: "id") %></dd>
-    <dt>Download:</dt>
-    <dd id="downloads">
-	  <ul>
-        <% %>
-      </ul>
-    </dd>
-    <dt>Copyright: </dt>
-    <dd><%= render_document_show_field_value(document: document, field: "rights_t") %></dd>
-  </dl>
-</div>
-<div class="<%= params[:action]%>_details">
-  <%= render partial: "#{params[:controller]}/_#{params[:action]}_partials/default_details", locals: {document: document}%>
-</div>
-
-<%= async_load_tag(hydra_asset_downloads_path(params[:id]), 'downloads') %>