sufia 3.4.0.rc2 → 3.4.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b88dc1dec7671c314b32538775b0691c7c01bb5
-  data.tar.gz: feb60f9924a19dc05ac5e0c7e71f19c387eaadf8
+  metadata.gz: 2aaf4403b11351ceaec8191e0717c0d7fbdef037
+  data.tar.gz: 0b5f652ae3ea1c824095e61d3c2f31a9cdf629ab
 SHA512:
-  metadata.gz: 9c3601baf4d5fc2f28d2e027072dadf1d239a703ea1c60584c944d8d3e03c2e71142b8adb2d119c771715ff278062f52f344d4bd027f154d8fcda5eb2f435450
-  data.tar.gz: 58484082783d403699c326e44774ddfd6698718d9f0549ec2cd2adaad07c4161644a7590510a691c837d6b5d09b7285c3e23668fbcc6b92045d2ef0eb3f6befc
+  metadata.gz: 0fb341ecba6b0cbd6621225a03f5c468ed11f462f238384da502b416b5ff626cf0098de4e597ed47b37d8c2bb701fdf61d4e0572f790c50b71b1fceec45f81ef
+  data.tar.gz: 7dd4b76cacb8b58f4a21ff25c2fe1c02f53731264f699e88edc682f9a236bfc2ec5c231159d94279c4e94db9cb8fbfbcfd50c19af1c0282dcfa46f0cc1965d9f

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,17 +1,15 @@
 # History of Sufia releases
 
-## 3.4.0.rc2
+## 3.4.0.rc3
+* 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]
-* Update to latest rc of hydra-head [Justin Coyne]
 * AccessRight has moved into HydraHead [Justin Coyne]
-* Remove cruft [ci skip] [Justin Coyne]
 * Remove Visibility, which was moved into hydra-head [Justin Coyne]
 * Fix deprecation warnings by switching to
   Hydra::AccessControls::Permissions [Justin Coyne]
-* 2013-09-27: Works with hydra 6.1.0.rc1 [Justin Coyne]
 
 
 ## 3.3.0

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.4.0.rc2
+3.4.0.rc3

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "3.4.0.rc2"
+  VERSION = "3.4.0.rc3"
 end

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/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,9 +54,6 @@ 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=>{})
@@ -64,7 +61,7 @@ describe FileContentDatastream do
       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:imageWidth/text()', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).inner_text.should == '50'
@@ -77,7 +74,7 @@ describe FileContentDatastream do
       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_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/lib/sufia/models.rb

@@ -6,12 +6,6 @@ require 'mailboxer'
 require 'acts_as_follower'
 require 'paperclip'
 require "active_resource" # used by GenericFile to catch errors & by GeoNamesResource
-begin
-  # activerecord-import 0.3.1 does not support rails 4, so we don't require it.
-  require 'activerecord-import'
-rescue LoadError
-  $stderr.puts "Sufia-models is unable to load activerecord-import"
-end
 require 'resque/server'
 
 module Sufia

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/noid.rb

@@ -1,7 +1,7 @@
 module Sufia
   module Noid
     def Noid.noidify(identifier)
-      identifier.split(":").last
+      String(identifier).split(":").last
     end
 
     def Noid.namespaceize(identifier)

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

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.4.0.rc2"
+    VERSION = "3.4.0.rc3"
   end
 end

data/sufia-models/sufia-models.gemspec

@@ -33,8 +33,7 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "hydra", "6.1.0.rc2"
   # Since hydra 6.1 isn't out yet, we'll just build it so that it's compatible 
   # without an explicit dependency
-  spec.add_dependency "hydra-head", "~> 6.4.0.rc2"
-  spec.add_dependency 'active-fedora', "~> 6.6.0.rc1"
+  spec.add_dependency "hydra-head", "~> 6.4.0"
 
   spec.add_dependency 'nest', '~> 1.1.1'
   spec.add_dependency 'resque', '~> 1.23.0'#, :require => 'resque/server'
@@ -45,6 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'paperclip', '~> 3.4.0'
   spec.add_dependency 'zipruby', '0.3.6'
   spec.add_dependency 'hydra-derivatives', '~> 0.0.5'
-  # https://github.com/zdennis/activerecord-import/pull/79
-  #spec.add_dependency 'activerecord-import', '0.3.0' # 0.3.1 caused a bug in testing: "SQLite3::SQLException: near ",": syntax error: INSERT INTO..."
+  spec.add_dependency 'activerecord-import'
 end

data/tasks/release.rake

@@ -2,6 +2,8 @@ root    = File.expand_path('../../', __FILE__)
 version = File.read("#{root}/SUFIA_VERSION").strip
 tag     = "v#{version}"
 
+directory 'pkg'
+
 ['sufia-models', 'sufia'].each do |framework|
   namespace framework do
     gem     = "pkg/#{framework}-#{version}.gem"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 3.4.0.rc2
+  version: 3.4.0.rc3
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-18 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.4.0.rc2
+        version: 3.4.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0.rc2
+        version: 3.4.0.rc3
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -534,12 +534,14 @@ files:
 - spec/fixtures/genreForms.nt
 - spec/fixtures/icons.zip
 - spec/fixtures/image.jp2
+- spec/fixtures/image.jpg
 - spec/fixtures/jp2_fits.xml
 - spec/fixtures/jpg_fits.xml
 - spec/fixtures/lexvo.rdf
 - spec/fixtures/mp3_fits.xml
 - spec/fixtures/pdf_fits.xml
 - spec/fixtures/piano_note.wav
+- spec/fixtures/png_fits.xml
 - spec/fixtures/small_file.txt
 - spec/fixtures/sufia/.gitignore
 - spec/fixtures/sufia/bg_header.jpg
@@ -614,6 +616,7 @@ files:
 - sufia-models/Rakefile
 - sufia-models/app/models/batch.rb
 - sufia-models/app/models/checksum_audit_log.rb
+- sufia-models/app/models/concerns/sufia/user.rb
 - sufia-models/app/models/datastreams/batch_rdf_datastream.rb
 - sufia-models/app/models/datastreams/file_content_datastream.rb
 - sufia-models/app/models/datastreams/fits_datastream.rb
@@ -687,7 +690,6 @@ files:
 - sufia-models/lib/sufia/models/noid.rb
 - sufia-models/lib/sufia/models/resque.rb
 - sufia-models/lib/sufia/models/solr_document_behavior.rb
-- sufia-models/lib/sufia/models/user.rb
 - sufia-models/lib/sufia/models/user_local_directory_behavior.rb
 - sufia-models/lib/sufia/models/utils.rb
 - sufia-models/lib/sufia/models/version.rb
@@ -749,7 +751,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.7
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -789,12 +791,14 @@ test_files:
 - spec/fixtures/genreForms.nt
 - spec/fixtures/icons.zip
 - spec/fixtures/image.jp2
+- spec/fixtures/image.jpg
 - spec/fixtures/jp2_fits.xml
 - spec/fixtures/jpg_fits.xml
 - spec/fixtures/lexvo.rdf
 - spec/fixtures/mp3_fits.xml
 - spec/fixtures/pdf_fits.xml
 - spec/fixtures/piano_note.wav
+- spec/fixtures/png_fits.xml
 - spec/fixtures/small_file.txt
 - spec/fixtures/sufia/.gitignore
 - spec/fixtures/sufia/bg_header.jpg