sufia-models 4.0.0.beta2 → 4.0.0.beta3

data/lib/sufia/models/engine.rb

@@ -23,6 +23,7 @@ module Sufia
       config.enable_contact_form_delivery = false
       config.browse_everything = nil
       config.enable_local_ingest = nil
+      config.usage_statistics = nil
       config.queue = Sufia::Resque::Queue
 
       config.autoload_paths += %W(
@@ -46,19 +47,12 @@ module Sufia
         require 'sufia/models/model_methods'
         require 'sufia/models/file_content'
         require 'sufia/models/file_content/versions'
-        require 'sufia/models/generic_file/audit'
-        require 'sufia/models/generic_file/characterization'
-        require 'sufia/models/generic_file/derivatives'
-        require 'sufia/models/generic_file/export'
-        require 'sufia/models/generic_file/mime_types'
-        require 'sufia/models/generic_file/thumbnail'
-        require 'sufia/models/generic_file'
         require 'sufia/models/user_local_directory_behavior'
-        require 'sufia/models/solr_document_behavior'
         require 'sufia/noid'
         require 'sufia/id_service'
-        require 'sufia/usage_statistics'
+        require 'sufia/analytics'
         require 'sufia/pageview'
+        require 'sufia/download'
       end
 
       initializer 'configure' do

data/lib/sufia/models/file_content/versions.rb

@@ -10,9 +10,9 @@ module Sufia
       end
 
       def version_committer(version)
-        vc = VersionCommitter.where(:obj_id => version.pid,
-                                    :datastream_id => version.dsid,
-                                    :version_id => version.versionID)
+        vc = VersionCommitter.where(obj_id: version.pid,
+                                    datastream_id: version.dsid,
+                                    version_id: version.versionID)
         return vc.empty? ? nil : vc.first.committer_login
       end
 

data/lib/sufia/models/jobs/active_fedora_pid_based_job.rb

@@ -4,11 +4,15 @@ class ActiveFedoraPidBasedJob
   end
 
   attr_accessor :pid
+
   def initialize(pid)
     self.pid = pid
   end
+
   def object
-    @object ||= ActiveFedora::Base.find(pid, cast:true).tap{|f| f.reload_on_save = true}
+    @object ||= ActiveFedora::Base.find(pid, cast: true).tap do |f|
+      f.reload_on_save = true
+    end
   end
   alias_method :generic_file, :object
   alias_method :generic_file_id, :pid
@@ -16,4 +20,4 @@ class ActiveFedoraPidBasedJob
   def run
     raise RuntimeError, "Define #run in a subclass"
   end
-end
+end

data/lib/sufia/models/jobs/batch_update_job.rb

@@ -1,6 +1,6 @@
 class BatchUpdateJob
   include Hydra::PermissionsQuery
-  include Rails.application.routes.url_helpers 
+  include Rails.application.routes.url_helpers
 
   def queue_name
     :batch_update
@@ -14,7 +14,6 @@ class BatchUpdateJob
     self.file_attributes = params[:generic_file]
     self.visibility = params[:visibility]
     self.batch_id = params[:id]
-
   end
 
   def run
@@ -27,15 +26,14 @@ class BatchUpdateJob
       update_file(gf, user)
     end
     batch.update_attributes({status:["Complete"]})
-    
+
     job_user = User.batchuser()
-    
+
     message = '<span class="batchid ui-helper-hidden">ss-'+batch.noid+'</span>The file(s) '+ file_list(@saved)+ " have been saved." unless @saved.empty?
     job_user.send_message(user, message, 'Batch upload complete') unless @saved.empty?
- 
+
     message = '<span class="batchid ui-helper-hidden">'+batch.noid+'</span>The file(s) '+ file_list(@denied)+" could not be updated.  You do not have sufficient privileges to edit it." unless @denied.empty?
     job_user.send_message(user, message, 'Batch upload permission denied') unless @denied.empty?
-     
   end
 
   def update_file(gf, user)
@@ -62,10 +60,8 @@ class BatchUpdateJob
     Sufia.queue.push(ContentUpdateEventJob.new(gf.pid, login))
     @saved << gf
   end
-  
+
   def file_list ( files)
-    return files.map {|gf| '<a href="'+Sufia::Engine.routes.url_helpers.generic_files_path+'/'+gf.noid+'">'+gf.to_s+'</a>'}.join(', ')
-    
+    files.map { |gf| '<a href="'+Sufia::Engine.routes.url_helpers.generic_files_path+'/'+gf.noid+'">'+gf.to_s+'</a>' }.join(', ')
   end
-  
 end

data/lib/sufia/models/jobs/characterize_job.rb

@@ -1,22 +1,10 @@
 class CharacterizeJob < ActiveFedoraPidBasedJob
-
   def queue_name
     :characterize
   end
 
   def run
     generic_file.characterize
-    after_characterize
-  end
-
-  def after_characterize
-    if generic_file.pdf? || generic_file.image? || generic_file.video?
-      generic_file.create_thumbnail
-    end
-    if generic_file.video?
-      Sufia.queue.push(TranscodeVideoJob.new(generic_file_id))
-    elsif generic_file.audio?
-      Sufia.queue.push(TranscodeAudioJob.new(generic_file_id))
-    end
+    Sufia.queue.push(CreateDerivativesJob.new(generic_file.id))
   end
 end

data/lib/sufia/models/jobs/create_derivatives_job.rb

@@ -0,0 +1,14 @@
+class CreateDerivativesJob < ActiveFedoraPidBasedJob
+  def queue_name
+    :derivatives
+  end
+
+  def run
+    return unless generic_file.content.has_content?
+    if generic_file.video?
+      return unless Sufia.config.enable_ffmpeg
+    end
+    generic_file.create_derivatives
+    generic_file.save
+  end
+end

data/lib/sufia/models/jobs/import_url_job.rb

@@ -12,32 +12,36 @@ class ImportUrlJob < ActiveFedoraPidBasedJob
     user = User.find_by_user_key(generic_file.depositor)
 
     Tempfile.open(self.pid) do |f|
-      f.binmode
-
-      # download file from url
-      uri = URI(generic_file.import_url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = uri.scheme == "https"  # enable SSL/TLS
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-      http.start do
-        http.request_get(uri.request_uri) do |resp|
-          resp.read_body do |segment|
-            f.write(segment)
-          end
-        end
+      path = copy_remote_file(generic_file.import_url, f)
+      # attach downloaded file to generic file stubbed out
+      if Sufia::GenericFile::Actor.new(generic_file, user).create_content(f, path, 'content')
+        # add message to user for downloaded file
+        message = "The file (#{File.basename(path)}) was successfully imported."
+        job_user.send_message(user, message, 'File Import')
+      else
+        job_user.send_message(user, generic_file.errors.full_messages.join(', '), 'File Import Error')
       end
+    end
+  end
 
-      f.rewind
-      # attach downloaded file to generic file stubbed out
-      Sufia::GenericFile::Actions.create_content(generic_file, f, File.basename(uri.path), 'content', user)
-      Sufia.queue.push(ContentDepositEventJob.new(generic_file.pid, generic_file.depositor))
-      # add message to user for downloaded file
-      message = "The file (#{File.basename(uri.path)}) was successfully imported."
-      job_user.send_message(user, message, 'File Import')
+  def copy_remote_file(import_url, f)
+    f.binmode
+    # download file from url
+    uri = URI(generic_file.import_url)
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = uri.scheme == "https"  # enable SSL/TLS
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+    http.start do
+      http.request_get(uri.request_uri) do |resp|
+        resp.read_body do |segment|
+          f.write(segment)
+        end
+      end
     end
-  rescue => error
-    job_user.send_message(user, error.message, 'File Import Error')
+
+    f.rewind
+    uri.path
   end
 
   def job_user

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "4.0.0.beta2"
+    VERSION = "4.0.0.beta3"
   end
 end

data/lib/tasks/sufia-models_tasks.rake

@@ -1,7 +1,7 @@
 namespace :solr do
 
   desc "Enqueue a job to resolrize the repository objects"
-  task :reindex => :environment do
+  task reindex: :environment do
     Sufia.queue.push(ResolrizeJob.new)
   end
 end

data/sufia-models.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mailboxer', '~> 0.12.0.rc1'
   spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
   spec.add_dependency 'carrierwave', '~> 0.9.0'
-  spec.add_dependency 'hydra-derivatives', '~> 0.0.5'
+  spec.add_dependency 'hydra-derivatives', '~> 0.1'
   spec.add_dependency 'oauth2', '~> 0.9.3'
   spec.add_dependency 'google-api-client', '~> 0.7.1'
   spec.add_dependency 'legato', '~> 0.3.0'

metadata

@@ -1,117 +1,117 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
+  version: 4.0.0.beta3
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: nest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.23'
 - !ruby/object:Gem::Dependency
@@ -132,132 +132,132 @@ dependencies:
   name: noid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: mailboxer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0.rc1
 - !ruby/object:Gem::Dependency
   name: acts_as_follower
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: hydra-derivatives
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: legato
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Models and services for sufia
@@ -267,13 +267,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
+- app/actors/sufia/generic_file/actor.rb
 - app/models/batch.rb
 - app/models/checksum_audit_log.rb
+- app/models/collection.rb
+- app/models/concerns/sufia/generic_file.rb
+- app/models/concerns/sufia/generic_file/accessible_attributes.rb
+- app/models/concerns/sufia/generic_file/audit.rb
+- app/models/concerns/sufia/generic_file/characterization.rb
+- app/models/concerns/sufia/generic_file/derivatives.rb
+- app/models/concerns/sufia/generic_file/export.rb
+- app/models/concerns/sufia/generic_file/featured.rb
+- app/models/concerns/sufia/generic_file/metadata.rb
+- app/models/concerns/sufia/generic_file/mime_types.rb
+- app/models/concerns/sufia/generic_file/permissions.rb
+- app/models/concerns/sufia/generic_file/reload_on_save.rb
+- app/models/concerns/sufia/generic_file/trophies.rb
+- app/models/concerns/sufia/generic_file/versions.rb
+- app/models/concerns/sufia/generic_file/virus_check.rb
+- app/models/concerns/sufia/generic_file/web_form.rb
 - app/models/concerns/sufia/properties_datastream_behavior.rb
 - app/models/concerns/sufia/user.rb
 - app/models/datastreams/batch_rdf_datastream.rb
@@ -284,6 +301,7 @@ files:
 - app/models/datastreams/properties_datastream.rb
 - app/models/domain_term.rb
 - app/models/featured_work.rb
+- app/models/file_usage.rb
 - app/models/follow.rb
 - app/models/generic_file.rb
 - app/models/geo_names_resource.rb
@@ -294,12 +312,13 @@ files:
 - app/models/subject_local_authority_entry.rb
 - app/models/sufia/avatar_uploader.rb
 - app/models/sufia/avatar_validator.rb
+- app/models/sufia/download.rb
 - app/models/sufia/pageview.rb
 - app/models/trophy.rb
 - app/models/version_committer.rb
+- app/services/sufia/analytics.rb
 - app/services/sufia/id_service.rb
 - app/services/sufia/noid.rb
-- app/services/sufia/usage_statistics.rb
 - config/locales/sufia.en.yml
 - lib/generators/sufia/models/install_generator.rb
 - lib/generators/sufia/models/templates/config/analytics.yml
@@ -334,34 +353,15 @@ files:
 - lib/sufia/models/engine.rb
 - lib/sufia/models/file_content.rb
 - lib/sufia/models/file_content/versions.rb
-- lib/sufia/models/generic_file.rb
-- lib/sufia/models/generic_file/accessible_attributes.rb
-- lib/sufia/models/generic_file/actions.rb
-- lib/sufia/models/generic_file/audit.rb
-- lib/sufia/models/generic_file/characterization.rb
-- lib/sufia/models/generic_file/derivatives.rb
-- lib/sufia/models/generic_file/export.rb
-- lib/sufia/models/generic_file/featured.rb
-- lib/sufia/models/generic_file/metadata.rb
-- lib/sufia/models/generic_file/mime_types.rb
-- lib/sufia/models/generic_file/permissions.rb
-- lib/sufia/models/generic_file/reload_on_save.rb
-- lib/sufia/models/generic_file/thumbnail.rb
-- lib/sufia/models/generic_file/trophies.rb
-- lib/sufia/models/generic_file/versions.rb
-- lib/sufia/models/generic_file/virus_check.rb
-- lib/sufia/models/generic_file/web_form.rb
 - lib/sufia/models/jobs/active_fedora_pid_based_job.rb
 - lib/sufia/models/jobs/audit_job.rb
 - lib/sufia/models/jobs/batch_update_job.rb
 - lib/sufia/models/jobs/characterize_job.rb
+- lib/sufia/models/jobs/create_derivatives_job.rb
 - lib/sufia/models/jobs/import_url_job.rb
 - lib/sufia/models/jobs/resolrize_job.rb
-- lib/sufia/models/jobs/transcode_audio_job.rb
-- lib/sufia/models/jobs/transcode_video_job.rb
 - lib/sufia/models/model_methods.rb
 - lib/sufia/models/resque.rb
-- lib/sufia/models/solr_document_behavior.rb
 - lib/sufia/models/user_local_directory_behavior.rb
 - lib/sufia/models/utils.rb
 - lib/sufia/models/version.rb
@@ -379,12 +379,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
@@ -394,3 +394,4 @@ signing_key:
 specification_version: 4
 summary: Models and services for sufia
 test_files: []
+has_rdoc: