sufia 4.0.0.rc1 → 4.0.0.rc2

data/sufia-models/app/models/concerns/sufia/user.rb

@@ -21,6 +21,7 @@ module Sufia::User
     mount_uploader :avatar, AvatarUploader, mount_on: :avatar_file_name
     validates_with AvatarValidator
     has_many :trophies
+    attr_accessor :update_directory
   end
 
   # Format the json for select2 which requires just an id and a field called text.
@@ -63,13 +64,19 @@ module Sufia::User
     @ability ||= ::Ability.new(self)
   end
 
+  def get_all_user_activity( since = DateTime.now.to_i - 8640)
+    events = self.events.reverse.collect { |event| event if event[:timestamp].to_i > since }.compact
+    profile_events = self.profile_events.reverse.collect { |event| event if event[:timestamp].to_i > since }.compact
+    events.concat(profile_events).sort { |a, b| b[:timestamp].to_i <=> a[:timestamp].to_i }
+  end
+
   module ClassMethods
 
     def permitted_attributes
       [:email, :login, :display_name, :address, :admin_area,
         :department, :title, :office, :chat_id, :website, :affiliation,
         :telephone, :avatar, :group_list, :groups_last_update, :facebook_handle,
-        :twitter_handle, :googleplus_handle, :linkedin_handle]
+        :twitter_handle, :googleplus_handle, :linkedin_handle, :remove_avatar]
     end
 
     def current

data/sufia-models/app/models/sufia/avatar_uploader.rb

@@ -1,9 +1,7 @@
 class Sufia::AvatarUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
   include CarrierWave::Compatibility::Paperclip
-
-  process convert: 'png'
-
+  
   version :medium do
     process resize_to_limit: [300, 300]
   end
@@ -19,4 +17,5 @@ class Sufia::AvatarUploader < CarrierWave::Uploader::Base
   def extension_white_list
     %w(jpg jpeg png gif bmp tif tiff)
   end
+  
 end

data/sufia-models/app/services/sufia/noid.rb

@@ -1,5 +1,14 @@
 module Sufia
   module Noid
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      ## This overrides the default behavior, which is to ask Fedora for a pid
+      # @see ActiveFedora::Sharding.assign_pid
+      def assign_pid(_)
+        Sufia::IdService.mint
+      end
+    end
 
     def noid
       Noid.noidify(self.pid)

data/sufia-models/config/locales/sufia.en.yml

@@ -1,5 +1,6 @@
 en:
   sufia:
     product_name:       "Sufia"
+    product_twitter_handle: "@HydraSphere"
     institution_name:   "Institution Name"
     institution_name_full: "The Institution Name"

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

@@ -0,0 +1,27 @@
+# -*- encoding : utf-8 -*-
+require 'rails/generators'
+
+class Sufia::Models::FulltextGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+
+  desc """
+This generator makes the following changes to your application:
+ 1. Copies solrconfig.xml into solr_conf/conf/
+ 2. Reconfigures jetty
+       """
+
+  def banner
+    say_status("warning", "GENERATING SUFIA FULL-TEXT", :yellow)
+  end
+
+  # Copy Sufia's solrconfig into the dir from which the jetty:config task pulls
+  # Sufia's solrconfig includes full-text extraction
+  def copy_solr_config
+    copy_file 'config/solrconfig.xml', 'solr_conf/conf/solrconfig.xml', force: true
+  end
+
+  # Copy config, schema, and jars into jetty dir if it exists
+  def reconfigure_jetty
+    rake "sufia:jetty:config" if File.directory?('jetty')
+  end
+end

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

@@ -15,6 +15,8 @@ This generator makes the following changes to your application:
  3. Creates the sufia.rb configuration file
  4. Generates mailboxer
  5. Generates usage stats config
+ 6. Installs Blacklight gallery
+ 7. Runs full-text generator
        """
 
   # Implement the required interface for Rails::Generators::Migration.
@@ -94,6 +96,11 @@ This generator makes the following changes to your application:
     generate "blacklight_gallery:install"
   end
 
+  # Sets up full-text indexing (Solr config + jars)
+  def full_text_indexing
+    generate "sufia:models:fulltext"
+  end
+
   private
 
   def better_migration_template(file)

data/sufia-models/lib/generators/sufia/models/templates/config/analytics.yml

@@ -2,8 +2,8 @@
 # To integrate your app with Google Analytics, uncomment the lines below and add your API key information.
 #
 # analytics:
-#   :app_name: GOOGLE_OAUTH_APP_NAME
-#   :app_version: GOOGLE_OAUTH_APP_VERSION
-#   :privkey_path: GOOGLE_OAUTH_PRIVATE_KEY_PATH
-#   :privkey_secret: GOOGLE_OAUTH_PRIVATE_KEY_SECRET
-#   :client_email: GOOGLE_OAUTH_CLIENT_EMAIL
+#   app_name: GOOGLE_OAUTH_APP_NAME
+#   app_version: GOOGLE_OAUTH_APP_VERSION
+#   privkey_path: GOOGLE_OAUTH_PRIVATE_KEY_PATH
+#   privkey_secret: GOOGLE_OAUTH_PRIVATE_KEY_SECRET
+#   client_email: GOOGLE_OAUTH_CLIENT_EMAIL

data/sufia-models/lib/generators/sufia/models/templates/config/solrconfig.xml

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<config>
+  <!-- NOTE: various comments and unused configuration possibilities have been purged
+     from this file.  Please refer to http://wiki.apache.org/solr/SolrConfigXml,
+     as well as the default solrconfig file included with Solr -->
+
+  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
+
+  <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
+
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+
+  <!-- solr lib dirs -->
+  <lib dir="../lib/contrib/analysis-extras/lib" />
+  <lib dir="../lib/contrib/analysis-extras/lucene-libs" />
+  <!-- for full-text indexing -->
+  <lib dir="../lib/contrib/extraction/lib" regex=".*\.jar" />
+
+  <dataDir>${solr.data.dir:}</dataDir>
+
+  <requestHandler name="search" class="solr.SearchHandler" default="true">
+    <!-- default values for query parameters can be specified, these
+         will be overridden by parameters in the request
+      -->
+     <lst name="defaults">
+       <str name="defType">edismax</str>
+       <str name="echoParams">explicit</str>
+       <str name="q.alt">*:*</str>
+       <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
+       <int name="qs">1</int>
+       <int name="ps">2</int>
+       <float name="tie">0.01</float>
+       <!-- this qf and pf are used by default, if not otherwise specified by
+            client. The default blacklight_config will use these for the
+            "keywords" search. See the author_qf/author_pf, title_qf, etc
+            below, which the default blacklight_config will specify for
+            those searches. You may also be interested in:
+            http://wiki.apache.org/solr/LocalParams
+       -->
+        <str name="qf">
+          id
+          all_text_timv
+          active_fedora_model_ssi
+          object_type_si
+        </str>
+        <str name="pf">
+          all_text_timv^10
+        </str>
+
+       <str name="author_qf">
+       </str>
+       <str name="author_pf">
+       </str>
+       <str name="title_qf">
+       </str>
+       <str name="title_pf">
+       </str>
+       <str name="subject_qf">
+       </str>
+       <str name="subject_pf">
+       </str>
+
+       <str name="fl">
+         *,
+         score
+       </str>
+
+       <str name="facet">true</str>
+       <str name="facet.mincount">1</str>
+       <str name="facet.limit">10</str>
+       <str name="facet.field">active_fedora_model_ssi</str>
+       <str name="facet.field">object_type_si</str>
+
+       <str name="spellcheck">true</str>
+       <str name="spellcheck.dictionary">default</str>
+       <str name="spellcheck.onlyMorePopular">true</str>
+       <str name="spellcheck.extendedResults">true</str>
+       <str name="spellcheck.collate">false</str>
+       <str name="spellcheck.count">5</str>
+
+     </lst>
+    <arr name="last-components">
+      <str>spellcheck</str>
+    </arr>
+  </requestHandler>
+
+  <requestHandler name="permissions" class="solr.SearchHandler" >
+    <lst name="defaults">
+      <str name="facet">off</str>
+      <str name="echoParams">all</str>
+      <str name="rows">1</str>
+      <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
+      <str name="fl">
+        id,
+        access_ssim,
+        discover_access_group_ssim,discover_access_person_ssim,
+        read_access_group_ssim,read_access_person_ssim,
+        edit_access_group_ssim,edit_access_person_ssim,
+        depositor_ti,
+        embargo_release_date_dtsi
+        inheritable_access_ssim,
+        inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim,
+        inheritable_read_access_group_ssim,inheritable_read_access_person_ssim,
+        inheritable_edit_access_group_ssim,inheritable_edit_access_person_ssim,
+        inheritable_embargo_release_date_dtsi
+      </str>
+    </lst>
+  </requestHandler>
+
+<requestHandler name="/update/extract" startup="lazy" class="org.apache.solr.handler.extraction.ExtractingRequestHandler" >
+    <lst name="defaults">
+      <!-- All the main content goes into "text"... if you need to return the extracted text or do highlighting, use a stored field. -->
+      <str name="fmap.content">text</str>
+      <str name="lowernames">true</str>
+      <str name="uprefix">ignored_</str>
+      <!-- capture link hrefs but ignore div attributes -->
+      <str name="captureAttr">true</str>
+      <str name="fmap.a">links</str>
+      <str name="fmap.div">ignored_</str>
+    </lst>
+ </requestHandler>
+
+  <requestHandler name="standard" class="solr.SearchHandler">
+     <lst name="defaults">
+       <str name="echoParams">explicit</str>
+       <str name="defType">lucene</str>
+     </lst>
+  </requestHandler>
+
+  <!-- for requests to get a single document; use id=666 instead of q=id:666 -->
+  <requestHandler name="document" class="solr.SearchHandler" >
+    <lst name="defaults">
+      <str name="echoParams">all</str>
+      <str name="fl">*</str>
+      <str name="rows">1</str>
+      <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
+    </lst>
+  </requestHandler>
+
+  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
+    <str name="queryAnalyzerFieldType">textSpell</str>
+    <!-- Multiple "Spell Checkers" can be declared and used by this component
+      (e.g. for title_spell field)
+      -->
+    <lst name="spellchecker">
+      <str name="name">default</str>
+      <str name="field">spell</str>
+      <str name="spellcheckIndexDir">./spell</str>
+      <str name="buildOnOptimize">true</str>
+    </lst>
+  </searchComponent>
+
+  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
+
+  <requestDispatcher handleSelect="true" >
+    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
+  </requestDispatcher>
+
+  <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
+  <requestHandler name="/update" class="solr.UpdateRequestHandler"  />
+  <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
+
+  <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
+    <lst name="invariants">
+      <str name="q">solrpingquery</str>
+    </lst>
+    <lst name="defaults">
+      <str name="echoParams">all</str>
+    </lst>
+  </requestHandler>
+
+  <!-- config for the admin interface -->
+  <admin>
+    <defaultQuery>search</defaultQuery>
+  </admin>
+
+</config>

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

@@ -11,6 +11,8 @@ Sufia.config do |config|
 
   config.max_days_between_audits = 7
 
+  config.max_notifications_for_dashboard = 5
+
   config.cc_licenses = {
     'Attribution 3.0 United States' => 'http://creativecommons.org/licenses/by/3.0/us/',
     'Attribution-ShareAlike 3.0 United States' => 'http://creativecommons.org/licenses/by-sa/3.0/us/',
@@ -108,7 +110,7 @@ Sufia.config do |config|
     if defined? BrowseEverything
       config.browse_everything = BrowseEverything.config
     else
-      logger.warn "BrowseEverything is not installed"
+      Rails.logger.warn "BrowseEverything is not installed"
     end
   rescue Errno::ENOENT
     config.browse_everything = nil

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

@@ -13,6 +13,7 @@ This generator for upgrading sufia-models from 3.7.2 to 4.0 makes the following
  1. Creates several database migrations if they do not exist in /db/migrate
  2. Runs the mailboxer upgrade generator
  3. Adds analytics to the sufia.rb configuration file
+ 4. Runs full-text generator
        """
 
   # Implement the required interface for Rails::Generators::Migration.
@@ -49,6 +50,7 @@ This generator for upgrading sufia-models from 3.7.2 to 4.0 makes the following
   # Upgrade mailboxer
   def install_mailboxer
     generate "mailboxer:namespacing_compatibility"
+    generate "mailboxer:install -s"
   end
 
   # Add config file for Google Analytics
@@ -66,6 +68,11 @@ This generator for upgrading sufia-models from 3.7.2 to 4.0 makes the following
       end
   end
 
+  # Sets up full-text indexing (Solr config + jars)
+  def full_text_indexing
+    generate "sufia:models:fulltext"
+  end
+
   private
 
   def better_migration_template(file)

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

@@ -0,0 +1,67 @@
+module Sufia
+  module Messages
+    extend ActiveSupport::Concern
+
+    # Borrowed from AbstractController so we can render html content tags
+    attr_accessor :output_buffer
+    include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::UrlHelper
+
+    def success_subject
+      I18n.t("sufia.messages.success.subject")
+    end
+
+    def failure_subject
+      I18n.t("sufia.messages.failure.subject")
+    end
+
+    def single_success id, file
+      content_tag :span, id: "ss-"+id do
+        [link_to_file(file), I18n.t("sufia.messages.success.single")].join(" ").html_safe
+      end
+    end
+
+    def multiple_success id, files
+      content_tag :span, id: "ss-"+id do
+        [success_link(files), I18n.t("sufia.messages.success.multiple.tag")].join(" ").html_safe
+      end
+    end
+
+    def single_failure id, file
+      content_tag :span, id: "ss-"+id do
+        [link_to_file(file), I18n.t("sufia.messages.failure.single")].join(" ").html_safe
+      end
+    end
+
+    def multiple_failure id, files
+      content_tag :span, id: "ss-"+id do
+        [failure_link(files), I18n.t("sufia.messages.failure.multiple.tag")].join(" ").html_safe
+      end
+    end
+
+    # Double-quotes are replaced with single ones so this list can be included in a data block. Ex:
+    #   <a href="#" data-content="<a href='#'>embedded link</a>" rel="popover">Click me</a>
+    def file_list files
+      files.map { |gf| link_to_file(gf) }.join(', ').gsub(/"/, "'")
+    end
+
+    def link_to_file file
+      link_to(file.to_s, Sufia::Engine.routes.url_helpers.generic_file_path(file.noid))
+    end
+
+    private
+
+    def success_link files
+      link_to I18n.t("sufia.messages.success.multiple.link"), "#", 
+        rel: "popover", 
+        data: { content: file_list(files).html_safe, title: I18n.t("sufia.messages.success.title") }
+    end
+
+    def failure_link files
+      link_to I18n.t("sufia.messages.failure.multiple.link"), "#", 
+        rel: "popover", 
+        data: { content: file_list(files).html_safe, title: I18n.t("sufia.messages.failure.title") }
+    end
+
+  end
+end

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

@@ -15,6 +15,8 @@ module Sufia
   end
 
   autoload :Utils, 'sufia/models/utils'
+  autoload :Permissions
+  autoload :Messages
 
   attr_writer :queue
 

data/sufia-models/lib/sufia/models/active_fedora/redis.rb

@@ -1,10 +1,4 @@
 module ActiveFedora
-  class UnsavedDigitalObject
-    def assign_pid
-      @pid ||= Sufia::IdService.mint
-    end
-  end
-
   class Base
     def stream
       Nest.new(self.class.name, $redis)[to_param]