sufia 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 192f05ee63c1448500374b381283f9796bb6a864
-  data.tar.gz: 5017ed019cf96dd363991d15718c48599ae10fcb
+  metadata.gz: b325d0460fd902145ca8b8c197ea822e271d7182
+  data.tar.gz: 6cb9cb9a2b1c4838a16ee2cc5dd4526fb918fc7d
 SHA512:
-  metadata.gz: 00027897e9f28c13ece3f1413db477941479cb2f0bebb10b90e6ebb1c73d6834866a0aecb219fbdf9d31ceea73decaacb2028805de3d5846661256a7ac3c7966
-  data.tar.gz: c40470550b3593473d5bfb75caea483477d1640d8a76eeecb0f0060d4341768f251184663f02c81d8f22ad9b320b218cbfad5e241a5a7b0fa670c7db07f1e9a5
+  metadata.gz: 02ba6513e673044b55e11a6dbaa68cb83cde5b3e3381c9c75dc86dd2bd21cdb0b709f35904befcb4a8a3fa6485d3081d4028b0480489fdceb3b5ae55a1d19ec0
+  data.tar.gz: b7be173445501e70cf190ba23e2965ed3fac991ac5ca4f07a0e339692ce1ef58c7de4edf549788a95d461f32a5fa2a68afbe134518a77c8839a6ff4042dd3669

data/Gemfile

@@ -8,8 +8,6 @@ gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'
 gem 'sufia-models', path: './sufia-models'
 
 group :development, :test do
-  # https://github.com/zdennis/activerecord-import/pull/79
-  #gem 'activerecord-import', '0.3.0'
   gem 'sqlite3'
   gem 'selenium-webdriver'
   gem 'rspec-rails', '~> 2.14'

data/History.md

@@ -1,5 +1,25 @@
 # History of Sufia releases
 
+## 3.4.0
+* Handle facets with 3 or more words [Jeremy Friesen]
+* Fixed show links in Users#index [Andrew Curley]
+* Update to AF 6.7.0 [Justin Coyne]
+* Adding more verbose logging to specs [Jeremy Friesen]
+* Update to Blacklight 4.5.0 [Justin Coyne]
+* Removing migration templates from Sufia (they are in sufia-models) [Justin Coyne]
+* Removed HTML align property from views [Justin Coyne]
+* Relax the Resque spec [Justin Coyne]
+* Pinned to hydra-head ~> 6.4.0 [Justin Coyne]
+* Moved trophies related methods to Trophies module [Justin Coyne]
+* Move mime type related methods into MimeTypes module [Justin Coyne]
+* Extract version methods into its own module [Justin Coyne]
+* Extract metadata into its own module [Justin Coyne]
+* AccessRight has moved into HydraHead [Justin Coyne]
+* Remove Visibility, which was moved into hydra-head [Justin Coyne]
+* Fix deprecation warnings by switching to
+  Hydra::AccessControls::Permissions [Justin Coyne]
+
+
 ## 3.3.0
 * Fix authorities deprecations [Justin Coyne]
 * Fix deprecation on MailboxController [Justin Coyne]

data/README.md

@@ -49,11 +49,8 @@ Then `bundle install`
 
 Note the line with kaminari listed as a dependency.  This is a temporary fix to address a problem in the current release of kaminari.  Technically you should not have to list kaminari, which is a dependency of blacklight and sufia. 
 
-### Run the blacklight, hydra and sufia generators
+### Run the sufia generator
 ```
-rails g blacklight --devise
-rails g hydra:head -f
-bundle install
 rails g sufia -f
 rm public/index.html
 ```
@@ -90,6 +87,13 @@ Add this line:
 //= require sufia
 ```
 
+**Remove** this line, if present (typically, when using Rails 4):
+```
+//= require turbolinks
+```
+
+Turbolinks does not mix well with Blacklight.
+
 ### Install Fits.sh
 1. Go to http://code.google.com/p/fits/downloads/list and download a copy of fits & unpack it somewhere on your Machine.
 1. Give your system access to fits
@@ -120,7 +124,7 @@ See https://github.com/defunkt/resque for more options
 #### On a mac
 Use homebrew:
 ```
-brew install ffmpeg --with-libvpx --with-libvorbis
+brew install ffmpeg --with-fdk-aac --with-libvpx --with-libvorbis
 ```
 
 #### On Ubuntu Linux

data/Releasing_sufia.md

@@ -1,3 +1,6 @@
 Update /SUFIA_VERSION
 
-rake all:release
+`rake all:release`
+
+### make sure all the changes get to everyone else:
+`git push`

data/SUFIA_VERSION

@@ -1 +1 @@
-3.3.0
+3.4.0

data/UpgradeGuide.md

@@ -0,0 +1,3 @@
+#Upgrading to Sufia 3.4.0
+
+* If you are using Sufia::Models::AccessRight, substitute Hydra::AccessControls::AccessRight instead

data/{lib → app/controllers/concerns}/sufia/dashboard_controller_behavior.rb

@@ -1,17 +1,3 @@
-# -*- coding: utf-8 -*-
-# 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 'blacklight/catalog'
 
 module Sufia
@@ -61,7 +47,7 @@ module Sufia
       # adding a key to the session so that the history will be saved so that batch_edits select all will work
       search_session[:dashboard] = true 
       respond_to do |format|
-        format.html { save_current_search_params }
+        format.html { }
         format.rss  { render :layout => false }
         format.atom { render :layout => false }
       end

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

@@ -1,5 +1,5 @@
 <li class="expandable_new grey">
-   <% id = facet_field.label.sub(" ","_") %>
+   <% id = facet_field.label.gsub(" ","_") %>
    <!--button class="btn dropdown" data-toggle="collapse" data-target="#collapse_<%= id%>" data-parent="#facet_group"><i class="icon-chevron-right"></i> <%= facet_field.label%></button--> 
 
     <a class="accordion-toggle grey" data-toggle="collapse" data-parent="#facet_group" data-target="#collapse_<%= id%>">

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

@@ -15,7 +15,7 @@ limitations under the License.
 %>
 
 <li class="expandable_new  grey">
-   <% id = facet_field.label.sub(" ","_")+"_db" %>
+   <% id = facet_field.label.gsub(" ","_")+"_db" %>
 
     <a class="accordion-toggle grey" data-toggle="collapse" data-parent="#facet_group" data-target="#collapse_<%= id%>">
       <%= facet_field.label %><i class="icon-chevron-right grey"></i>

data/app/views/dashboard/_index_partials/_list_files.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.
-%>
-
 <% noid = document.noid %>
 <tr id="document_<%= noid %>" class="<%= cycle("","zebra") %>">
   <% gf = GenericFile.load_instance_from_solr(document.id) %>
@@ -32,7 +16,7 @@ limitations under the License.
     <span class=center><%= link_to document.title_or_label, sufia.generic_file_path(noid), :id => "src_copy_link#{noid}" %> <br /></span>
   </td>
   <td width="17%"><%= document.date_uploaded %> </td>
-  <td width="5%" align="center">
+  <td width="5%">
     <% if document.registered? %>
       <a href="<%= sufia.generic_file_path(noid) %>/edit/?tab=permissions" id="permission_<%= noid %>"><span class="label label-info" title="<%=t('sufia.institution_name') %>"><%=t('sufia.institution_name') %></span></a>
     <% elsif document.public? %>

data/app/views/generic_files/_permission_form.html.erb

@@ -60,13 +60,13 @@
     <h3>Visibility - <small>who should have the ability to read and download</small></h3>
       <div class="controls">
         <label class="radio">
-          <input type="radio" id="visibility_open" name="visibility" value="<%=Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>" <% if !public_perm.blank? %> checked="true"<% end %>/> <span class="label label-success">Open Access</span> Visible to the world.
+          <input type="radio" id="visibility_open" name="visibility" value="<%=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>" <% if !public_perm.blank? %> checked="true"<% end %>/> <span class="label label-success">Open Access</span> Visible to the world.
         </label>
         <label class="radio">
-          <input type="radio" id="visibility_psu" name="visibility" value="<%=Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>" <% if !registered_perm.blank? %> checked="true"<% end %> /><span class="label label-info"><%=t('sufia.institution_name') %></span> Visible to all <%=t('sufia.institution_name') %> users. 
+          <input type="radio" id="visibility_psu" name="visibility" value="<%=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>" <% if !registered_perm.blank? %> checked="true"<% end %> /><span class="label label-info"><%=t('sufia.institution_name') %></span> Visible to all <%=t('sufia.institution_name') %> users. 
         </label>
         <label class="radio">
-          <input type="radio" id="visibility_restricted" name="visibility" value="<%=Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>"<% if registered_perm.blank? and public_perm.blank?%> checked="true"<% end %> /> <span class="label label-important">Private</span> Visible to users/groups specified below, if any. 
+          <input type="radio" id="visibility_restricted" name="visibility" value="<%=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>"<% if registered_perm.blank? and public_perm.blank?%> checked="true"<% end %> /> <span class="label label-important">Private</span> Visible to users/groups specified below, if any. 
         </label>
     </div><!-- /.controls -->
   </div><!-- /.control-group --> 

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

@@ -32,9 +32,9 @@ limitations under the License.
         <tbody> 
             <% @users.each do |user| %> 
                 <tr class="<%= cycle("","zebra") %>"> 
-                   <td><a href="<%= sufia.profile_path(URI.escape(user.user_key,'@.')) %>" class="btn btn-small " ><%= image_tag user.avatar.url(:thumb), :width => 30 %></a></td> 
-                   <td ><a href="<%= sufia.profile_path(URI.escape(user.user_key,'@.')) %>"  ><%= user.name %><a></td> 
-                   <td><a href="<%= sufia.profile_path(URI.escape(user.user_key,'@.')) %>"  ><%= user.user_key %><a></td>
+                   <td><a href="<%= sufia.profile_path(user) %>" class="btn btn-small " ><%= image_tag user.avatar.url(:thumb), :width => 30 %></a></td> 
+                   <td ><a href="<%= sufia.profile_path(user) %>"  ><%= user.name %><a></td> 
+                   <td><a href="<%= sufia.profile_path(user) %>"  ><%= user.user_key %><a></td>
                    <td><%= user.department %> </td> 
                    <td><%= number_of_deposits(user) %> </td>
                 </tr> 

data/lib/sufia/version.rb

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

data/lib/sufia.rb

@@ -6,8 +6,6 @@ require 'hydra-batch-edit'
 require 'sufia/models'
 
 require 'rails_autolink'
-require 'sufia/dashboard_controller_behavior'
-require "sufia/contact_form_controller_behavior"
 
 autoload :Zip, 'zipruby'
 module Sufia
@@ -20,8 +18,8 @@ module Sufia
       #{config.root}/app/controllers/concerns
       #{config.root}/app/models/concerns
       #{config.root}/app/models/datastreams
+      #{Hydra::Engine.root}/app/models/concerns
     )
-
   end
 
   autoload :Controller

data/spec/controllers/batch_edits_controller_spec.rb

@@ -8,10 +8,10 @@ describe BatchEditsController do
     User.any_instance.stub(:groups).and_return([])
     controller.stub(:clear_session_user) ## Don't clear out the authenticated session
     request.env["HTTP_REFERER"] = 'test.host/original_page'
-    @routes = Internal::Application.routes
-    
   end
 
+  routes { Internal::Application.routes }
+
   describe "edit" do
     before do
       @one = GenericFile.new(:creator=>"Fred", :language=>'en')

data/spec/controllers/downloads_controller_spec.rb

@@ -29,7 +29,7 @@ describe DownloadsController do
         it "should default to returning configured default download" do
           DownloadsController.default_content_dsid.should == "content"
           controller.stub(:render) # send_data calls render internally
-          expected_content = ActiveFedora::Base.find("sufia:test1").content.content
+          expected_content = ActiveFedora::Base.find("sufia:test1", cast: true).content.content
           controller.should_receive(:send_file_headers!).with({:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
           get "show", :id => "test1"
           response.body.should == expected_content
@@ -37,7 +37,7 @@ describe DownloadsController do
         end
         it "should return requested datastreams" do
           controller.stub(:render) # send_data calls render internally
-          expected_content = ActiveFedora::Base.find("sufia:test1").descMetadata.content
+          expected_content = ActiveFedora::Base.find("sufia:test1", cast: true).descMetadata.content
           controller.should_receive(:send_file_headers!).with({:filename => 'descMetadata', :disposition => 'inline', :type => 'text/plain' })
           get "show", :id => "test1", :datastream_id => "descMetadata"
           response.body.should == expected_content
@@ -45,7 +45,7 @@ describe DownloadsController do
         end
         it "should support setting disposition to inline" do
           controller.stub(:render) # send_data calls render internally
-          expected_content = ActiveFedora::Base.find("sufia:test1").content.content
+          expected_content = ActiveFedora::Base.find("sufia:test1", cast: true).content.content
           controller.should_receive(:send_file_headers!).with({:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
           get "show", :id => "test1", :disposition => "inline"
           response.body.should == expected_content
@@ -54,7 +54,7 @@ describe DownloadsController do
 
         it "should allow you to specify filename for download" do
           controller.stub(:render) # send_data calls render internally
-          expected_content = ActiveFedora::Base.find("sufia:test1").content.content
+          expected_content = ActiveFedora::Base.find("sufia:test1", cast: true).content.content
           controller.should_receive(:send_file_headers!).with({:filename => 'my%20dog.png', :disposition => 'inline', :type => 'image/png' })
           get "show", :id => "test1", "filename" => "my%20dog.png"
           response.body.should == expected_content

data/spec/controllers/generic_files_controller_spec.rb

@@ -191,7 +191,7 @@ describe GenericFilesController do
       # Dir.mkdir @mock_upload_directory unless File.exists? @mock_upload_directory
       FileUtils.mkdir_p([File.join(@mock_upload_directory, "import/files"),File.join(@mock_upload_directory, "import/metadata")])   
       FileUtils.copy(File.expand_path('../../fixtures/world.png', __FILE__), @mock_upload_directory)
-      FileUtils.copy(File.expand_path('../../fixtures/image.jp2', __FILE__), @mock_upload_directory)
+      FileUtils.copy(File.expand_path('../../fixtures/image.jpg', __FILE__), @mock_upload_directory)
       FileUtils.copy(File.expand_path('../../fixtures/dublin_core_rdf_descMetadata.nt', __FILE__), File.join(@mock_upload_directory, "import/metadata"))
       FileUtils.copy(File.expand_path('../../fixtures/icons.zip', __FILE__), File.join(@mock_upload_directory, "import/files"))
       FileUtils.copy(File.expand_path('../../fixtures/Example.ogg', __FILE__), File.join(@mock_upload_directory, "import/files"))
@@ -203,30 +203,24 @@ describe GenericFilesController do
     end
     context "when User model defines a directory path" do
       before do 
-        User.any_instance.stub(:directory).and_return(@mock_upload_directory)
-      end
-      it "should ingest files from the filesystem" do
         if $in_travis
-          # This is in place because we stub fits for travis, and the stub sets the mime to application/pdf.
           # In order to avoid an invalid derivative creation, just stub out the derivatives.
           GenericFile.any_instance.stub(:create_derivatives)
         end
-        lambda { post :create, local_file: ["world.png", "image.jp2"], batch_id: "xw42n7934"}.should change(GenericFile, :count).by(2)
+        User.any_instance.stub(:directory).and_return(@mock_upload_directory)
+      end
+      it "should ingest files from the filesystem" do
+        lambda { post :create, local_file: ["world.png", "image.jpg"], batch_id: "xw42n7934"}.should change(GenericFile, :count).by(2)
         response.should redirect_to Sufia::Engine.routes.url_helpers.batch_edit_path('xw42n7934')
         # These files should have been moved out of the upload directory
-        File.exist?("#{@mock_upload_directory}/image.jp2").should be_false
+        File.exist?("#{@mock_upload_directory}/image.jpg").should be_false
         File.exist?("#{@mock_upload_directory}/world.png").should be_false
         # And into the storage directory
         files = GenericFile.find(Solrizer.solr_name("is_part_of",:symbol) => 'info:fedora/sufia:xw42n7934')
         files.first.label.should == 'world.png'
-        files.last.label.should == 'image.jp2'
+        files.last.label.should == 'image.jpg'
       end
       it "should ingest redirect to another location" do
-        if $in_travis
-          # This is in place because we stub fits for travis, and the stub sets the mime to application/pdf.
-          # In order to avoid an invalid derivative creation, just stub out the derivatives.
-          GenericFile.any_instance.stub(:create_derivatives)
-        end
         GenericFilesController.should_receive(:upload_complete_path).and_return(mock_url)
         lambda { post :create, local_file: ["world.png"], batch_id: "xw42n7934"}.should change(GenericFile, :count).by(1)
         response.should redirect_to mock_url
@@ -237,12 +231,6 @@ describe GenericFilesController do
         files.first.label.should == 'world.png'
       end
       it "should ingest directories from the filesystem" do
-        #TODO this test is very slow because it kicks off CharacterizeJob.
-        if $in_travis
-          # This is in place because we stub fits for travis, and the stub sets the mime to application/pdf.
-          # In order to avoid an invalid derivative creation, just stub out the derivatives.
-          GenericFile.any_instance.stub(:create_derivatives)
-        end
         lambda { post :create, local_file: ["world.png", "import"], batch_id: "xw42n7934"}.should change(GenericFile, :count).by(4)
         response.should redirect_to Sufia::Engine.routes.url_helpers.batch_edit_path('xw42n7934')
         # These files should have been moved out of the upload directory
@@ -261,7 +249,7 @@ describe GenericFilesController do
     end
     context "when User model does not define directory path" do
       it "should return an error message and redirect to file upload page" do
-        lambda { post :create, local_file: ["world.png", "image.jp2"], batch_id: "xw42n7934"}.should_not change(GenericFile, :count)
+        lambda { post :create, local_file: ["world.png", "image.jpg"], batch_id: "xw42n7934"}.should_not change(GenericFile, :count)
         response.should render_template :new
         flash[:alert].should == 'Your account is not configured for importing files from a user-directory on the server.'
       end
@@ -375,15 +363,15 @@ describe GenericFilesController do
       posted_file = GenericFile.find(@generic_file.pid)
       version1 = posted_file.content.latest_version
       posted_file.content.version_committer(version1).should == @user.user_key
-      
-      file = fixture_file_upload('/image.jp2','image/jp2')
+
+      file = fixture_file_upload('/image.jpg','image/jpg')
       post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:tag=>[''],  :permissions=>{:new_user_name=>{'archivist1@example.com'=>'edit'}}}
 
       posted_file = GenericFile.find(@generic_file.pid)
       version2 = posted_file.content.latest_version
       posted_file.content.version_committer(version2).should == @user.user_key
 
-      posted_file.content.mimeType.should == "image/jp2"
+      posted_file.content.mimeType.should == "image/jpeg"
       post :update, :id=>@generic_file.pid, :revision=>'content.0'
 
 
@@ -422,7 +410,7 @@ describe GenericFilesController do
       s2 = double('one')
       CharacterizeJob.should_receive(:new).with(@generic_file.pid).and_return(s2)
       Sufia.queue.should_receive(:push).with(s2).once
-      file = fixture_file_upload('/image.jp2','image/jp2')
+      file = fixture_file_upload('/image.jpg','image/jpg')
       post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world"
 
       edited_file = GenericFile.find(@generic_file.pid)

data/spec/controllers/single_use_links_viewer_controller_spec.rb

@@ -45,7 +45,7 @@ describe SingleUseLinksViewerController do
     describe "GET 'download'" do
       it "and_return http success" do
         controller.stub(:render)
-        expected_content = ActiveFedora::Base.find(@file.pid).content.content
+        expected_content = ActiveFedora::Base.find(@file.pid, cast: true).content.content
         controller.should_receive(:send_file_headers!).with({:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
         get :download, id:download_link_hash 
         response.body.should == expected_content

data/spec/features/single_use_links_spec.rb

@@ -32,7 +32,7 @@ describe "Create and use single-use links" do
 
     expect(page).to have_css '.download-link'
     find('.download-link').click
-    expected_content = ActiveFedora::Base.find(@file.pid).content.content
+    expected_content = ActiveFedora::Base.find(@file.pid, cast: true).content.content
     expect(page.body).to eq expected_content
   end
 end

data/spec/features/users_spec.rb

@@ -22,4 +22,10 @@ describe "User Profile" do
     page.should have_content "Your profile has been updated"
     page.should have_content "curatorOfData"
   end
+
+  it "should display all users" do
+    click_link "curator1@example.com"
+    click_link "View Users"
+    page.should have_xpath("//td/a[@href='/users/curator1@example-dot-com']")
+  end
 end

data/spec/fixtures/png_fits.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="0.6.2" timestamp="10/14/13 11:13 AM">
+  <identification>
+    <identity format="Portable Network Graphics" mimetype="image/png" toolname="FITS" toolversion="0.6.2">
+      <tool toolname="Exiftool" toolversion="9.06" />
+      <tool toolname="Droid" toolversion="3.0" />
+      <tool toolname="ffident" toolversion="0.2" />
+      <version toolname="Droid" toolversion="3.0">1.0</version>
+      <externalIdentifier toolname="Droid" toolversion="3.0" type="puid">fmt/11</externalIdentifier>
+    </identity>
+  </identification>
+  <fileinfo>
+    <lastmodified toolname="Exiftool" toolversion="9.06" status="SINGLE_RESULT">2013:05:13 11:02:08-04:00</lastmodified>
+    <filepath toolname="OIS File Information" toolversion="0.1" status="SINGLE_RESULT">/Users/jfriesen/Repositories/sufia/spec/fixtures/world.png</filepath>
+    <filename toolname="OIS File Information" toolversion="0.1" status="SINGLE_RESULT">spec/fixtures/world.png</filename>
+    <size toolname="OIS File Information" toolversion="0.1" status="SINGLE_RESULT">4218</size>
+    <md5checksum toolname="OIS File Information" toolversion="0.1" status="SINGLE_RESULT">28da6259ae5707c68708192a40b3e85c</md5checksum>
+    <fslastmodified toolname="OIS File Information" toolversion="0.1" status="SINGLE_RESULT">1368457328000</fslastmodified>
+  </fileinfo>
+  <filestatus />
+  <metadata>
+    <image>
+      <compressionScheme toolname="Exiftool" toolversion="9.06" status="SINGLE_RESULT">Deflate/Inflate</compressionScheme>
+      <imageWidth toolname="Exiftool" toolversion="9.06" status="SINGLE_RESULT">50</imageWidth>
+      <imageHeight toolname="Exiftool" toolversion="9.06" status="SINGLE_RESULT">50</imageHeight>
+    </image>
+  </metadata>
+</fits>
+

data/spec/models/file_content_datastream_spec.rb

@@ -54,30 +54,20 @@ describe FileContentDatastream do
       @subject.stub(:pid=>'my_pid')
       @subject.stub(:dsVersionID=>'content.7')
     end
-    it "should have the path" do
-      @subject.send(:fits_path).should be_present
-    end
     it "should return an xml document", :unless => $in_travis do
-      repo = double("repo")
-      repo.stub(:config=>{})
-      f = File.new(fixture_path + '/world.png')
-      content = double("file")
-      content.stub(:read=>f.read)
-      content.stub(:rewind=>f.rewind)
-      @subject.should_receive(:content).exactly(5).times.and_return(f)
+      f = File.new(fixture_path + '/world.png', 'rb')
+      @subject.content = f.read
       xml = @subject.extract_metadata
       doc = Nokogiri::XML.parse(xml)
       doc.root.xpath('//ns:imageWidth/text()', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).inner_text.should == '50'
     end
     it "should return expected results when invoked via HTTP", :unless => $in_travis do
-      repo = double("repo")
-      repo.stub(:config=>{})
       f = ActionDispatch::Http::UploadedFile.new(:tempfile => File.new(fixture_path + '/world.png'),
                                                  :filename => 'world.png')
       content = double("file")
       content.stub(:read=>f.read)
       content.stub(:rewind=>f.rewind)
-      @subject.should_receive(:content).exactly(5).times.and_return(f)
+      @subject.stub(:content).and_return(f)
       xml = @subject.extract_metadata
       doc = Nokogiri::XML.parse(xml)
       doc.root.xpath('//ns:identity/@mimetype', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).first.value.should == 'image/png'

data/spec/models/generic_file/visibility_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Sufia::GenericFile::Visibility do
+describe Sufia::GenericFile do
   module VisibilityOverride
     extend ActiveSupport::Concern
     include Sufia::GenericFile::Permissions
@@ -13,7 +13,7 @@ describe Sufia::GenericFile::Visibility do
 
   it 'allows for overrides of visibility' do
     expect{
-      MockParent.new(visibility: Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE)
+      MockParent.new(visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE)
     }.to_not raise_error
   end
 end

data/spec/models/generic_file_spec.rb

@@ -263,6 +263,7 @@ describe GenericFile do
     end
   end
   it "should support to_solr" do
+    @file.stub(:pid).and_return('stubbed_pid')
     @file.part_of = "Arabiana"
     @file.contributor = "Mohammad"
     @file.creator = "Allah"
@@ -303,7 +304,7 @@ describe GenericFile do
     local[Solrizer.solr_name("desc_metadata__identifier")].should == ["urn:isbn:1234567890"]
     local[Solrizer.solr_name("desc_metadata__based_near")].should == ["Medina, Saudi Arabia"]
     local[Solrizer.solr_name("mime_type")].should == ["image/jpeg"]    
-    local["noid_tsi"].should == "__DO_NOT_USE__"
+    local["noid_tsi"].should eq('stubbed_pid')
   end
   it "should support multi-valued fields in solr" do
     @file.tag = ["tag1", "tag2"]
@@ -547,6 +548,10 @@ describe GenericFile do
   describe "characterize" do
     it "should return expected results when called", :unless => $in_travis do
       @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      # Without the stub(:save), the after save callback was being triggered
+      # which resulted the characterize_if_changed method being called; which
+      # enqueued a job for characterizing
+      @file.stub(:save)
       @file.characterize
       doc = Nokogiri::XML.parse(@file.characterization.content)
       doc.root.xpath('//ns:imageWidth/text()', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).inner_text.should == '50'

data/spec/spec_helper.rb

@@ -19,11 +19,17 @@ $in_travis = !ENV['TRAVIS'].nil? && ENV['TRAVIS'] == 'true'
 
 if $in_travis
   # Monkey-patches the FITS runner to return the PDF FITS fixture
-  module Hydra 
+  module Hydra
     module Derivatives
       module ExtractMetadata
-        def run_fits!(path)
-          File.open(File.join(File.expand_path('../fixtures', __FILE__), 'pdf_fits.xml')).read
+        def extract_metadata
+          return unless has_content?
+          Hydra::FileCharacterization.characterize(content, filename_for_characterization, :fits) do |config|
+            config[:fits] = lambda { |filename|
+              filename = File.expand_path("../fixtures/pdf_fits.xml", __FILE__)
+              File.read(filename)
+            }
+          end
         end
       end
     end
@@ -65,4 +71,4 @@ module FactoryGirl
     tmpl = FactoryGirl.build(handle)
     tmpl.class.send("find_by_#{by}".to_sym, tmpl.send(by)) || FactoryGirl.create(handle)
   end
-end
+end

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

@@ -1,6 +1,5 @@
 class Batch < ActiveFedora::Base
-  include Hydra::ModelMixins::CommonMetadata
-  include Hydra::ModelMixins::RightsMetadata
+  include Hydra::AccessControls::Permissions
   include Sufia::ModelMethods
   include Sufia::Noid
 
@@ -9,10 +8,7 @@ class Batch < ActiveFedora::Base
   belongs_to :user, :property => "creator"
   has_many :generic_files, :property => :is_part_of
 
-  delegate :title, :to => :descMetadata
-  delegate :creator, :to => :descMetadata
-  delegate :part, :to => :descMetadata
-  delegate :status, :to => :descMetadata
+  has_attributes :title, :creator, :part, :status, datastream: :descMetadata, multiple: true
 
   def self.find_or_create(pid)
     begin

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

@@ -28,6 +28,7 @@ module Sufia
       config.autoload_paths += %W(
         #{config.root}/lib/sufia/models/jobs
         #{config.root}/app/models/datastreams
+        #{config.root}/app/models/concerns
       )
 
       rake_tasks do
@@ -42,6 +43,7 @@ module Sufia
       end
 
       initializer 'requires' do
+        require 'activerecord-import'
         require 'hydra/derivatives'
         require 'sufia/models/model_methods'
         require 'sufia/models/noid'
@@ -54,7 +56,6 @@ module Sufia
         require 'sufia/models/generic_file/mime_types'
         require 'sufia/models/generic_file/thumbnail'
         require 'sufia/models/generic_file'
-        require 'sufia/models/user'
         require 'sufia/models/user_local_directory_behavior'
         require 'sufia/models/id_service'
         require 'sufia/models/solr_document_behavior'

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

@@ -3,9 +3,9 @@ module Sufia
     module Characterization
       extend ActiveSupport::Concern
       included do
-        has_metadata :name => "characterization", :type => FitsDatastream
-        delegate :mime_type, :to => :characterization, :unique => true
-        delegate_to :characterization, [:format_label, :file_size, :last_modified,
+        has_metadata "characterization", :type => FitsDatastream
+        has_attributes :mime_type, datastream: :characterization, multiple: false
+        has_attributes :format_label, :file_size, :last_modified,
                                         :filename, :original_checksum, :rights_basis,
                                         :copyright_basis, :copyright_note,
                                         :well_formed, :valid, :status_message,
@@ -20,7 +20,7 @@ module Sufia
                                         :gps_timestamp, :latitude, :longitude,
                                         :character_set, :markup_basis,
                                         :markup_language, :duration, :bit_depth,
-                                        :sample_rate, :channels, :data_format, :offset]
+                                        :sample_rate, :channels, :data_format, :offset, datastream: :characterization, multiple: true
 
       end