sufia-models 0.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9001bbed49080440dc23d1a376a52dbc5fa4c49e
-  data.tar.gz: b4c22cdeecc807ed793f537c061b1f1855e334b2
+  metadata.gz: 7ef0788884e77751228fd4729bf0d364cf4b7eb7
+  data.tar.gz: 6a068dfdb18c10b6e1c6fa1bec8bb08b8d112fd9
 SHA512:
-  metadata.gz: 48a20122f05113657812172339c8890a7ac478d35f21501a85640e069e33acf1bed6a983c27f092cab4b16ce97875311190f9b05e004a7f261cf3596c96325ad
-  data.tar.gz: 07b4084bccb3c38b6674d09cb6334ab0d0ef246fe634a3fdf1638f905b0705334520ee151aa10e46f28aa4927e74502116c52ce07b3f55c265a1e38898d1d92b
+  metadata.gz: b05a7f5da307b2f79017c726fb9cda5ac5278935635537d732c3c5bb5a1f2238d213236a99ae840dfd69418ab072e3f69f14d539c5d64a5b478a9614de98b02d
+  data.tar.gz: fc46b8587afa6b5c5e75675e90cfcb80aa28fef6e3efbe5ecafec98d68fee3b883e71848b12e56352257371a15c75bf84d3086f5090d4ba6f25a3253c6945b9d

data/app/models/datastreams/generic_file_rdf_datastream.rb

@@ -15,19 +15,28 @@
 class GenericFileRdfDatastream < ActiveFedora::NtriplesRDFDatastream
   map_predicates do |map|
     map.part_of(:to => "isPartOf", :in => RDF::DC)
-    map.contributor(:in => RDF::DC) do |index|
+    map.resource_type(:to => "type", :in => RDF::DC) do |index|
       index.as :stored_searchable, :facetable
     end
+    map.title(:in => RDF::DC) do |index|
+      index.as :stored_searchable
+    end
     map.creator(:in => RDF::DC) do |index|
       index.as :stored_searchable, :facetable
     end
-    map.title(:in => RDF::DC) do |index|
-      index.as :stored_searchable
+    map.contributor(:in => RDF::DC) do |index|
+      index.as :stored_searchable, :facetable
     end
     map.description(:in => RDF::DC) do |index|
       index.type :text
       index.as :stored_searchable
     end
+    map.tag(:to => "relation", :in => RDF::DC) do |index|
+      index.as :stored_searchable, :facetable
+    end
+    map.rights(:in => RDF::DC) do |index|
+      index.as :stored_searchable
+    end
     map.publisher(:in => RDF::DC) do |index|
       index.as :stored_searchable, :facetable
     end
@@ -48,21 +57,12 @@ class GenericFileRdfDatastream < ActiveFedora::NtriplesRDFDatastream
     map.language(:in => RDF::DC) do |index|
       index.as :stored_searchable, :facetable
     end
-    map.rights(:in => RDF::DC) do |index|
-      index.as :stored_searchable
-    end
-    map.resource_type(:to => "type", :in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
     map.identifier(:in => RDF::DC) do |index|
       index.as :stored_searchable
     end
     map.based_near(:in => RDF::FOAF) do |index|
       index.as :stored_searchable, :facetable
     end
-    map.tag(:to => "relation", :in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
     map.related_url(:to => "seeAlso", :in => RDF::RDFS)
   end
   begin

data/app/models/datastreams/paranoid_rights_datastream.rb

@@ -1,18 +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.
-
-require 'hydra/datastream/rights_metadata'
 # subclass built-in Hydra RightsDatastream and build in extra model-level validation
 class ParanoidRightsDatastream < Hydra::Datastream::RightsMetadata
   use_terminology Hydra::Datastream::RightsMetadata

data/app/models/datastreams/properties_datastream.rb

@@ -20,8 +20,7 @@ class PropertiesDatastream < ActiveFedora::OmDatastream
     t.depositor :index_as=>[:stored_searchable]
     # This is where we put the relative path of the file if submitted as a folder
     t.relative_path
-
-    t.proxy_depositor path: 'proxyDepositor', :index_as=>:symbol
+    t.import_url path: 'importUrl', :index_as=>:symbol
   end
 
   def self.xml_template

data/lib/sufia/models/engine.rb

@@ -1,3 +1,4 @@
+require 'sufia/models/resque'
 module Sufia
   module Models
     def self.config(&block)
@@ -9,6 +10,20 @@ module Sufia
     end
 
     class Engine < ::Rails::Engine
+
+      # Set some configuration defaults
+      config.enable_ffmpeg = false
+      config.noid_template = '.reeddeeddk'
+      config.ffmpeg_path = 'ffmpeg'
+      config.fits_message_length = 5
+      config.temp_file_base = nil
+      config.minter_statefile = '/tmp/minter-state'
+      config.id_namespace = "sufia"
+      config.fits_path = "fits.sh"
+      config.enable_contact_form_delivery = false
+      config.dropbox_api_key = nil
+      config.queue = Sufia::Resque::Queue
+
       config.autoload_paths += %W(
         #{config.root}/lib/sufia/models/jobs
         #{config.root}/app/models/datastreams

data/lib/sufia/models/generic_file/actions.rb

@@ -38,5 +38,17 @@ module Sufia::GenericFile
         Sufia.config.after_create_content.call(generic_file, user)
       end
     end
+
+    def self.virus_check(file)
+      if defined? ClamAV
+        stat = ClamAV.instance.scanfile(file.path)
+        logger.warn "Virus checking did not pass for #{file.inspect} status = #{stat}" unless stat == 0
+        stat
+      else
+        logger.warn "Virus checking disabled for #{file.inspect}"
+        0
+      end
+    end 
+
   end
 end

data/lib/sufia/models/generic_file/web_form.rb

@@ -1,6 +1,16 @@
 module Sufia
   module GenericFile
     module WebForm
+      extend ActiveSupport::Concern
+      included do
+        before_save :remove_blank_assertions
+      end
+
+      def remove_blank_assertions
+        terms_for_editing.each do |key|
+          self[key] = nil if self[key] == ['']
+        end
+      end
 
       # override this method if you need to initialize more complex RDF assertions (b-nodes)
       def initialize_fields
@@ -10,6 +20,26 @@ module Sufia
         end
       end
 
+      def terms_for_editing
+        terms_for_display -
+         [:part_of, :date_modified, :date_uploaded, :format] #, :resource_type]
+      end
+
+      def terms_for_display
+        self.descMetadata.class.config.keys
+      end
+
+      def to_jq_upload
+        return {
+          "name" => self.title,
+          "size" => self.file_size,
+          "url" => "/files/#{noid}",
+          "thumbnail_url" => self.pid,
+          "delete_url" => "deleteme", # generic_file_path(:id => id),
+          "delete_type" => "DELETE"
+        }
+      end
+
     end
   end
 end

data/lib/sufia/models/generic_file.rb

@@ -26,7 +26,7 @@ module Sufia
 
       belongs_to :batch, :property => :is_part_of
 
-      delegate_to :properties, [:relative_path, :depositor], :unique => true
+      delegate_to :properties, [:relative_path, :depositor, :import_url], :unique => true
       delegate_to :descMetadata, [:date_uploaded, :date_modified], :unique => true
       delegate_to :descMetadata, [:related_url, :based_near, :part_of, :creator,
                                   :contributor, :title, :tag, :description, :rights,
@@ -34,16 +34,9 @@ module Sufia
                                   :resource_type, :identifier, :language]
 
       around_save :characterize_if_changed, :retry_warming
-      before_save :remove_blank_assertions
       before_destroy :cleanup_trophies
     end
 
-    def remove_blank_assertions
-      terms_for_editing.each do |key|
-        self[key] = nil if self[key] == ['']
-      end
-    end
-
 
     def record_version_committer(user)
       version = content.latest_version
@@ -157,26 +150,6 @@ module Sufia
       end
     end
 
-    def to_jq_upload
-      return {
-        "name" => self.title,
-        "size" => self.file_size,
-        "url" => "/files/#{noid}",
-        "thumbnail_url" => self.pid,
-        "delete_url" => "deleteme", # generic_file_path(:id => id),
-        "delete_type" => "DELETE"
-      }
-    end
-
-    def terms_for_editing
-      terms_for_display -
-       [:part_of, :date_modified, :date_uploaded, :format] #, :resource_type]
-    end
-
-    def terms_for_display
-      self.descMetadata.class.config.keys
-    end
-
     # Is this file in the middle of being processed by a batch?
     def processing?
        return false if self.batch.blank?

data/lib/sufia/models/id_service.rb

@@ -43,7 +43,7 @@ module Sufia
 
     def self.next_id
       pid = ''
-      File.open(Sufia::Engine.config.minter_statefile, File::RDWR|File::CREAT, 0644) do |f|
+      File.open(Sufia.config.minter_statefile, File::RDWR|File::CREAT, 0644) do |f|
         f.flock(File::LOCK_EX)
         yaml = YAML::load(f.read)
         yaml = {:template => noid_template} unless yaml

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

@@ -0,0 +1,55 @@
+require 'net/https'
+require 'uri'
+require 'tempfile'
+
+class ImportUrlJob 
+
+  def queue_name
+    :import_url
+  end
+
+  attr_accessor :pid
+
+  def initialize(pid)
+    self.pid = pid 
+  end
+
+  def run
+    generic_file = GenericFile.find(self.pid)
+    f = Tempfile.new(self.pid)
+    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) do |resp|
+        resp.read_body do |segment|
+          f.write(segment)
+        end
+      end
+    end 
+    job_user = User.batchuser()
+    user = User.find_by_user_key(generic_file.depositor)
+    # check for virus
+    if Sufia::GenericFile::Actions.virus_check(f) != 0
+      message = "The file (#{File.basename(uri.path)}) was unable to be imported because it contained a virus."
+      job_user.send_message(user, message, 'File Import Error') 
+      return
+    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)
+    # 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') 
+ 
+  ensure
+    f.close
+    f.unlink
+  end
+end

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

@@ -26,27 +26,39 @@ class UnzipJob
   def run
     Zip::Archive.open_buffer(zip_file.content.content) do |archive|
       archive.each do |f|
-        create_file(f)
+        if f.directory?
+          create_directory(f)
+        else
+          create_file(f)
+        end
       end
     end
   end
 
   protected
 
-  def create_file(f)
+  # Creates a GenericFile object based on +file+
+  # @param file [Zip::File]
+  def create_file(file)
     @generic_file = GenericFile.new
     @generic_file.batch_id = zip_file.batch.pid
-    file_name = f.name
+    file_name = file.name
     mime_types = MIME::Types.of(file_name)
     mime_type = mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
     options = {:label=>file_name, :dsid=>'content', :mimeType=>mime_type}
-    @generic_file.add_file_datastream(f.read, options)
+    @generic_file.add_file_datastream(file.read, options)
     @generic_file.set_title_and_label( file_name, :only_if_blank=>true )
     @generic_file.apply_depositor_metadata(zip_file.edit_users.first)
     @generic_file.date_uploaded = Time.now.ctime
     @generic_file.date_modified = Time.now.ctime
     @generic_file.save
   end
+  
+  # Creates representation of directory corresponding to +file+
+  # Default behavior: _do nothing_
+  # @param file [Zip::File]
+  def create_directory(file)
+  end
 
   def zip_file
     @zip_file ||= GenericFile.find(pid)

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "0.1.2"
+    VERSION = "2.0.0"
   end
 end

data/lib/sufia/models.rb

@@ -14,14 +14,8 @@ module Sufia
   extend ActiveSupport::Autoload
 
   module Models
-
-    extend ActiveSupport::Autoload
-
-    autoload :Resque, 'sufia/models/queue/resque'
-    autoload :User, 'sufia/models/user'
   end
 
-  autoload :Resque, 'sufia/models/resque'
   autoload :Utils, 'sufia/models/utils'
 
   attr_writer :queue

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -273,6 +273,7 @@ files:
 - lib/sufia/models/jobs/batch_update_job.rb
 - lib/sufia/models/jobs/characterize_job.rb
 - lib/sufia/models/jobs/ffmpeg_transcode_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