sufia 1.3.0 → 2.0.0

data/app/views/static/terms.html.erb

@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 %>
 
-<h1>Terms of Use for ScholarSphere</h1>
+<h1>Terms of Use for <%= t('sufia.product_name') %></h1>
 
 <p>
-1.  <strong>General:</strong> The Site is maintained by the The Pennsylvania State University Libraries and The Pennsylvania State University Information Technology Services (ITS), in support of our mission to disseminate information and research to scholars, educators and the public. As used in these Terms of Use, the terms "we, "us," and "our" refer to the Libraries, ITS, and The Pennsylvania State University ("Penn State"). Use of ScholarSphere (the Site and its contents) is subject to the following terms and conditions and all applicable laws. By using the Site or any of its content, you accept and agree to be bound by these Terms of Use and all applicable laws. If any of these Terms of Use are unacceptable to you, do not use the Site.
+1.  <strong>General:</strong> The Site is maintained by the <%= t('sufia.institution_name_full') %> Libraries and <%= t('sufia.institution_name_full') %> Information Technology Services (ITS), in support of our mission to disseminate information and research to scholars, educators and the public. As used in these Terms of Use, the terms "we, "us," and "our" refer to the Libraries, ITS, and <%= t('sufia.institution_name_full') %> ("<%= t('sufia.institution_name') %>"). Use of <%= t('sufia.product_name') %> (the Site and its contents) is subject to the following terms and conditions and all applicable laws. By using the Site or any of its content, you accept and agree to be bound by these Terms of Use and all applicable laws. If any of these Terms of Use are unacceptable to you, do not use the Site.
 </p>
 
 <p>
@@ -25,23 +25,23 @@ limitations under the License.
 </p>
 
 <p>
-3. <strong>Copyright and Use of ScholarSphere Content:</strong> The Site includes text, images, graphics, information, articles, multi-media objects, scholarly projects and other works protected by copyright, trademark and other laws ("Content").  Some of the Content on this site may include materials from older published works that have passed into the "public domain" under U.S. copyright law.  Where such information is known, it is included specifically in the metadata associated with each item of Content.  However, the Site itself and most of the materials held as Content on the Site are protected by copyright and other laws.  These materials have been deposited to enable teaching, research, and other non-profit educational activities.  Unless otherwise specified in the metadata attached to an item of Content, you may use the Site and the Content only for non-commercial, research, educational, or related academic purposes.  Further, you have the responsibility to make your own assessment of the copyright or other legal concerns that might affect your use of ScholarSphere content and to assume personal responsibility for your uses of Content.
+3. <strong>Copyright and Use of <%= t('sufia.product_name') %> Content:</strong> The Site includes text, images, graphics, information, articles, multi-media objects, scholarly projects and other works protected by copyright, trademark and other laws ("Content").  Some of the Content on this site may include materials from older published works that have passed into the "public domain" under U.S. copyright law.  Where such information is known, it is included specifically in the metadata associated with each item of Content.  However, the Site itself and most of the materials held as Content on the Site are protected by copyright and other laws.  These materials have been deposited to enable teaching, research, and other non-profit educational activities.  Unless otherwise specified in the metadata attached to an item of Content, you may use the Site and the Content only for non-commercial, research, educational, or related academic purposes.  Further, you have the responsibility to make your own assessment of the copyright or other legal concerns that might affect your use of <%= t('sufia.product_name') %> content and to assume personal responsibility for your uses of Content.
 </p>
 
 <p>
-4. <strong>Special Permissions:</strong> ScholarSphere does not have the authority to grant or deny special permissions to use images or other Content found on the site beyond those uses that are specifically described in these Terms of Use or as noted specifically on individual items of Content.  ScholarSphere staff are not able to undertake copyright investigations on behalf of Site users.
+4. <strong>Special Permissions:</strong> <%= t('sufia.product_name') %> does not have the authority to grant or deny special permissions to use images or other Content found on the site beyond those uses that are specifically described in these Terms of Use or as noted specifically on individual items of Content.  <%= t('sufia.product_name') %> staff are not able to undertake copyright investigations on behalf of Site users.
 </p>
 
 <p>
-5. <strong>ScholarSphere Access Levels:</strong> Where possible, ScholarSphere makes its Content available to the general public. However, some of the Content on this Site has been made available only to Penn State community users or other user subgroups by the depositor.  Such Content cannot be used, downloaded, or distributed outside the Penn State community (or subgroup identified) without the specific permission of the depositor.
+5. <strong><%= t('sufia.product_name') %> Access Levels:</strong> Where possible, <%= t('sufia.product_name') %> makes its Content available to the general public. However, some of the Content on this Site has been made available only to <%= t('sufia.institution_name') %> community users or other user subgroups by the depositor.  Such Content cannot be used, downloaded, or distributed outside the <%= t('sufia.institution_name') %> community (or subgroup identified) without the specific permission of the depositor.
 </p>
 
 <p>
-6. <strong>Use of ScholarSphere Site and Content:</strong> Unless otherwise specified in the metadata attached to an item, Content that has been made accessible to the general public may be used for non-commercial, research, educational, or related academic purposes only.  Such uses include personal study, distribution to students, research and scholarship (including computational research uses such as data and text-mining, citation-extraction, or cross-referencing) as long as you do not sell the Content or sell advertising on any page on which the Content is displayed.  If you make an item of Content available to others, you shall do so in accordance with the terms of the rights granted pursuant to the particular item of Content, or at a minimum, you will retain with the Content its title, the name of the author(s), a reference to these Terms of Use, any copyright notice included on the original, and any metadata associated with the original. You may not use a facsimile of the published version of an article that may be posted in ScholarSphere under these open access terms, unless the publisher so permits.  You will not make any translation, adaptation or other derivative work of an item of Content except as authorized under U.S. law. You may not sublicense or otherwise transfer your rights in an item of Content, unless specifically authorized by the copyright license granted to the item of Content and will only make Content  available to others for use by them under these Terms of Use.  Links on the Site to third-party web sites are provided solely as a convenience to you. We do not approve or endorse the content of linked third-party sites, and you agree that we will have no responsibility or liability in connection with your use of any linked third-party sites. Nothing in these Terms of Use or on the Site will be construed as granting you any right or license to use any trademarks, service marks or logos displayed on the Site. You agree not to use or register any name, logo or insignia of the Pennsylvania State University or any of its subdivisions for any purpose except with our prior written approval and in accordance with any restrictions required by us.
+6. <strong>Use of <%= t('sufia.product_name') %> Site and Content:</strong> Unless otherwise specified in the metadata attached to an item, Content that has been made accessible to the general public may be used for non-commercial, research, educational, or related academic purposes only.  Such uses include personal study, distribution to students, research and scholarship (including computational research uses such as data and text-mining, citation-extraction, or cross-referencing) as long as you do not sell the Content or sell advertising on any page on which the Content is displayed.  If you make an item of Content available to others, you shall do so in accordance with the terms of the rights granted pursuant to the particular item of Content, or at a minimum, you will retain with the Content its title, the name of the author(s), a reference to these Terms of Use, any copyright notice included on the original, and any metadata associated with the original. You may not use a facsimile of the published version of an article that may be posted in <%= t('sufia.product_name') %> under these open access terms, unless the publisher so permits.  You will not make any translation, adaptation or other derivative work of an item of Content except as authorized under U.S. law. You may not sublicense or otherwise transfer your rights in an item of Content, unless specifically authorized by the copyright license granted to the item of Content and will only make Content  available to others for use by them under these Terms of Use.  Links on the Site to third-party web sites are provided solely as a convenience to you. We do not approve or endorse the content of linked third-party sites, and you agree that we will have no responsibility or liability in connection with your use of any linked third-party sites. Nothing in these Terms of Use or on the Site will be construed as granting you any right or license to use any trademarks, service marks or logos displayed on the Site. You agree not to use or register any name, logo or insignia of <%= t('sufia.institution_name_full') %> or any of its subdivisions for any purpose except with our prior written approval and in accordance with any restrictions required by us.
 </p>
 
 <p>
-7. <strong>Fair Use and Other Lawful Uses:</strong> Nothing in these Terms of Use is intended to restrict or limit you from making uses of Content  that, in the absence of rights granted hereunder, would not infringe or violate anyone's copyright, trademark or other rights.  To the extent permitted by law, adaptation of ScholarSphere Content to enable use and access by persons with disabilities is encouraged.
+7. <strong>Fair Use and Other Lawful Uses:</strong> Nothing in these Terms of Use is intended to restrict or limit you from making uses of Content  that, in the absence of rights granted hereunder, would not infringe or violate anyone's copyright, trademark or other rights.  To the extent permitted by law, adaptation of <%= t('sufia.product_name') %> Content to enable use and access by persons with disabilities is encouraged.
 </p>
 
 <p>
@@ -49,7 +49,7 @@ limitations under the License.
 </p>
 
 <p>
-9. <strong>Disclaimer of Warranties:</strong> THE SITE AND THE CONTENT ARE PROVIDED "AS IS." TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, WE DISCLAIM ALL WARRANTIES OF ANY KIND (EXPRESS, IMPLIED OR OTHERWISE) REGARDING THE SITE OR THE CONTENT, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OWNERSHIP, AND NON-INFRINGEMENT. WE MAKE NO WARRANTY ABOUT THE ACCURACY, RELIABILITY, COMPLETENESS, TIMELINESS, SUFFICIENCY OR QUALITY OF THE SITE OR THE CONTENT, NOR THAT ANY PARTICULAR CONTENT WILL CONTINUE TO BE MADE AVAILABLE. WE DO NOT APPROVE OR ENDORSE ANY POSTED MATERIAL OR CONTENT PROVIDED BY OTHERS, INCLUDING PENN STATE AUTHORS. WE DO NOT WARRANT THAT THE SITE WILL OPERATE WITHOUT ERROR OR INTERRUPTION, OR THAT THE SITE OR ITS SERVER ARE FREE OF COMPUTER VIRUSES OR OTHER HARMFUL MATERIALS.
+9. <strong>Disclaimer of Warranties:</strong> THE SITE AND THE CONTENT ARE PROVIDED "AS IS." TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, WE DISCLAIM ALL WARRANTIES OF ANY KIND (EXPRESS, IMPLIED OR OTHERWISE) REGARDING THE SITE OR THE CONTENT, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OWNERSHIP, AND NON-INFRINGEMENT. WE MAKE NO WARRANTY ABOUT THE ACCURACY, RELIABILITY, COMPLETENESS, TIMELINESS, SUFFICIENCY OR QUALITY OF THE SITE OR THE CONTENT, NOR THAT ANY PARTICULAR CONTENT WILL CONTINUE TO BE MADE AVAILABLE. WE DO NOT APPROVE OR ENDORSE ANY POSTED MATERIAL OR CONTENT PROVIDED BY OTHERS, INCLUDING <%= t('sufia.institution_name').upcase %> AUTHORS. WE DO NOT WARRANT THAT THE SITE WILL OPERATE WITHOUT ERROR OR INTERRUPTION, OR THAT THE SITE OR ITS SERVER ARE FREE OF COMPUTER VIRUSES OR OTHER HARMFUL MATERIALS.
 </p>
 
 <p>
@@ -57,14 +57,14 @@ limitations under the License.
 </p>
 
 <p>
-11. <strong>Indemnity:</strong> You agree to indemnify and hold harmless the Pennsylvania State University and its trustees, officers, fellows, students, employees and agents, from and against all claims, actions, suits, damages, liabilities and costs (including, without limitation, reasonable legal fees) arising from or relating to your use of the Site or any of the Content or your failure to comply with any provision of these Terms of Use.
+11. <strong>Indemnity:</strong> You agree to indemnify and hold harmless <%= t('sufia.institution_name_full') %> and its trustees, officers, fellows, students, employees and agents, from and against all claims, actions, suits, damages, liabilities and costs (including, without limitation, reasonable legal fees) arising from or relating to your use of the Site or any of the Content or your failure to comply with any provision of these Terms of Use.
 </p>
 
 <p>
 12.  <strong>Communications:</strong>
 <ul>
   <li>
-A. Copyright Complaints: We respect the intellectual property rights of others. If you believe your copyright has been violated on the Site, please notify us through Penn State's designated agent under the Digital Millennium Copyright Act (see 17 U.S.C. Â&sect;512(c)(3).</li>
+A. Copyright Complaints: We respect the intellectual property rights of others. If you believe your copyright has been violated on the Site, please notify us through <%= t('sufia.institution_name') %>'s designated agent under the Digital Millennium Copyright Act (see 17 U.S.C. Â&sect;512(c)(3).</li>
   <li> B. Other Site Issues: Please direct all other communications to <a href="/contact/">contact form</a>.</ul>
 </ul>
 </p>
@@ -74,5 +74,5 @@ A. Copyright Complaints: We respect the intellectual property rights of others.
 </p>
 
 <p>
-14. <strong>Termination:</strong> The permissions granted to you will terminate automatically upon any breach by you of these Terms of Use.  If we take down or otherwise cease to make a work available as an item of Content, the permission granted to you hereunder to use that Content thereafter will terminate at that time. ScholarSphere is maintained as a scholarly and educational resource by Penn State which may be modified or terminated by the University in its sole discretion.
+14. <strong>Termination:</strong> The permissions granted to you will terminate automatically upon any breach by you of these Terms of Use.  If we take down or otherwise cease to make a work available as an item of Content, the permission granted to you hereunder to use that Content thereafter will terminate at that time. <%= t('sufia.product_name') %> is maintained as a scholarly and educational resource by <%= t('sufia.institution_name') %> which may be modified or terminated by the University in its sole discretion.
 </p>

data/app/views/static/zotero.html.erb

@@ -17,6 +17,6 @@ limitations under the License.
 <h1>Export to Zotero</h1>
 <p>
 Exporting to Zotero is supported via embedded metadata.  If Zotero
-does not automatically pick up metadata for files deposited in
-ScholarSphere, please report the issue via the  <%= link_to 'Contact Form', contact_form_index_path %>.
+does not automatically pick up metadata for deposited files, please
+report the issue via the  <%= link_to 'Contact Form', contact_form_index_path %>.
 </p>

data/config/initializers/sufia_events.rb

@@ -0,0 +1,3 @@
+Sufia.config.after_create_content = lambda {|generic_file, user|
+  Sufia.queue.push(ContentDepositEventJob.new(generic_file.pid, user.user_key))
+}

data/config/locales/sufia.en.yml

@@ -1,8 +1,6 @@
 en:
   sufia:
-    product_name:       "ScholarSphere"
     account_name:       "Penn State Access Account Id"
-    institution_name:   "Penn State"
     deposit_agreement:  "ScholarSphere's Deposit Agreement"
     upload_tooltip:     "Please accept Deposit Agreement before you can upload."
     share_button:       "Share Your Work"
@@ -21,11 +19,11 @@ en:
       date_created:     "Date Created"
       related_url:      "Related URL"
 
-    metadata_help: 
+    metadata_help:
       resource_type: "Pre-defined categories to describe the type of file content being uploaded, such as \"article\" or \"dataset.\"  More than one type may be selected."
       title: "A name for the file to aid in identifying it. Defaults to the file name, though a more descriptive title is encouraged. <em>This is a required field</em>."
       tag: "Words or phrases you select to describe what the file is about. These are used to search for content. <em>This is a required field</em>."
-      subject: "Headings or index terms describing what the file is about; these <em>do</em> need to conform to an existing vocabulary. Currently ScholarSphere supports Library of Congress Subject Headings."
+      subject: "Headings or index terms describing what the file is about; these <em>do</em> need to conform to an existing vocabulary. Currently supports Library of Congress Subject Headings."
       creator: "The person or group responsible for the file being uploaded. Usually this is the author of the content. Personal names should be entered with the last name first, e.g. \"Smith, John.\" <em>This is a required field</em>."
       related_url: "A link to a website or other specific content (audio, video, PDF document) related to the file. An example is the URL of a research project from which the file was derived."
       based_near: "A place name related to the file, such as its site of publication, or the city, state, or country the file's contents are about. Calls upon the GeoNames web service (<a href=\"http://www.geonames.org\">http://www.geonames.org</a>)."
@@ -34,7 +32,6 @@ en:
       description: "Free-text notes about the file itself. Examples include abstracts of a paper, citation information for a journal article, or a tag indicating a larger collection to which the file belongs."
       identifier: "A unique handle describing the file. An example would be a DOI for a journal article, or an ISBN or OCLC number for a book."
       language: " The language of the file content."
-      publisher: "The person or group making the file available. Generally this is Penn State or the Penn State University Libraries."
+      publisher: "The person or group making the file available. Generally this is Penn State."
       rights: "Licensing and distribution information governing access to the file. Select from the provided drop-down list. <em>This is a required field</em>."
 
-    

data/lib/generators/sufia/sufia_generator.rb

@@ -62,7 +62,7 @@ add_groups_to_users.rb		create_local_authorities.rb	create_trophies.rb}.each do
         "  \n# Adds Sufia behaviors into the application controller \n" +        
         "  include Sufia::Controller\n"
       end
-      gsub_file file_path, "layout 'blacklight'", "layout 'hydra-head'"
+      gsub_file file_path, "layout 'blacklight'", "layout 'sufia-one-column'"
     else
       puts "     \e[31mFailure\e[0m  Could not find #{file_path}.  To add Sufia behaviors to your  Controllers, you must include the Sufia::Controller module in the Controller class definition." 
     end

data/lib/generators/sufia/templates/config/resque_config.rb

@@ -19,4 +19,4 @@ config = YAML::load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml')
 Resque.redis = Redis.new(host: config[:host], port: config[:port], thread_safe: true)
 
 Resque.inline = rails_env == 'test'
-Resque.redis.namespace = "scholarsphere:#{rails_env}"
+Resque.redis.namespace = "#{Sufia::Engine.config.id_namespace}:#{rails_env}"

data/lib/generators/sufia/templates/config/sufia.rb

@@ -6,6 +6,9 @@ Sufia.config do |config|
       :file_author => :creator
     }
 
+  # Specify a different template for your repositories unique identifiers
+  # config.noid_template = ".reeddeeddk"
+
   config.max_days_between_audits = 7
 
       config.cc_licenses = {

data/lib/sufia.rb

@@ -3,14 +3,8 @@ require 'blacklight'
 require 'blacklight_advanced_search'
 require 'hydra/head'
 require 'hydra-batch-edit'
-require 'resque/server'
+require 'sufia/models'
 
-require 'mailboxer'
-require 'acts_as_follower'
-require 'paperclip'
-require 'nest'
-require 'RMagick'
-require 'activerecord-import'
 require 'rails_autolink'
 require 'sufia/dashboard_controller_behavior'
 require "sufia/contact_form_controller_behavior"
@@ -19,64 +13,21 @@ autoload :Zip, 'zipruby'
 module Sufia
   extend ActiveSupport::Autoload
 
-  autoload :Resque, 'sufia/queue/resque'
-
-  attr_accessor :queue
-
   class Engine < ::Rails::Engine
     engine_name 'sufia'
-
-    # Set some configuration defaults
-    config.queue = Sufia::Resque::Queue
-    config.enable_ffmpeg = false
-    config.ffmpeg_path = 'ffmpeg'
-    config.fits_message_length = 5
-    config.temp_file_base = nil
-    config.id_namespace = "sufia"
-    config.fits_path = "fits.sh"
-    config.enable_contact_form_delivery = false
  
     config.autoload_paths += %W(
-      #{config.root}/lib/sufia/jobs
       #{config.root}/app/controllers/concerns
       #{config.root}/app/models/concerns
       #{config.root}/app/models/datastreams
     )
-    
-    initializer "Patch active_fedora" do
-      require 'sufia/active_fedora/redis'
-    end
-
-    initializer "Patch active_record" do
-      require 'sufia/active_record/redis'
-    end
-
-  end
-
-  def self.config(&block)
-    @@config ||= Sufia::Engine::Configuration.new
-
-    yield @@config if block
-
-    return @@config
-  end
 
-  def self.queue
-    @queue ||= config.queue.new('sufia')
   end
 
-  autoload :GenericFile
   autoload :Controller
-  autoload :Utils
-  autoload :User
-  autoload :ModelMethods
-  autoload :Noid
-  autoload :IdService
   autoload :HttpHeaderAuth
-  autoload :SolrDocumentBehavior
   autoload :FilesControllerBehavior
   autoload :BatchEditsControllerBehavior
   autoload :DownloadsControllerBehavior
-  autoload :FileContent
 end
 

data/lib/sufia/batch_edits_controller_behavior.rb

@@ -1,6 +1,10 @@
 module Sufia
   module BatchEditsControllerBehavior
     extend ActiveSupport::Concern
+    
+    included do
+      layout "sufia-one-column"
+    end
 
     def edit
        super

data/lib/sufia/controller.rb

@@ -56,6 +56,19 @@ module Sufia::Controller
       @batches=current_user.mailbox.inbox.map {|msg| msg.last_message.body[/<a class="batchid ui-helper-hidden">(.*)<\/a>The file(.*)/,1]}.select{|val| !val.blank?}
     end
   end
+  
+  def search_layout
+    if has_search_parameters? 
+      "sufia-two-column"
+    else
+      "homepage"
+    end
+  end
+  
+  # This repeats has_search_parameters? method from Blacklight::CatalogHelperBehavior 
+  def has_search_parameters?
+    !params[:q].blank? or !params[:f].blank? or !params[:search_field].blank?
+  end
 
   protected
 

data/lib/sufia/dashboard_controller_behavior.rb

@@ -25,11 +25,12 @@ module Sufia
       include Blacklight::Catalog
       include Blacklight::Configurable # comply with BL 3.7
       include ActionView::Helpers::DateHelper
+      # This is needed as of BL 3.7
+      self.copy_blacklight_config_from(CatalogController)
+
       include BlacklightAdvancedSearch::ParseBasicQ
       include BlacklightAdvancedSearch::Controller
     
-      # This is needed as of BL 3.7
-      self.copy_blacklight_config_from(CatalogController)
     
       before_filter :authenticate_user!
       before_filter :enforce_show_permissions, :only=>:show

data/lib/sufia/files_controller_behavior.rb

@@ -21,7 +21,8 @@ module Sufia
       include Hydra::Controller::ControllerBehavior
       include Blacklight::Configurable # comply with BL 3.7
       include Sufia::Noid # for normalize_identifier method
-
+      layout "sufia-one-column"
+      
       # This is needed as of BL 3.7
       self.copy_blacklight_config_from(CatalogController)
 
@@ -67,6 +68,28 @@ module Sufia
 
     # routed to /files (POST)
     def create
+      case params['file_coming_from']
+      when 'dropbox'
+        create_from_url(params)
+      else
+        create_from_local(params)
+      end
+    end
+
+    def create_from_url(params)
+      params[:dropbox_urls].each do |db_file|
+        next if db_file.blank?
+        # do not remove :: 
+        @generic_file = ::GenericFile.new
+        @generic_file.import_url = db_file
+        @generic_file.label = File.basename(db_file)
+        Sufia::GenericFile::Actions.create_metadata(@generic_file, current_user, params[:batch_id])
+        Sufia.queue.push(ImportUrlJob.new(@generic_file.pid)) 
+      end
+      redirect_to sufia.batch_edit_path(params[:batch_id])
+    end
+
+    def create_from_local(params)
       begin
         # check error condition No files
         return json_error("Error! No file to save") if !params.has_key?(:files)
@@ -157,8 +180,7 @@ module Sufia
     def process_file(file)
       if virus_check(file) == 0 
         @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]
+        update_metadata_from_upload_screen
         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|
@@ -194,6 +216,13 @@ module Sufia
       'content'
     end
 
+    # this is provided so that implementing application can override this behavior and map params to different attributes
+    def update_metadata_from_upload_screen
+      # Relative path is set by the jquery uploader when uploading a directory
+      @generic_file.relative_path = params[:relative_path] if params[:relative_path]
+    end
+
+
     # this is provided so that implementing application can override this behavior and map params to different attributes
     def update_metadata
       valid_attributes = params[:generic_file].select { |k,v| (@generic_file.terms_for_editing + [:permissions]).include? k.to_sym}
@@ -204,15 +233,9 @@ module Sufia
 
 
     def virus_check( file)
-      if defined? ClamAV
-        stat = ClamAV.instance.scanfile(file.path)
-        flash[:error] = "Virus checking did not pass for #{file.original_filename} status = #{stat}" unless stat == 0
-        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
+      stat = Sufia::GenericFile::Actions.virus_check(file)
+      flash[:error] = "Virus checking did not pass for #{File.basename(file.path)} status = #{stat}" unless stat == 0
+      stat
     end 
 
   end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "1.3.0"
+  VERSION = "2.0.0"
 end

data/spec/controllers/batch_edits_controller_spec.rb

@@ -27,8 +27,8 @@ describe BatchEditsController do
     it "should be successful" do
       get :edit
       response.should be_successful
-      assigns[:terms].should == [:contributor, :creator, :description, :publisher,
-        :date_created, :subject, :language, :rights, :identifier, :based_near, :tag, :related_url]
+      assigns[:terms].should == [:creator, :contributor, :description, :tag, :rights, :publisher, 
+                        :date_created, :subject, :language, :identifier, :based_near, :related_url]
       assigns[:show_file].creator.should == ["Fred", "Wilma"]
       assigns[:show_file].publisher.should == ["Rand McNally"]
       assigns[:show_file].language.should == ["en"]

data/spec/controllers/generic_files_controller_spec.rb

@@ -73,6 +73,42 @@ describe GenericFilesController do
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service => '1'
     end
 
+    it "should download and import a file from a given url" do
+      date_today = Date.today
+      Date.stub(:today).and_return(date_today)
+      generic_file = GenericFile.new      #find(self.pid)
+      Sufia::GenericFile::Actions.create_metadata(generic_file, @user, '1234')
+      #generic_file.import_url = "https://dl.dropboxusercontent.com/1/view/kcb4j1dtkw0td3z/ArticleCritique.doc"
+      generic_file.import_url =  "https://dl.dropboxusercontent.com/1/view/m4og1xrgbk3ihw6/Getting%20Started.pdf"
+      generic_file.save
+      f = Tempfile.new(generic_file.pid)  #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.to_s) 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)
+    end
+
     it "should create and save a file asset from the given params" do
       date_today = Date.today
       Date.stub(:today).and_return(date_today)
@@ -105,7 +141,7 @@ describe GenericFilesController do
     end
 
     it "should create batch associations from batch_id" do
-      Sufia::Engine.config.stub(:id_namespace).and_return('sample')
+      Sufia.config.stub(:id_namespace).and_return('sample')
       file = fixture_file_upload('/world.png','image/png')
       controller.stub(:add_posted_blob_to_asset)
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"

data/spec/models/generic_file_spec.rb

@@ -41,15 +41,15 @@ describe GenericFile do
 
   describe "terms_for_editing" do
     it "should return a list" do
-      @file.terms_for_editing.should == [ :contributor, :creator, :title, :description, :publisher,
-       :date_created, :subject, :language, :rights, :resource_type, :identifier, :based_near, :tag, :related_url]
+      @file.terms_for_editing.should == [:resource_type, :title, :creator, :contributor, :description, :tag, 
+                    :rights, :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url]
     end
   end
   describe "terms_for_display" do
     it "should return a list" do
-      @file.terms_for_display.should == [ :part_of, :contributor, :creator, :title, :description, 
-        :publisher, :date_created, :date_uploaded, :date_modified,:subject, :language, :rights, 
-        :resource_type, :identifier, :based_near, :tag, :related_url]
+      @file.terms_for_display.should == [:part_of, :resource_type, :title, :creator, :contributor, :description, 
+        :tag, :rights, :publisher, :date_created, :date_uploaded, :date_modified, :subject, :language, :identifier, 
+        :based_near, :related_url]
     end
   end
 
@@ -335,7 +335,7 @@ describe GenericFile do
     after do
       @f.delete
     end
-    describe "with a video", :if => Sufia::Engine.config.enable_ffmpeg do
+    describe "with a video", :if => Sufia.config.enable_ffmpeg do
       before do
         @f.stub(:mime_type=>'video/quicktime')  #Would get set by the characterization job
         @f.add_file_datastream(File.new("#{fixture_path}/countdown.avi", 'rb'), :dsid=>'content')