sufia 1.3.0 → 2.0.0

data/spec/models/properties_datastream_spec.rb

@@ -1,21 +1,22 @@
 require 'spec_helper'
 
 describe PropertiesDatastream do
-  it "should have proxy_depositor" do
-    subject.proxy_depositor = 'kim@example.com'
-    subject.proxy_depositor.should == ['kim@example.com']
-    subject.ng_xml.to_xml.should be_equivalent_to "<?xml version=\"1.0\"?><fields><proxyDepositor>kim@example.com</proxyDepositor></fields>"
+
+  it "should have import_url" do
+    subject.import_url = 'http://example.com/somefile.txt'
+    subject.import_url.should == ['http://example.com/somefile.txt']
+    subject.ng_xml.to_xml.should be_equivalent_to "<?xml version=\"1.0\"?><fields><importUrl>http://example.com/somefile.txt</importUrl></fields>"
   end
 
   describe "to_solr" do
     before do
       @doc = PropertiesDatastream.new.tap do |ds|
-        ds.proxy_depositor = 'kim@example.com'
+        ds.import_url = 'http://example.com/somefile.txt'
       end 
     end
     subject { @doc.to_solr}
-    it "should have proxy_depositor" do
-      subject['proxy_depositor_ssim'].should == ['kim@example.com']
+    it "should have import_url" do
+      subject['import_url_ssim'].should == ['http://example.com/somefile.txt']
     end
   end
 end

data/spec/models/transcode_audio_job_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe TranscodeAudioJob, :if => Sufia::Engine.config.enable_ffmpeg do
+describe TranscodeAudioJob, :if => Sufia.config.enable_ffmpeg do
   before do
     @generic_file = GenericFile.new
     @generic_file.apply_depositor_metadata('jcoyne@example.com')

data/spec/models/transcode_video_job_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe TranscodeVideoJob, :if => Sufia::Engine.config.enable_ffmpeg do
+describe TranscodeVideoJob, :if => Sufia.config.enable_ffmpeg do
   before do
     @generic_file = GenericFile.new
     @generic_file.apply_depositor_metadata('jcoyne@example.com')

data/spec/views/batch_edits/check_all_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe 'Check All' do
+  before (:all) do
+    @document_list = ['a','b','c']
+    @batch_size_on_other_page = 0
+    @max_batch_size = 100
+  end
+
+  it 'should render batch edits actions' do
+    controller.prepend_view_path "app/views/batch_edits"
+    html = render :partial=>'/batch_edits/check_all'
+    html.should have_selector("li[data-behavior='batch-edit-select-abc']")
+  end
+
+  it 'should render dashboard actions' do
+    controller.prepend_view_path "app/views/dashboard"
+    html = render :partial=>'/batch_edits/check_all'
+    html.should have_selector("li[data-behavior='batch-edit-select-none']")
+    html.should have_selector("li[data-behavior='batch-edit-select-page']")
+  end
+end

data/sufia-models/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/sufia-models/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in sufia-models.gemspec
+gemspec

data/sufia-models/LICENSE.md

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

data/sufia-models/README.md

@@ -0,0 +1,39 @@
+# Sufia::Models
+
+An ongoing project to extract Sufia models.
+
+## Why
+
+Sufia is a Rails engine that is an opinionated -- in a good way -- self-deposit application built from [Project Hydra components](https://github.com/projecthydra) that is mostly "turn-key ready".
+And while the turn-key solution is greatly appreciated, there are use cases, namely ours, where its opinions don't quite work;
+Namely the views and controllers. We want a different work flow through our application and a notably different UI.
+
+Enter the **sufia-models** gem.
+The goal of **sufia-models** is to provide a common foundation for the Sufia engine as well as a common foundation for other engines -- [Curate](https://github.com/ndlib/curate).
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'sufia-models'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install sufia-models
+
+## Usage
+
+This project is closely tied to [Sufia](https://github.com/projecthydra/sufia).
+Presently this gems tests are found in the sufia gem (I'm working on it).
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/sufia-models/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/{app → sufia-models/app}/models/batch.rb

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'datastreams/batch_rdf_datastream'
-
 class Batch < ActiveFedora::Base
   include Hydra::ModelMixins::CommonMetadata
   include Hydra::ModelMixins::RightsMetadata
@@ -32,9 +30,9 @@ class Batch < ActiveFedora::Base
 
   def self.find_or_create(pid)
     begin
-      @batch = Batch.find(pid)
+      Batch.find(pid)
     rescue ActiveFedora::ObjectNotFoundError
-      @batch = Batch.create({pid: pid})
+      Batch.create({pid: pid})
     end
   end
 

data/{app → sufia-models/app}/models/checksum_audit_log.rb

@@ -16,10 +16,9 @@ class ChecksumAuditLog < ActiveRecord::Base
   attr_accessible :pass, :pid, :dsid, :version, :created_at
 
   def ChecksumAuditLog.get_audit_log(version)
-    log = ChecksumAuditLog.find_or_create_by_pid_and_dsid_and_version(:pid => version.pid,
-                                                                      :dsid => version.dsid,
-                                                                      :version => version.versionID)
-    log
+    ChecksumAuditLog.find_or_create_by_pid_and_dsid_and_version(:pid => version.pid,
+                                                                :dsid => version.dsid,
+                                                                :version => version.versionID)
   end
 
   def ChecksumAuditLog.prune_history(version)

data/{app → sufia-models/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 → sufia-models/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 → sufia-models/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