sufia 0.0.8 → 0.1.0

data/Gemfile

@@ -3,6 +3,7 @@ source 'http://rubygems.org'
 # Please see sufia.gemspec for dependency information.
 gemspec
 
+gem 'hydra-head', github: 'projecthydra/hydra-head'
 #gem 'mail_form', :git => 'git://github.com/psu-stewardship/mail_form.git', :ref => '50c00f0'
 group :development, :test do
   gem 'sqlite3'

data/app/controllers/users_controller.rb

@@ -69,7 +69,7 @@ class UsersController < ApplicationController
   def toggle_trophy    
      id = params[:file_id]
      id = "#{Sufia::Engine.config.id_namespace}:#{id}" unless id.include?(":")
-     unless current_user.can? :edit, permissions_solr_doc_for_id(id)
+     unless current_user.can? :edit, id
        redirect_to root_path, alert: "You do not have permissions to the file"
        return false
      end

data/app/views/catalog/_home.html.erb

@@ -1,6 +1,2 @@
 <%# render :partial=>'search_form' %>
 <%= render :partial=>'home_text' %>
-
-<% sidebar_items << capture do %>
-  <%= render :partial=>'facets' %>
-<% end %>

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

@@ -18,8 +18,5 @@
 <div class="<%= params[:action]%>_details">
   <%= render :partial => "#{params[:controller]}/_#{params[:action]}_partials/default_details", :locals => {:document => document}%>
 </div>
-<% sidebar_items << capture do %>
-  <%#= render :partial=>"catalog/_show_partials/facets", :locals=>{:document=>document, :facets_display_heading => "This document refers to:"} %>
-<% end %>
 
 <%= async_load_tag(hydra_asset_downloads_path(params[:id]), 'downloads') %>

data/app/views/catalog/index.html.erb

@@ -3,10 +3,9 @@
     //$.ui.dialog.prototype.options["height"]=window.innerHeight  *0.75
 <% end %>
 
-<!--div id="sidebar" class="span3">
- <%#= render :partial=>'facets' %>
-</div--><!--/well -->
-
+<% content_for :sidebar do %>
+  <%= render :partial=>'facets' %>
+<% end %>
 
 <% unless has_search_parameters? %>
 	<%# if there are no input/search related params, display the "home" partial -%>
@@ -36,10 +35,6 @@
   
 	<%= render :partial => 'document_list' %>
 
-	<% sidebar_items << capture do %>
-	  <%= render :partial=>'facets' %>
-	<% end %>
-
   <%= render 'results_pagination' %>
 
 <% end %>

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

@@ -34,8 +34,5 @@ limitations under the License.
 <div class="<%= params[:action]%>_details">
   <%= render :partial => "#{params[:controller]}/_#{params[:action]}_partials/default_details", :locals => {:document => document}%>
 </div>
-<% sidebar_items << capture do %>
-  <%#= render :partial=>"catalog/_show_partials/facets", :locals=>{:document=>document, :facets_display_heading => "This document refers to:"} %>
-<% end %>
 
 <%= async_load_tag(hydra_asset_downloads_path(params[:id]), 'downloads') %>

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

@@ -1,7 +1,7 @@
 <!-- This was copied from https://github.com/projectblacklight/blacklight/blob/master/app/views/catalog/facet.html.erb
  It implements the facets in the same manner as blacklight does for the main catalog for the individual's dashbord 
 -->
- <% sidebar_items << capture do %>
+<% content_for :sidebar do %>
   <p><%= link_back_to_catalog %></p>
 <% end %>
 

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

@@ -179,7 +179,7 @@ z-index:1;
   <%= render 'sort_and_per_page' %>
 
   <%= render :partial=>'dashboard/document_list'  %>  
-	<% sidebar_items << capture do %>
+	<% content_for :sidebar do %>
 	  <%= render :partial=>'facets' %>
 	<%  end %>
 

data/app/views/layouts/hydra-head.html.erb

@@ -68,7 +68,7 @@ limitations under the License.
             </div>
           <% else %>
             <div class="span17">
-              <%= sidebar_items.join('').html_safe %> 
+              <%= yield :sidebar %>
             </div><!-- /.span17 -->
             <% if column_class == "three" %>
               <div class="span63">

data/lib/sufia/controller.rb

@@ -54,17 +54,6 @@ module Sufia::Controller
   end
 
   protected
-  # Returns the solr permissions document for the given id
-  # @return solr permissions document
-  # @example This is the document that you can pass into permissions enforcement methods like 'can?'
-  #   gf = GenericFile.find(params[:id])
-  #   if can? :read, permissions_solr_doc_for_id(gf.pid)
-  #     gf.update_attributes(params[:generic_file])
-  #   end
-  def permissions_solr_doc_for_id(id)
-    permissions_solr_response, permissions_solr_document = get_permissions_solr_response_for_doc_id(id)
-    return permissions_solr_document
-  end
 
   ### Hook which is overridden in Sufia::Ldap::Controller
   def has_access?

data/lib/sufia/files_controller_behavior.rb

@@ -98,7 +98,8 @@ module Sufia
             @generic_file = ::GenericFile.new
             # Relative path is set by the jquery uploader when uploading a directory
             @generic_file.relative_path = params[:relative_path] if params[:relative_path]
-            Sufia::GenericFile::Actions.create(@generic_file, file, params[:batch_id], file.original_filename, datastream_id, current_user)
+            Sufia::GenericFile::Actions.create_metadata(@generic_file, current_user, params[:batch_id])
+            Sufia::GenericFile::Actions.create_content(@generic_file, file, file.original_filename, datastream_id, current_user)
             respond_to do |format|
               format.html {
                 retval = render :json => [@generic_file.to_jq_upload].to_json,
@@ -110,7 +111,6 @@ module Sufia
               }
             end
           else
-          puts "Returned false"
             retval = render :json => [{:error => "Error creating generic file."}].to_json
           end
         end

data/lib/sufia/generic_file/actions.rb

@@ -1,8 +1,7 @@
 module Sufia::GenericFile
   # Actions are decoupled from controller logic so that they may be called from a controller or a background job.
   module Actions
-    def self.create(generic_file, file, batch_id, file_name, dsid, user)
-      generic_file.add_file(file, dsid, file_name)
+    def self.create_metadata(generic_file, user, batch_id)
 
       generic_file.apply_depositor_metadata(user.user_key)
       generic_file.date_uploaded = Date.today
@@ -14,6 +13,11 @@ module Sufia::GenericFile
       else
         logger.warn "unable to find batch to attach to"
       end
+      generic_file.save!
+    end
+    
+    def self.create_content(generic_file, file, file_name, dsid, user)
+      generic_file.add_file(file, dsid, file_name)
 
       save_tries = 0
       begin

data/lib/sufia/jobs/batch_update_job.rb

@@ -54,7 +54,7 @@ class BatchUpdateJob
   end
 
   def update_file(gf, user)
-    unless user.can? :edit, get_permissions_solr_response_for_doc_id(gf.pid)[1]
+    unless user.can? :edit, gf
       logger.error "User #{user.user_key} DEEEENIED access to #{gf.pid}!"
       @denied << gf
       return

data/lib/sufia/jobs/content_deposit_event_job.rb

@@ -25,7 +25,7 @@ class ContentDepositEventJob < EventJob
     # Log the event to the GF's stream
     gf.log_event(event)
     # Fan out the event to all followers who have access
-    depositor.followers.select { |user| user.can? :read, get_permissions_solr_response_for_doc_id(gf.pid)[1] }.each do |follower|
+    depositor.followers.select { |user| user.can? :read, gf }.each do |follower|
       follower.log_event(event)
     end
   end

data/lib/sufia/jobs/content_new_version_event_job.rb

@@ -25,7 +25,7 @@ class ContentNewVersionEventJob < EventJob
     # Log the event to the GF's stream
     gf.log_event(event)
     # Fan out the event to all followers who have access
-    depositor.followers.select { |user| user.can? :read, get_permissions_solr_response_for_doc_id(gf.pid)[1] }.each do |follower|
+    depositor.followers.select { |user| user.can? :read, gf }.each do |follower|
       follower.log_event(event)
     end
   end

data/lib/sufia/jobs/content_restored_version_event_job.rb

@@ -33,7 +33,7 @@ class ContentRestoredVersionEventJob < EventJob
     # Log the event to the GF's stream
     gf.log_event(event)
     # Fan out the event to all followers who have access
-    depositor.followers.select { |user| user.can? :read, get_permissions_solr_response_for_doc_id(gf.pid)[1] }.each do |follower|
+    depositor.followers.select { |user| user.can? :read, gf }.each do |follower|
       follower.log_event(event)
     end
   end

data/lib/sufia/jobs/content_update_event_job.rb

@@ -25,7 +25,7 @@ class ContentUpdateEventJob < EventJob
     # Log the event to the GF's stream
     gf.log_event(event)
     # Fan out the event to all followers who have access
-    depositor.followers.select { |user| user.can? :read, get_permissions_solr_response_for_doc_id(gf.pid)[1] }.each do |follower|
+    depositor.followers.select { |user| user.can? :read, gf }.each do |follower|
       follower.log_event(event)
     end
   end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/spec/controllers/batch_controller_spec.rb

@@ -41,6 +41,11 @@ describe BatchController do
       @file.delete
       @file2.delete
     end
+    it "should not be editable" do
+      ability = Ability.new(@user)
+      ability.can?(:edit, @file).should be_true
+      ability.can?(:edit, @file2).should be_false
+    end
     it "should equeue 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')

data/spec/models/batch_update_job_spec.rb

@@ -34,8 +34,8 @@ describe BatchUpdateJob do
   end
   describe "failing update" do
     it "should check permissions for each file before updating" do
-      BatchUpdateJob.any_instance.stub(:get_permissions_solr_response_for_doc_id).and_return(["","mock solr permissions"])       
-      User.any_instance.should_receive(:can?).with(:edit, "mock solr permissions").exactly(2).times
+      User.any_instance.should_receive(:can?).with(:edit, @file).and_return(false)
+      User.any_instance.should_receive(:can?).with(:edit, @file2).and_return(false)
        params = {'generic_file' => {'read_groups_string' => '', 'read_users_string' => 'archivist1, archivist2', 'tag' => ['']}, 'id' => @batch.pid, 'controller' => 'batch', 'action' => 'update'}.with_indifferent_access
       BatchUpdateJob.new(@user.user_key, params).run
       @user.mailbox.inbox[0].messages[0].subject.should == "Batch upload permission denied"
@@ -45,8 +45,8 @@ describe BatchUpdateJob do
   end
   describe "passing update" do
     it "should log a content update event" do
-      BatchUpdateJob.any_instance.stub(:get_permissions_solr_response_for_doc_id).and_return(["","mock solr permissions"])       
-      User.any_instance.should_receive(:can?).with(:edit, "mock solr permissions").exactly(2).times.and_return(true)
+      User.any_instance.should_receive(:can?).with(:edit, @file).and_return(true)
+      User.any_instance.should_receive(:can?).with(:edit, @file2).and_return(true)
       s1 = stub('one')
       ContentUpdateEventJob.should_receive(:new).with(@file.pid, @user.user_key).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.8
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.8
 - !ruby/object:Gem::Dependency
@@ -32,7 +32,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
@@ -48,7 +48,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -56,7 +56,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -64,7 +64,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.3'
   type: :runtime
@@ -72,7 +72,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.3'
 - !ruby/object:Gem::Dependency
@@ -80,7 +80,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.5'
   type: :runtime
@@ -88,7 +88,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.5'
 - !ruby/object:Gem::Dependency
@@ -112,7 +112,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
@@ -120,7 +120,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
@@ -128,7 +128,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.23.0
   type: :runtime
@@ -136,7 +136,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.23.0
 - !ruby/object:Gem::Dependency
@@ -176,7 +176,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -184,7 +184,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -240,7 +240,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -248,7 +248,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -368,7 +368,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -376,7 +376,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -384,7 +384,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
@@ -392,7 +392,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Sufia is a Rails engine for creating a self-deposit institutional repository
@@ -403,9 +403,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .rspec
+- ".gitignore"
+- ".gitmodules"
+- ".rspec"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -933,18 +933,18 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Sufia was extracted from ScholarSphere developed by Penn State University