sufia 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffa4a49e5c8afcbf9f0ef5a16f0ed722505de7c0
-  data.tar.gz: 255f5e0b340379b077a64e2cee5b1db7d9dfa362
+  metadata.gz: 192f05ee63c1448500374b381283f9796bb6a864
+  data.tar.gz: 5017ed019cf96dd363991d15718c48599ae10fcb
 SHA512:
-  metadata.gz: 46d39fa82b03a024b14b1481c02cd631eb5948e476ea533bc43fcc8b8a52d97f83f6cf1cd1833f8f16960ac7993785653294c08c8e8cd037dd19dcc83de5bf27
-  data.tar.gz: 5e2acc470ce6e34839fa45707a2c9174fd34eaa42d64c025c5a8d19dc395023b7f6e925e26b75efae2cc96f1321ab637fd87ac9cb9d97c7e5fc84f326ccaa69c
+  metadata.gz: 00027897e9f28c13ece3f1413db477941479cb2f0bebb10b90e6ebb1c73d6834866a0aecb219fbdf9d31ceea73decaacb2028805de3d5846661256a7ac3c7966
+  data.tar.gz: c40470550b3593473d5bfb75caea483477d1640d8a76eeecb0f0060d4341768f251184663f02c81d8f22ad9b320b218cbfad5e241a5a7b0fa670c7db07f1e9a5

data/.travis.yml

@@ -15,3 +15,5 @@ notifications:
       - "irc.freenode.org#projecthydra"
     template:
       - "%{repository}//%{branch}@%{commit} by %{author}: %{message} - %{build_url}"
+services:
+  - redis-server

data/CONTRIBUTING.md

@@ -78,6 +78,8 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
 ### Submitting Changes
 
+[Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
+
 * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
 * Make sure your branch is up to date with its parent branch (i.e. master)
   * `git checkout master`

data/Gemfile

@@ -19,5 +19,10 @@ group :development, :test do
   gem 'bcrypt-ruby'
   gem "jettywrapper"
   gem "factory_girl_rails", "~> 4.2.1"
+  gem "devise"
+  gem 'jquery-rails'
+  gem 'sass-rails'
+  gem 'turbolinks'
+  gem "bootstrap-sass"
   gem "simplecov", :require => false
 end # (leave this comment here to catch a stray line inserted by blacklight!)

data/History.md

@@ -1,5 +1,22 @@
 # History of Sufia releases
 
+## 3.3.0
+* Fix authorities deprecations [Justin Coyne]
+* Fix deprecation on MailboxController [Justin Coyne]
+* blacklight 4.4.1/0 doesn't work with kaminari > 0.14.1 See projectblacklight/blacklight#614 [Justin Coyne]
+* Allow acts_as_follower to be 0.2.0 for Rails 4 support [Justin Coyne]
+* Don't run blacklight and hydra generator twice [Justin Coyne]
+* Remove deprecation warning on Rails 4 [Justin Coyne]
+* Updating CONTRIBUTING.md as per Hydra v6.0.0 [Jeremy Friesen]
+* use cancan to authorize and validate single-use tokens. [Chris Beer]
+* Add ImageMagick as a software requirement in the README. [Jessie Keck]
+* split SingleUseLinkController into the authenticated controller that creates links, and a viewer that handles retrieving content for token-bearing users [Chris Beer]
+* remove explicit GenericFile references, and replace them with Rails magic [Chris Beer]
+* Refactor single-use links for style and clarity [Chris Beer]
+* add more gems to the gemfile for running tests from the gem root [Chris Beer]
+* add redis-server to the .travis.yml list of  services [Chris Beer]
+* Fix typos in README.md [Jessie Keck]
+
 ## 3.2.1
 * Updating gemspec to not limit on sufia-models [Jeremy Friesen]
 

data/README.md

@@ -27,19 +27,19 @@ Sufia has the following features:
 
 ## Sufia needs the following software to work:
 1. Solr
-1. Fedora Commons
+1. [Fedora Commons](http://www.fedora-commons.org/) digital repository
 1. A SQL RDBMS (MySQL, SQLite)
 1. [Redis](http://redis.io/) key-value store
+1. [ImageMagick](http://www.imagemagick.org/)
 1. Ruby
-## !! Ensure that you have all of the above components installed before you continue. !!
+
+#### !! Ensure that you have all of the above components installed before you continue. !!
 
 ## Creating an application
 ### Generate base Rails install
 ```rails new my_app```
 ### Add gems to Gemfile
 ```
-gem 'blacklight'
-gem 'hydra-head'
 gem 'sufia'
 gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'  # required to handle pagination properly in dashboard. See https://github.com/amatsuda/kaminari/pull/322
 gem 'jettywrapper'
@@ -53,7 +53,7 @@ Note the line with kaminari listed as a dependency.  This is a temporary fix to
 ```
 rails g blacklight --devise
 rails g hydra:head -f
-bundle install 
+bundle install
 rails g sufia -f
 rm public/index.html
 ```
@@ -116,7 +116,7 @@ resque-pool --daemon --environment development start
 
 See https://github.com/defunkt/resque for more options
 
-### If you want to enable transcoding of video, instal ffmpeg version 1.0+
+### If you want to enable transcoding of video, install ffmpeg version 1.0+
 #### On a mac
 Use homebrew:
 ```

data/SUFIA_VERSION

@@ -1 +1 @@
-3.2.1
+3.3.0

data/app/controllers/mailbox_controller.rb

@@ -3,8 +3,7 @@ class MailboxController < ApplicationController
 
   def index
     if user_signed_in?
-      inbox = current_user.mailbox.inbox
-      @messages = inbox.all
+      @messages = current_user.mailbox.inbox
       current_user.mark_as_read @messages
     else
       @messages =[]

data/app/controllers/single_use_links_controller.rb

@@ -0,0 +1,40 @@
+require 'sufia/single_use_error'
+
+class SingleUseLinksController < ApplicationController
+  include Sufia::Noid
+
+  prepend_before_filter :normalize_identifier
+  before_filter :load_asset
+  before_filter :authenticate_user!
+  before_filter :authorize_user!
+
+  def new_download
+    @su = SingleUseLink.create :itemId => params[:id], :path => sufia.download_path(:id => @asset)
+    @link = sufia.download_single_use_link_path(@su.downloadKey)
+
+    respond_to do |format|
+      format.html
+      format.js  { render :js => @link }
+    end
+  end
+
+  def new_show
+    @su = SingleUseLink.create :itemId => params[:id], :path => sufia.polymorphic_path(@asset)
+    @link = sufia.show_single_use_link_path(@su.downloadKey)
+
+    respond_to do |format|
+      format.html
+      format.js  { render :js => @link }
+    end
+  end
+
+  protected
+  def authorize_user!
+    authorize! :read, @asset
+  end
+
+  def load_asset
+    @asset = ActiveFedora::Base.load_instance_from_solr(params[:id])
+  end
+
+end

data/app/controllers/single_use_links_viewer_controller.rb

@@ -0,0 +1,73 @@
+require 'sufia/single_use_error'
+
+class SingleUseLinksViewerController < ApplicationController
+
+  include Sufia::DownloadsControllerBehavior
+
+  skip_filter :normalize_identifier
+  skip_before_filter :load_datastream, :except => :download
+
+  before_filter :authorize_single_use_link!
+
+  class Ability
+    include CanCan::Ability
+
+    attr_reader :single_use_link
+
+    def initialize(user, single_use_link)
+      @user = user || User.new
+
+      @single_use_link = single_use_link
+
+      can :read, ActiveFedora::Base do |obj|
+        single_use_link.valid? and
+          single_use_link.itemId == obj.pid and single_use_link.destroy!
+      end if single_use_link
+
+    end
+  end
+
+  rescue_from Sufia::SingleUseError, :with => :render_single_use_error
+  rescue_from CanCan::AccessDenied, :with => :render_single_use_error
+  rescue_from ActiveRecord::RecordNotFound, :with => :render_single_use_error
+
+
+  def download
+    # send the data content
+    raise not_found_exception unless single_use_link.path == sufia.download_path(:id => @asset)
+    send_content(asset)
+  end
+
+  def show
+    raise not_found_exception unless single_use_link.path == sufia.polymorphic_path(@asset)
+
+    #show the file
+    @terms = @asset.terms_for_display
+
+    # create a dowload link that is single use for the user since we do not just want to show metadata we want to access it too
+    @su = single_use_link.create_for_path sufia.download_path(:id => @asset)
+    @download_link = sufia.download_single_use_link_path(@su.downloadKey)
+  end
+
+  protected
+
+  def authorize_single_use_link!
+    authorize! :read, @asset
+  end
+
+  def single_use_link
+    @single_use_link ||= SingleUseLink.find_by_downloadKey! params[:id]
+  end
+
+  def not_found_exception
+    Sufia::SingleUseError.new('Single-Use Link Not Found')
+  end
+
+  def load_asset
+    @asset = ActiveFedora::Base.load_instance_from_solr(single_use_link.itemId)
+  end
+
+  def current_ability
+    @current_ability ||= SingleUseLinksViewerController::Ability.new current_user, single_use_link
+  end
+end

data/app/views/single_use_links/new_download.html.erb

@@ -0,0 +1,5 @@
+<div class="single-use-link">
+<h1>Single Use Link</h1>
+<p>Anyone can use the following link once to download the file</p>
+<%= link_to @asset, @link, :class => 'download-link' %> <%= link_to raw('<i class="icon-link icon-large"></i>'), '#', :class => 'copypaste itemicon itemcode', :title => 'Copy File URL', :id => "copy_link_#{@asset.pid}" %>
+</div>

data/app/views/{single_use_link/generate_show.html.erb → single_use_links/new_show.html.erb}

@@ -1,3 +1,5 @@
+<div class="single-use-link">
 <h1>Single Use Link</h1>
 <p>Anyone can use the following link once to view the file metadata</p>
-<%= link_to @generic_file, @link %>
+<%= link_to @asset, @link %>
+</div>

data/app/views/{single_use_link → single_use_links_viewer}/show.html.erb

@@ -1,5 +1,5 @@
 <div >
-  <h1 class="lower"><%= @generic_file %></h1>
+  <h1 class="lower"><%= @asset %></h1>
     <h2 class="non lower">Actions</h2>
     <p>
       <%= link_to "Download (can only be used once)", @download_link %>
@@ -10,7 +10,7 @@
       <table class="table table-striped"><!-- class="verticalheadings"> -->
       <tbody>
       <% @terms.each do |term| %>
-        <% vals =  Array( @generic_file.send(term)) %>
+        <% vals =  Array( @asset.send(term)) %>
             <tr id='row_<%=term.to_s%>' class="expandable">
               <th width="20%">
                 <%=get_label(term)%>

data/config/routes.rb

@@ -1,8 +1,8 @@
 Sufia::Engine.routes.draw do
-  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
+  get 'single_use_link/generate_download/:id' => 'single_use_links#new_download', :as => :generate_download_single_use_link
+  get 'single_use_link/generate_show/:id' => 'single_use_links#new_show', :as => :generate_show_single_use_link
+  get 'single_use_link/show/:id' => 'single_use_links_viewer#show', :as => :show_single_use_link
+  get 'single_use_link/download/:id' => 'single_use_links_viewer#download', :as => :download_single_use_link
 
   match 'batch_edits/clear' => 'batch_edits#clear', :as => :batch_edits_clear, via: [:get, :post]
 

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "3.2.1"
+  VERSION = "3.3.0"
 end

data/spec/controllers/single_use_links_controller_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe SingleUseLinksController do
+  before(:all) do
+    @user = FactoryGirl.find_or_create(:user)
+    @file = GenericFile.new
+    @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+    @file.apply_depositor_metadata(@user)
+    @file.save
+    @file2 = GenericFile.new
+    @file2.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+    @file2.apply_depositor_metadata('mjg36')
+    @file2.save
+  end
+  after(:all) do
+    @file.delete
+    @file2.delete
+    SingleUseLink.delete_all
+  end
+  before do
+    controller.stub(:has_access?).and_return(true)
+    controller.stub(:clear_session_user) ## Don't clear out the authenticated session
+  end
+  describe "logged in user" do
+    before do
+      @user = FactoryGirl.find_or_create(:user)
+      sign_in @user
+      @now = DateTime.now
+      DateTime.stub(:now).and_return(@now)
+      @hash = "some-dummy-sha2-hash" 
+      Digest::SHA2.should_receive(:new).and_return(@hash)
+    end
+
+    describe "GET 'download'" do
+      it "and_return http success" do
+        get 'new_download', id:@file.pid
+        response.should be_success
+        assigns[:link].should == @routes.url_helpers.download_single_use_link_path(@hash)
+      end
+
+    end
+  
+    describe "GET 'show'" do
+      it "and_return http success" do
+        get 'new_show', id:@file.pid
+        response.should be_success
+        assigns[:link].should == @routes.url_helpers.show_single_use_link_path(@hash)
+      end
+
+    end   
+  end
+
+  describe "unkown user" do
+    describe "GET 'download'" do
+      it "and_return http failure" do
+        get 'new_download', id:@file.pid
+        response.should_not be_success
+      end
+    end
+  
+    describe "GET 'show'" do
+      it "and_return http failure" do
+        get 'new_show', id:@file.pid
+        response.should_not be_success
+      end
+    end   
+  end
+
+end

data/spec/controllers/{single_use_link_controller_spec.rb → single_use_links_viewer_controller_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SingleUseLinkController do
+describe SingleUseLinksViewerController do
   before(:all) do
     @user = FactoryGirl.find_or_create(:user)
     @file = GenericFile.new
@@ -13,65 +13,32 @@ describe SingleUseLinkController do
     @file2.save
   end
   after(:all) do
-    SingleUseLink.delete_all
-    @user.delete
     @file.delete
     @file2.delete
+    SingleUseLink.delete_all
   end
   before do
     controller.stub(:has_access?).and_return(true)
     controller.stub(:clear_session_user) ## Don't clear out the authenticated session
   end
-  describe "logged in user" do
-    before do
-      @user = FactoryGirl.find_or_create(:user)
-      sign_in @user
-      @now = DateTime.now
-      DateTime.stub(:now).and_return(@now)
-      @hash = "sha2hash"+@now.to_f.to_s 
-      Digest::SHA2.should_receive(:new).and_return(@hash)
+  
+  describe "retrieval links" do
+    let :show_link do
+      SingleUseLink.create itemId: @file.pid, path: Sufia::Engine.routes.url_helpers.generic_file_path(:id => @file)
     end
-    after do
-      sign_out @user
-      SingleUseLink.find(:all).each{ |l| l.delete}
-      @user.delete
+
+    let :download_link do
+      SingleUseLink.create itemId: @file.pid, path: Sufia::Engine.routes.url_helpers.download_path(:id => @file)
     end
-    describe "GET 'generate_download'" do
-      it "and_return http success" do
-        get 'generate_download', id:@file.pid
-        response.should be_success
-        assigns[:link].should == @routes.url_helpers.download_single_use_link_path(@hash)
-      end
+
+    let :show_link_hash do
+      show_link.downloadKey
     end
-  
-    describe "GET 'generate_show'" do
-      it "and_return http success" do
-        get 'generate_show', id:@file.pid
-        response.should be_success
-        assigns[:link].should == @routes.url_helpers.show_single_use_link_path(@hash)
-      end
-    end   
-  end
-  describe "unkown user" do
-    describe "GET 'generate_download'" do
-      it "and_return http failure" do
-        get 'generate_download', id:@file.pid
-        response.should_not be_success
-      end
+
+    let :download_link_hash do
+      download_link.downloadKey
     end
-  
-    describe "GET 'generate_show'" do
-      it "and_return http failure" do
-        get 'generate_show', id:@file.pid
-        response.should_not be_success
-      end
-    end   
-  end
-  describe "retrieval links" do
-    before (:each) do
-      @dhash = SingleUseLink.create_download(@file.pid).downloadKey
-      @shash = SingleUseLink.create_show(@file.pid).downloadKey
-    end    
+
     before (:each) do
       @user.delete
     end
@@ -80,40 +47,42 @@ describe SingleUseLinkController do
         controller.stub(:render)
         expected_content = ActiveFedora::Base.find(@file.pid).content.content
         controller.should_receive(:send_file_headers!).with({:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
-        get :download, id:@dhash 
+        get :download, id:download_link_hash 
         response.body.should == expected_content
         response.should be_success
       end
       it "and_return 404 on second attempt" do
-        get :download, id:@dhash 
+        get :download, id:download_link_hash
         response.should be_success
-        get :download, id:@dhash
+        get :download, id:download_link_hash
         response.should render_template('error/single_use_error') 
       end
       it "and_return 404 on attempt to get download with show" do
-        get :download, id:@dhash
+        get :download, id:download_link_hash
         response.should be_success
-        get :download, id:@dhash
+        get :show, id:download_link_hash
         response.should render_template('error/single_use_error')
       end
     end
 
     describe "GET 'show'" do
       it "and_return http success" do
-        get 'show', id:@shash
+
+        get 'show', id:show_link_hash
         response.should be_success
-        assigns[:generic_file].pid.should == @file.pid
+        assigns[:asset].pid.should == @file.pid
       end
       it "and_return 404 on second attempt" do
-        get :show, id:@shash 
+        get :show, id:show_link_hash
         response.should be_success
-        get :show, id:@shash
+        get :show, id:show_link_hash
         response.should render_template('error/single_use_error')
       end
       it "and_return 404 on attempt to get show path with download hash" do
-        get :show, id:@dhash
+        get :show, id:download_link_hash
         response.should render_template('error/single_use_error')
       end
     end
   end
+
 end

data/spec/features/single_use_links_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe "Create and use single-use links" do
+  include Warden::Test::Helpers
+  Warden.test_mode!
+  include Sufia::Engine.routes.url_helpers
+
+  before do
+    user = User.find_by_email('jilluser@example.com') || FactoryGirl.create(:user)
+    
+    login_as(user, :scope => :user)
+
+    
+    @file = GenericFile.new
+    @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+    @file.apply_depositor_metadata(user)
+    @file.save
+  end
+
+  it "should generate a single-use link to show the record" do
+    visit generate_show_single_use_link_path(:id => @file)
+    
+    expect(page).to have_css '.single-use-link a'
+    find('.single-use-link a').click
+    expect(page).to have_content 'world.png'
+    expect(page).to have_content "Download (can only be used once)"
+  end
+
+  it "should download the file contents" do
+
+    visit generate_download_single_use_link_path(:id => @file)
+
+    expect(page).to have_css '.download-link'
+    find('.download-link').click
+    expected_content = ActiveFedora::Base.find(@file.pid).content.content
+    expect(page.body).to eq expected_content
+  end
+end

data/spec/models/single_use_link_spec.rb

@@ -1,15 +1,19 @@
 require 'spec_helper'
 
 describe SingleUseLink do
-  before (:all) do
+  before(:all) do
     @file = GenericFile.new
     @file.apply_depositor_metadata('mjg36')
     @file.save
   end
+
   after (:all) do
-    SingleUseLink.find(:all).each{ |l| l.delete}
     @file.delete
   end
+
+  let(:file) do
+    @file
+  end
   
   describe "create" do
      before do
@@ -20,35 +24,32 @@ describe SingleUseLink do
         
      end
      it "should create show link" do
-        su = SingleUseLink.create_show( @file.pid)
+        su = SingleUseLink.create itemId: file.pid, path: Sufia::Engine.routes.url_helpers.generic_file_path(file.pid)
         su.downloadKey.should == @hash
-        su.itemId.should == @file.pid
-        su.path.should == Sufia::Engine.routes.url_helpers.generic_file_path(@file.pid)
+        su.itemId.should == file.pid
+        su.path.should == Sufia::Engine.routes.url_helpers.generic_file_path(file.pid)
         su.delete
      end 
      it "should create show download link" do
-        su = SingleUseLink.create_download( @file.pid)
+        su = SingleUseLink.create itemId: file.pid, path: Sufia::Engine.routes.url_helpers.download_path(file.pid)
         su.downloadKey.should == @hash
-        su.itemId.should == @file.pid
-        su.path.should == Sufia::Engine.routes.url_helpers.download_path(@file.pid)        
+        su.itemId.should == file.pid
+        su.path.should == Sufia::Engine.routes.url_helpers.download_path(file.pid)
         su.delete
      end 
   end
   describe "find" do
      describe "not expired" do
        before do
-          @su = SingleUseLink.create(downloadKey:'sha2hashb', itemId:@file.pid, path:Sufia::Engine.routes.url_helpers.download_path(@file.noid), expires:DateTime.now.advance(:hours => 1))
-       end
-       after do
-          @su.delete
+          @su = SingleUseLink.create(downloadKey:'sha2hashb', itemId:file.pid, path:Sufia::Engine.routes.url_helpers.download_path(file.noid), expires:DateTime.now.advance(:hours => 1))
        end
        it "should retrieve link" do
           link = SingleUseLink.where(downloadKey:'sha2hashb').first
-          link.itemId.should == @file.pid
+          link.itemId.should == file.pid
        end 
        it "should retrieve link with find_by" do
           link = SingleUseLink.find_by_downloadKey('sha2hashb')
-          link.itemId.should == @file.pid
+          link.itemId.should == file.pid
        end 
        it "should expire link" do
           link = SingleUseLink.where(downloadKey:'sha2hashb').first
@@ -57,11 +58,11 @@ describe SingleUseLink do
      end
      describe "expired" do
        before do
-          @su = SingleUseLink.create(downloadKey:'sha2hashb', itemId:@file.pid, path:Sufia::Engine.routes.url_helpers.download_path(@file.noid), expires:DateTime.now.advance(:hours => -1))
-       end
-       after do
-          @su.delete
+          @su = SingleUseLink.create!(downloadKey:'sha2hashb', itemId:file.pid, path:Sufia::Engine.routes.url_helpers.download_path(file.noid))
+
+          @su.update_attribute :expires, DateTime.now.advance(:hours => -1)
        end
+
        it "should expire link" do
           link = SingleUseLink.where(downloadKey:'sha2hashb').first
           link.expired?.should == true        

data/spec/support/lib/generators/test_app_generator.rb

@@ -3,18 +3,6 @@ require 'rails/generators'
 class TestAppGenerator < Rails::Generators::Base
   source_root File.expand_path("../../../../support", __FILE__)
 
-  def run_blacklight_generator
-    say_status("warning", "GENERATING BL", :yellow)       
-
-    generate 'blacklight', '--devise'
-  end
-
-  def run_hydra_head_generator
-    say_status("warning", "GENERATING HH", :yellow)       
-
-    generate 'hydra:head', '-f'
-  end
-
   def run_sufia_generator
     say_status("warning", "GENERATING SUFIA", :yellow)       
 

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

@@ -2,5 +2,9 @@ class DomainTerm < ActiveRecord::Base
   deprecated_attr_accessible  :model, :term
 
   # TODO we should add an index on this join table and remove the uniq query
-  has_and_belongs_to_many :local_authorities, :uniq=> true 
+  if Rails::VERSION::MAJOR > 3
+    has_and_belongs_to_many :local_authorities, -> {uniq}
+  else
+    has_and_belongs_to_many :local_authorities, :uniq=> true 
+  end
 end

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

@@ -2,9 +2,15 @@ require 'rdf'
 require 'rdf/rdfxml'
 
 class LocalAuthority < ActiveRecord::Base
-  deprecated_attr_accessible  :name
-  # TODO we should add an index on this join table and remove the uniq query
-  has_and_belongs_to_many :domain_terms, :uniq=> true 
+  deprecated_attr_accessible :name
+
+  if Rails::VERSION::MAJOR >= 4
+    # TODO we should add an index on this join table and remove the uniq query
+    has_and_belongs_to_many :domain_terms, -> { uniq }
+  else
+    has_and_belongs_to_many :domain_terms, :uniq=> true 
+  end
+  
   has_many :local_authority_entries
 
   def self.harvest_rdf(name, sources, opts = {})
@@ -57,7 +63,7 @@ class LocalAuthority < ActiveRecord::Base
     authority = self.find_by_name(name)
     return if authority.blank?
     model = model.to_s.sub(/RdfDatastream$/, '').underscore.pluralize
-    domain_term = DomainTerm.find_or_create_by_model_and_term(:model => model, :term => term)
+    domain_term = DomainTerm.find_or_create_by(model: model, term: term)
     return if domain_term.local_authorities.include? authority
     domain_term.local_authorities << authority
   end

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

@@ -1,25 +1,44 @@
 class SingleUseLink < ActiveRecord::Base
 
-  deprecated_attr_accessible  :downloadKey, :expires, :itemId, :path
+  deprecated_attr_accessible :downloadKey, :path, :expires, :itemId
     
-  
-  def self.create_show(item_id)
-     create_path(item_id, Sufia::Engine.routes.url_helpers.generic_file_path(item_id) )     
-  end
+  validate :expiration_date_cannot_be_in_the_past
+  validate :cannot_be_destroyed
+
+  after_initialize :set_defaults
 
-  def self.create_download(item_id)
-     create_path(item_id, Sufia::Engine.routes.url_helpers.download_path(item_id) )
+  def create_for_path path
+    self.class.create :itemId => itemId, :path => path
   end
-  
+
   def expired?
-     now = DateTime.now
-     return (now > expires)
+    DateTime.now > expires
   end
-  
+
+
+  def to_param
+    downloadKey
+  end
+
   protected
-  def self.create_path(itemId, path)
-     expires = DateTime.now.advance(hours:24)
-     key = Digest::SHA2.new << rand(1000000000).to_s
-     return create({downloadKey:key.to_s, expires:expires, path:path, itemId:itemId} )
+
+  def expiration_date_cannot_be_in_the_past
+    if expired?
+       errors.add(:expires, "can't be in the past")
+    end
+  end
+
+  def cannot_be_destroyed
+    if destroyed?
+      errors[:base] << "Single Use Link has already been used"
+    end
   end
-end
+
+  def set_defaults
+    if new_record?
+      self.expires ||= DateTime.now.advance(hours:24)
+      self.downloadKey ||= (Digest::SHA2.new << rand(1000000000).to_s).to_s
+    end
+  end
+
+end

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

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.2.1"
+    VERSION = "3.3.0"
   end
 end

data/sufia-models/sufia-models.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'resque-pool', '0.3.0'
   spec.add_dependency 'noid', '~> 0.6.6'
   spec.add_dependency 'mailboxer', '~> 0.11.0'
-  spec.add_dependency 'acts_as_follower', '0.1.1'
+  spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
   spec.add_dependency 'paperclip', '~> 3.4.0'
   spec.add_dependency 'zipruby', '0.3.6'
   spec.add_dependency 'hydra-derivatives', '~> 0.0.5'

data/sufia.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.license       = 'APACHE2'
 
   gem.add_dependency 'sufia-models', version
-  gem.add_dependency 'blacklight', '~> 4.0'
+  gem.add_dependency 'blacklight', '~> 4.0', '< 4.4' # blacklight 4.4.1/0 doesn't work with kaminari > 0.14.1
   gem.add_dependency 'blacklight_advanced_search', '~> 2.1.0'
 
   gem.add_dependency 'hydra-batch-edit', '~> 1.0'

data/tasks/release.rake

@@ -32,7 +32,6 @@ tag     = "v#{version}"
         File.open(file, 'w') { |f| f.write ruby }
       end
     end
-    task :pkg
     task gem => %w(update_version_rb pkg) do
       cmd = ""
       cmd << "cd #{framework} && " unless framework == "sufia"
@@ -48,7 +47,7 @@ tag     = "v#{version}"
     task :prep_release => [:ensure_clean_state, :build]
 
     task :push => :build do
-      # sh "gem push #{gem}"
+      sh "gem push #{gem}"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +31,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -268,7 +274,8 @@ files:
 - app/controllers/errors_controller.rb
 - app/controllers/generic_files_controller.rb
 - app/controllers/mailbox_controller.rb
-- app/controllers/single_use_link_controller.rb
+- app/controllers/single_use_links_controller.rb
+- app/controllers/single_use_links_viewer_controller.rb
 - app/controllers/static_controller.rb
 - app/controllers/users_controller.rb
 - app/helpers/batch_edits_helper.rb
@@ -445,9 +452,9 @@ files:
 - app/views/layouts/sufia-one-column.html.erb
 - app/views/layouts/sufia-two-column.html.erb
 - app/views/mailbox/index.html.erb
-- app/views/single_use_link/generate_download.html.erb
-- app/views/single_use_link/generate_show.html.erb
-- app/views/single_use_link/show.html.erb
+- app/views/single_use_links/new_download.html.erb
+- app/views/single_use_links/new_show.html.erb
+- app/views/single_use_links_viewer/show.html.erb
 - app/views/static/about.html.erb
 - app/views/static/agreement.html.erb
 - app/views/static/help.html.erb
@@ -516,7 +523,8 @@ files:
 - spec/controllers/downloads_controller_spec.rb
 - spec/controllers/generic_files_controller_spec.rb
 - spec/controllers/mailbox_controller_spec.rb
-- spec/controllers/single_use_link_controller_spec.rb
+- spec/controllers/single_use_links_controller_spec.rb
+- spec/controllers/single_use_links_viewer_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/factories/checksum_audit_logs.rb
 - spec/factories/single_use_links.rb
@@ -526,6 +534,7 @@ files:
 - spec/features/contact_form.rb
 - spec/features/display_dashboard.rb
 - spec/features/ingest_upload_files.rb
+- spec/features/single_use_links_spec.rb
 - spec/features/users_spec.rb
 - spec/fixtures/4-20.png
 - spec/fixtures/Example.ogg
@@ -754,7 +763,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -770,7 +779,8 @@ test_files:
 - spec/controllers/downloads_controller_spec.rb
 - spec/controllers/generic_files_controller_spec.rb
 - spec/controllers/mailbox_controller_spec.rb
-- spec/controllers/single_use_link_controller_spec.rb
+- spec/controllers/single_use_links_controller_spec.rb
+- spec/controllers/single_use_links_viewer_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/factories/checksum_audit_logs.rb
 - spec/factories/single_use_links.rb
@@ -780,6 +790,7 @@ test_files:
 - spec/features/contact_form.rb
 - spec/features/display_dashboard.rb
 - spec/features/ingest_upload_files.rb
+- spec/features/single_use_links_spec.rb
 - spec/features/users_spec.rb
 - spec/fixtures/4-20.png
 - spec/fixtures/Example.ogg
@@ -866,3 +877,4 @@ test_files:
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
 - spec/views/batch_edits/check_all_spec.rb
+has_rdoc: 

data/app/controllers/single_use_link_controller.rb

@@ -1,95 +0,0 @@
-require 'sufia/single_use_error'
-
-class SingleUseLinkController < DownloadsController
-  before_filter :authenticate_user!, :except => [:download, :show]
-  before_filter :find_file, :only => [:generate_download, :generate_show]
-  before_filter :authorize_user!, :only => [:generate_download, :generate_show]
-  skip_filter :normalize_identifier, :load_asset, :load_datastream
-  prepend_before_filter :normalize_identifier, :except => [:download, :show]
-  rescue_from Sufia::SingleUseError, :with => :render_single_use_error
-
-  def generate_download
-    @su =  SingleUseLink.create_download(params[:id])
-    @link =  sufia.download_single_use_link_path(@su.downloadKey)
-    respond_to do |format|
-      format.html
-      format.js  {render :js => @link}
-    end
-  end
-
-  def generate_show
-    @su = SingleUseLink.create_show(params[:id])
-    @link = sufia.show_single_use_link_path(@su.downloadKey)
-    respond_to do |format|
-      format.html
-      format.js  {render :js => @link}
-    end
-  end
-
-  def download
-    #look up the item
-    link = lookup_hash
-
-    #grab the item id
-    id = link.itemId
-
-    #check to make sure the path matches
-    not_found if link.path != sufia.download_path(id)
-
-    # send the data content
-    @asset = GenericFile.load_instance_from_solr(id)
-    load_datastream
-    send_content(asset)
-  end
-
-  def show
-    link = lookup_hash
-
-    #grab the item id
-    id = link.itemId
-
-    #check to make sure the path matches
-    not_found if link.path != sufia.generic_file_path(id)
-
-    #show the file
-    @generic_file = GenericFile.load_instance_from_solr(id)
-    @terms = @generic_file.terms_for_display
-
-    # create a dowload link that is single use for the user since we do not just want to show metadata we want to access it too
-    @su =  SingleUseLink.create_download(id)
-    @download_link =  sufia.download_single_use_link_path(@su.downloadKey)
-  end
-
-  protected
-
-  def authorize_user!
-    authorize! :read, @generic_file
-  end
-
-  def find_file
-    @generic_file = GenericFile.load_instance_from_solr(params[:id])
-  end
-
-  def lookup_hash
-    id = params[:id]
-    # invalid hash send not found
-    link = SingleUseLink.where(downloadKey:id).first || not_found
-
-    # expired hash send not found
-    now = DateTime.now
-    not_found if link.expires <= now
-
-    # delete the link since it has been used
-    link.destroy
-
-    return link
-  end
-
-  def not_found
-    raise Sufia::SingleUseError.new('Single-Use Link Not Found')
-  end
-
-  def expired
-    raise Sufia::SingleUseError.new('Single-Use Link Expired')
-  end
-end

data/app/views/single_use_link/generate_download.html.erb

@@ -1,3 +0,0 @@
-<h1>Single Use Link</h1>
-<p>Anyone can use the following link once to download the file</p>
-<%= link_to @generic_file, @link %> <%= link_to raw('<i class="icon-link icon-large"></i>'), '#', :class => 'copypaste itemicon itemcode', :title => 'Copy File URL', :id => "copy_link_#{@generic_file.pid}" %>