sufia 2.0.1 → 3.0.0

data/app/controllers/single_use_link_controller.rb

@@ -73,7 +73,7 @@ class SingleUseLinkController < DownloadsController
   def lookup_hash
     id = params[:id]
     # invalid hash send not found
-    link = SingleUseLink.find_by_downloadKey(id) ||  not_found
+    link = SingleUseLink.where(downloadKey:id).first || not_found
 
     # expired hash send not found
     now = DateTime.now

data/app/helpers/sufia_helper.rb

@@ -96,8 +96,14 @@ module SufiaHelper
     if item.is_a? Array
       render_array_facet_value(facet_solr_field, item, options)
     end
-    path =sufia.url_for(add_facet_params_and_redirect(facet_solr_field, item.value).merge(:only_path=>true))
+    if params[:controller] == "dashboard"
+      path = sufia.url_for(add_facet_params_and_redirect(facet_solr_field, item.value).merge(:only_path=>true))
     (link_to_unless(options[:suppress_link], item.value, path, :class=>"facet_select") + " " + render_facet_count(item.hits)).html_safe
+    else 
+      # This is for controllers that use this helper method that are defined outside Sufia
+      path = url_for(add_facet_params_and_redirect(facet_solr_field, item.value).merge(:only_path=>true))
+    (link_to_unless(options[:suppress_link], item.value, path, :class=>"facet_select") + " " + render_facet_count(item.hits)).html_safe
+    end
   end
 
     # link_back_to_catalog(:label=>'Back to Search')

data/app/models/contact_form.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 require 'mail_form'
 
 class ContactForm < MailForm::Base

data/app/views/_user_util_links.html.erb

@@ -1,18 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
 <% if user_signed_in? %>
    <%= render :partial => 'users/notify_link' %>
   <a href="<%= sufia.profile_path(current_user) %>" class="btn btn-small " title="click for User Profile"><i class="icon-user">&nbsp;</i><%= current_user.name %></a>

data/app/views/batch_edits/_check_all.html.erb

@@ -3,7 +3,7 @@
       <%= check_box_tag 'check_all', 'yes', @all_checked, :disabled => ((@batch_size_on_other_page + @document_list.count) > @max_batch_size) %>
       <a class="dropdown-toggle"  data-toggle="dropdown" href="#"><span class="icon-cog" title="click for selection options"></span></a>
       <ul class="dropdown-menu">
-        <%= render partial:'batch_edits_actions' %>
+        <%= render partial: "#{controller_name}/batch_edits_actions" %>
       </ul>
     </div>
-  <% end %>
+  <% end %>

data/app/views/batch_edits/_delete_selected.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag(batch_edits_path, :method => :put, :class=> "batch-select-all hidden", "data-behavior" => 'batch-select-all') do -%>  
+<%= form_tag(batch_edits_path, :method => :delete, :class=> "batch-select-all hidden", "data-behavior" => 'batch-select-all') do -%>  
     <%= hidden_field_tag('update_type', 'delete_all') %>
   <%= submit_tag("Delete Selected", :class=>'batch-all-button btn btn-primary submits-batches', :data => { :confirm => "Deleting a file from #{t('sufia.product_name')} is permanent. Click OK to delete this file from #{t('sufia.product_name')}, or Cancel to cancel this operation"}) %>
 <% end %>

data/app/views/layouts/homepage.html.erb

@@ -17,7 +17,7 @@ limitations under the License.
 <!DOCTYPE html>
 <html>
   <head>
-    <%= render :partial => "layouts/head-tag-content"%>
+    <%= render :partial => "layouts/head_tag_content"%>
   </head>
 
 <body> 
@@ -53,4 +53,4 @@ limitations under the License.
 <%= render partial: '/footer' %>
 <div id="ajax-modal" class="modal hide" tabindex="-1"></div>
 </body>
-</html>
+</html>

data/app/views/layouts/sufia-one-column.html.erb

@@ -17,7 +17,7 @@ limitations under the License.
 <!DOCTYPE html>
 <html>
   <head>
-    <%= render :partial => "layouts/head-tag-content"%>
+    <%= render :partial => "layouts/head_tag_content"%>
   </head>
 
 <body> 

data/app/views/layouts/sufia-two-column.html.erb

@@ -17,7 +17,7 @@ limitations under the License.
 <!DOCTYPE html>
 <html>
   <head>
-    <%= render :partial => "layouts/head-tag-content"%>
+    <%= render :partial => "layouts/head_tag_content"%>
   </head>
 
 <body> 

data/app/views/users/edit.html.erb

@@ -21,7 +21,7 @@ $("a[rel=popover]").popover({ html: true });
 
 <h1>Edit Profile</h1>
 <div class="span45 well">
-  <%= form_for @user, :url => sufia.update_profile_path(URI.escape(@user.to_s, '@.')), :html => {:multipart => true, :class => 'form-horizontal' } do |f| %>
+  <%= form_for @user, :url => sufia.profile_path(URI.escape(@user.to_s, '@.')), :html => {:multipart => true, :class => 'form-horizontal' } do |f| %>
     <div class="control-group">
       <%= f.label :avatar, '<i class="icon-camera-retro"></i> Change picture'.html_safe, :class => "control-label" %>
       <div class="controls">

data/app/views/users/show.html.erb

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
   <h1 class="span110">
     <span class="span60">
     <%= image_tag @user.avatar.url(:thumb), :width => 100 %>
@@ -24,7 +8,7 @@ limitations under the License.
       <% if not signed_in? %>
         <!-- sign in to access social functions -->
       <% elsif current_user == @user %>
-        <a class="btn btn-primary" href="<%= sufia.edit_profile_path(URI.escape(@user.to_s, '@.')) %>"><i class="icon-edit"></i> Edit Your Profile </a>
+        <a class="btn btn-primary" href="<%= sufia.edit_profile_path(@user) %>"><i class="icon-edit"></i> Edit Your Profile </a>
       <% elsif current_user.following?(@user) %>
         <a class="btn btn-primary" href="<%= sufia.unfollow_user_path(@user.to_s) %>"><i class="icon-eye-close"></i> Unfollow </a>
       <% else %>

data/config/routes.rb

@@ -1,19 +1,19 @@
 Sufia::Engine.routes.draw do
-  match 'single_use_link/generate_download/:id' => 'single_use_link#generate_download', :as => :generate_download_single_use_link
-  match 'single_use_link/generate_show/:id' => 'single_use_link#generate_show', :as => :generate_show_single_use_link
-  match 'single_use_link/show/:id' => 'single_use_link#show', :as => :show_single_use_link
-  match 'single_use_link/download/:id' => 'single_use_link#download', :as => :download_single_use_link
+  get 'single_use_link/generate_download/:id' => 'single_use_link#generate_download', :as => :generate_download_single_use_link
+  get 'single_use_link/generate_show/:id' => 'single_use_link#generate_show', :as => :generate_show_single_use_link
+  get 'single_use_link/show/:id' => 'single_use_link#show', :as => :show_single_use_link
+  get 'single_use_link/download/:id' => 'single_use_link#download', :as => :download_single_use_link
 
-  match 'batch_edits/clear' => 'batch_edits#clear', :as => :batch_edits_clear
+  match 'batch_edits/clear' => 'batch_edits#clear', :as => :batch_edits_clear, via: [:get, :post]
 
   # Route path-less requests to the index view of catalog
   root :to => "catalog#index"
   
   # "Recently added files" route for catalog index view
-  match "catalog/recent" => "catalog#recent", :as => :catalog_recent
+  get "catalog/recent" => "catalog#recent", :as => :catalog_recent
 
   # "Notifications" route for catalog index view
-  match "users/notifications_number" => "users#notifications_number", :as => :user_notify
+  get "users/notifications_number" => "users#notifications_number", :as => :user_notify
 
   # Generic file routes
   resources :generic_files, :path => :files, :except => :index do
@@ -27,21 +27,19 @@ Sufia::Engine.routes.draw do
   resources :downloads, :only => "show"
 
   # Messages
-  match 'notifications' => 'mailbox#index', :as => :mailbox
-  match 'notifications/delete_all' => 'mailbox#delete_all', :as => :mailbox_delete_all
-  match 'notifications/:uid/delete' => 'mailbox#delete', :as => :mailbox_delete
+  get 'notifications' => 'mailbox#index', :as => :mailbox
+  match 'notifications/delete_all' => 'mailbox#delete_all', as: :mailbox_delete_all, via: [:get, :post]
+  match 'notifications/:uid/delete' => 'mailbox#delete', as: :mailbox_delete, via: [:get, :post]
 
   # User profile & follows
-  match 'users' => 'users#index', :as => :profiles
-  match 'users/:uid' => 'users#show', :as => :profile
-  match 'users/:uid/edit' => 'users#edit', :as => :edit_profile
-  match 'users/:uid/update' => 'users#update', :as => :update_profile, :via => :put
-  match "users/:uid/trophy" => "users#toggle_trophy", :as => :update_trophy_user, :via => :post
-
-
-
-  match 'users/:uid/follow' => 'users#follow', :as => :follow_user
-  match 'users/:uid/unfollow' => 'users#unfollow', :as => :unfollow_user
+  resources :users, only: [:index, :show, :edit, :update], as: :profiles
+  # get 'users' => 'users#index', :as => :profiles
+  # get 'users/:uid' => 'users#show', :as => :profile
+  # get 'users/:uid/edit' => 'users#edit', :as => :edit_profile
+  # put 'users/:uid/update' => 'users#update', :as => :update_profile
+  post "users/:id/trophy" => "users#toggle_trophy", :as => :update_trophy_user
+  match 'users/:id/follow' => 'users#follow', :as => :follow_user, via: [:get, :post]
+  match 'users/:id/unfollow' => 'users#unfollow', :as => :unfollow_user, via: [:get, :post]
 
   # Dashboard routes (based partly on catalog routes)
   resources 'dashboard', :only=>:index do
@@ -54,23 +52,23 @@ Sufia::Engine.routes.draw do
     
 
   # advanced routes for advanced search
-  match 'search' => 'advanced#index', :as => :advanced
+  get 'search' => 'advanced#index', :as => :advanced
 
   # Authority vocabulary queries route
-  match 'authorities/:model/:term' => 'authorities#query'
+  get 'authorities/:model/:term' => 'authorities#query'
 
   # LDAP-related routes for group and user lookups
-  match 'directory/user/:uid' => 'directory#user'
-  match 'directory/user/:uid/:attribute' => 'directory#user_attribute'
-  match 'directory/group/:cn' => 'directory#group', :constraints => { :cn => /.*/ }
+  get 'directory/user/:uid' => 'directory#user'
+  get 'directory/user/:uid/:attribute' => 'directory#user_attribute'
+  get 'directory/group/:cn' => 'directory#group', :constraints => { :cn => /.*/ }
 
   # Batch edit routes
-  match 'batches/:id/edit' => 'batch#edit', :as => :batch_edit
-  match 'batches/:id/' => 'batch#update', :as => :batch_generic_files
+  get 'batches/:id/edit' => 'batch#edit', :as => :batch_edit
+  post 'batches/:id/' => 'batch#update', :as => :batch_generic_files
 
   # Contact form routes
-  match 'contact' => 'contact_form#create', :via => :post, :as => :contact_form_index
-  match 'contact' => 'contact_form#new', :via => :get, :as => :contact_form_index
+  post 'contact' => 'contact_form#create', :as => :contact_form_index
+  get 'contact' => 'contact_form#new'
 
   # Resque monitoring routes. Don't bother with this route unless Sufia::ResqueAdmin
   # has been defined in the initalizers.
@@ -83,15 +81,15 @@ Sufia::Engine.routes.draw do
   end
 
   # Static page routes (workaround)
-  match ':action' => 'static#:action', :constraints => { :action => /about|help|terms|zotero|mendeley|agreement|subject_libraries|versions/ }, :as => :static
+  get ':action' => 'static#:action', :constraints => { :action => /about|help|terms|zotero|mendeley|agreement|subject_libraries|versions/ }, :as => :static
 
   #Single use link errors
-  match 'single_use_link/not_found' => 'errors#single_use_error'
-  match 'single_use_link/expired' => 'errors#single_use_error'
+  get 'single_use_link/not_found' => 'errors#single_use_error'
+  get 'single_use_link/expired' => 'errors#single_use_error'
 
   # Catch-all (for routing errors)
   unless Rails.env.development? || Rails.env.test?
-    match '*error' => 'errors#routing'
+    match '*error' => 'errors#routing', via: [:get, :post]
   end
   
 end

data/lib/generators/sufia/sufia_generator.rb

@@ -62,7 +62,7 @@ add_groups_to_users.rb		create_local_authorities.rb	create_trophies.rb}.each do
         "  \n# Adds Sufia behaviors into the application controller \n" +        
         "  include Sufia::Controller\n"
       end
-      gsub_file file_path, "layout 'blacklight'", "layout 'sufia-one-column'"
+      gsub_file file_path, "layout 'blacklight'", "layout :search_layout"
     else
       puts "     \e[31mFailure\e[0m  Could not find #{file_path}.  To add Sufia behaviors to your  Controllers, you must include the Sufia::Controller module in the Controller class definition." 
     end
@@ -86,9 +86,11 @@ add_groups_to_users.rb		create_local_authorities.rb	create_trophies.rb}.each do
     sentinel = /HydraHead.add_routes\(self\)/
     inject_into_file 'config/routes.rb', "\n  #{routing_code}\n", { :after => sentinel, :verbose => false }
 
-    routing_code = "mount Sufia::Engine => '/'"
+    routing_code = "\n  # This must be the very last route in the file because it has a catch all route for 404 errors.
+  # This behavior seems to show up only in production mode.
+  mount Sufia::Engine => '/'\n"
     sentinel = /devise_for :users/
-    inject_into_file 'config/routes.rb', "\n  #{routing_code}\n", { :after => sentinel, :verbose => false }
+    inject_into_file 'config/routes.rb', routing_code, { :after => sentinel, :verbose => false }
     
   end
 

data/lib/generators/sufia/templates/catalog_controller.rb

@@ -56,7 +56,7 @@ class CatalogController < ApplicationController
 
   def recent_me
     if user_signed_in?
-      (_, @recent_user_documents) = get_search_results(:q =>filter_not_mine,
+      (_, @recent_user_documents) = get_search_results(:q =>filter_mine,
                                         :sort=>sort_field, :rows=>4)
     end
   end
@@ -377,6 +377,10 @@ class CatalogController < ApplicationController
     "{!lucene q.op=AND df=#{depositor}}-#{current_user.user_key}"
   end
 
+  def filter_mine 
+    "{!lucene q.op=AND df=#{depositor}}#{current_user.user_key}"
+  end
+
   def sort_field
     "#{Solrizer.solr_name('system_create', :sortable)} desc"
   end

data/lib/generators/sufia/templates/config/redis_config.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 if defined?(PhusionPassenger)
   PhusionPassenger.on_event(:starting_worker_process) do |forked|
     # We're in smart spawning mode.
@@ -23,6 +9,7 @@ if defined?(PhusionPassenger)
       # The important two lines
       $redis.client.disconnect if $redis 
       $redis = Redis.new(host: config[:host], port: config[:port], thread_safe: true) rescue nil
+      Resque.redis = $redis
       Resque.redis.client.reconnect if Resque.redis
     end
   end

data/lib/sufia/batch_edits_controller_behavior.rb

@@ -34,7 +34,7 @@ module Sufia
 
        # map the permissions to parameter like input so that the assign will work
        # todo sort the access level some how...
-       perm_param ={'user'=>{},'group'=>{"public"=>"1"}}
+       perm_param ={'user'=>{},'group'=>{"public"=>"read"}}
        permissions.each{ |perm| perm_param[perm[:type]][perm[:name]] = perm[:access]}
        @show_file.permissions = HashWithIndifferentAccess.new(perm_param)
     end

data/lib/sufia/controller.rb

@@ -52,7 +52,7 @@ module Sufia::Controller
     @batches=[]
     return if action_name == "index" && controller_name == "mailbox"
     if user_signed_in? 
-      @notify_number= current_user.mailbox.inbox(:unread => true).count(:id, :distinct => true)
+      @notify_number= current_user.mailbox.inbox(:unread => true).count
       @batches=current_user.mailbox.inbox.map {|msg| msg.last_message.body[/<a class="batchid ui-helper-hidden">(.*)<\/a>The file(.*)/,1]}.select{|val| !val.blank?}
     end
   end

data/lib/sufia/dashboard_controller_behavior.rb

@@ -44,8 +44,14 @@ module Sufia
     end
 
     def index
-      extra_head_content << view_context.auto_discovery_link_tag(:rss, sufia.url_for(params.merge(:format => 'rss')), :title => "RSS for results")
-      extra_head_content << view_context.auto_discovery_link_tag(:atom, sufia.url_for(params.merge(:format => 'atom')), :title => "Atom for results")
+      if params[:controller] == "dashboard"
+        extra_head_content << view_context.auto_discovery_link_tag(:rss, sufia.url_for(params.merge(:format => 'rss')), :title => "RSS for results")
+        extra_head_content << view_context.auto_discovery_link_tag(:atom, sufia.url_for(params.merge(:format => 'atom')), :title => "Atom for results")
+      else
+        # This is for controllers that use this behavior that are defined outside Sufia
+        extra_head_content << view_context.auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss')), :title => "RSS for results")
+        extra_head_content << view_context.auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom')), :title => "Atom for results")
+      end
       (@response, @document_list) = get_search_results
       @user = current_user
       @events = @user.events(100)

data/lib/sufia/files_controller_behavior.rb

@@ -225,8 +225,7 @@ module Sufia
 
     # this is provided so that implementing application can override this behavior and map params to different attributes
     def update_metadata
-      valid_attributes = params[:generic_file].select { |k,v| (@generic_file.terms_for_editing + [:permissions]).include? k.to_sym}
-      @generic_file.attributes = valid_attributes
+      @generic_file.attributes = @generic_file.sanitize_attributes(params[:generic_file])
       @generic_file.set_visibility(params[:visibility])
       @generic_file.date_modified = DateTime.now
     end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "2.0.1"
+  VERSION = "3.0.0"
 end

data/spec/active_fedora/unsaved_digital_object_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ActiveFedora::UnsavedDigitalObject do
   it "should have an ARK-style pid" do    

data/spec/controllers/authorities_controller_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe AuthoritiesController do
   describe "#query" do

data/spec/controllers/batch_controller_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe BatchController do
   before do
@@ -48,7 +34,7 @@ describe BatchController do
     end
     it "should enqueue a batch update job" do
       params = {'generic_file' => {'read_groups_string' => '', 'read_users_string' => 'archivist1, archivist2', 'tag' => ['']}, 'id' => @batch.pid, 'controller' => 'batch', 'action' => 'update'}
-      s1 = stub('one')
+      s1 = double('one')
       BatchUpdateJob.should_receive(:new).with(@user.user_key, params).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
       post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"archivist1, archivist2", "tag"=>[""]}     
@@ -63,7 +49,15 @@ describe BatchController do
         flash[:notice].should include("Your files are being processed")
       end
     end
+    
     describe "when user has edit permissions on a file" do
+      it "should set the groups" do
+        post :update, :id=>@batch.pid, "generic_file"=>{"permissions"=>{"group"=>{"public"=>"1", "registered"=>"2"}}}
+        @file.reload.read_groups.should == []
+        @file.reload.edit_groups.should == []
+        response.should redirect_to @routes.url_helpers.dashboard_index_path
+      end
+
       it "should set the users with read access" do
         post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"archivist1, archivist2", "tag"=>[""]}
         file = GenericFile.find(@file.pid)