sufia 3.4.0.rc3 → 3.4.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aaf4403b11351ceaec8191e0717c0d7fbdef037
-  data.tar.gz: 0b5f652ae3ea1c824095e61d3c2f31a9cdf629ab
+  metadata.gz: 49dcaf1bde3b21b0f57dbae93c5772ffb0d155c3
+  data.tar.gz: ab6e2d7e3dd40b8f564a2f252f3cc56effb035a6
 SHA512:
-  metadata.gz: 0fb341ecba6b0cbd6621225a03f5c468ed11f462f238384da502b416b5ff626cf0098de4e597ed47b37d8c2bb701fdf61d4e0572f790c50b71b1fceec45f81ef
-  data.tar.gz: 7dd4b76cacb8b58f4a21ff25c2fe1c02f53731264f699e88edc682f9a236bfc2ec5c231159d94279c4e94db9cb8fbfbcfd50c19af1c0282dcfa46f0cc1965d9f
+  metadata.gz: 869b250c644be760a7adad86d62e65a33e945db2555442c6fdeb4586a64b2dc117bfae2df64ed46e7efdc1dd5e57ba410cc290526953f4e522159515b4bc343e
+  data.tar.gz: ad4da981d7648aef8e8f48b44d533c738d1193005e13a3b41da07f12938149d2dcd74dacf780a2b729956791db1d17c495e734e459e06b20af8bb28d555c8bc4

data/SUFIA_VERSION

@@ -1 +1 @@
-3.4.0.rc3
+3.4.0.rc4

data/app/controllers/concerns/sufia/dashboard_controller_behavior.rb

@@ -1,17 +1,3 @@
-# -*- coding: utf-8 -*-
-# 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 'blacklight/catalog'
 
 module Sufia
@@ -61,7 +47,7 @@ module Sufia
       # adding a key to the session so that the history will be saved so that batch_edits select all will work
       search_session[:dashboard] = true 
       respond_to do |format|
-        format.html { save_current_search_params }
+        format.html { }
         format.rss  { render :layout => false }
         format.atom { render :layout => false }
       end

data/app/views/dashboard/_index_partials/_list_files.html.erb

@@ -1,19 +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.
-%>
-
 <% noid = document.noid %>
 <tr id="document_<%= noid %>" class="<%= cycle("","zebra") %>">
   <% gf = GenericFile.load_instance_from_solr(document.id) %>
@@ -32,7 +16,7 @@ limitations under the License.
     <span class=center><%= link_to document.title_or_label, sufia.generic_file_path(noid), :id => "src_copy_link#{noid}" %> <br /></span>
   </td>
   <td width="17%"><%= document.date_uploaded %> </td>
-  <td width="5%" align="center">
+  <td width="5%">
     <% if document.registered? %>
       <a href="<%= sufia.generic_file_path(noid) %>/edit/?tab=permissions" id="permission_<%= noid %>"><span class="label label-info" title="<%=t('sufia.institution_name') %>"><%=t('sufia.institution_name') %></span></a>
     <% elsif document.public? %>

data/lib/sufia/version.rb

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

data/spec/models/file_content_datastream_spec.rb

@@ -55,20 +55,13 @@ describe FileContentDatastream do
       @subject.stub(:dsVersionID=>'content.7')
     end
     it "should return an xml document", :unless => $in_travis do
-      repo = double("repo")
-      repo.stub(:config=>{})
-      f = File.new(fixture_path + '/world.png')
-      content = double("file")
-      content.stub(:read=>f.read)
-      content.stub(:rewind=>f.rewind)
-      @subject.stub(:content).and_return(f)
+      f = File.new(fixture_path + '/world.png', 'rb')
+      @subject.content = f.read
       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'
     end
     it "should return expected results when invoked via HTTP", :unless => $in_travis do
-      repo = double("repo")
-      repo.stub(:config=>{})
       f = ActionDispatch::Http::UploadedFile.new(:tempfile => File.new(fixture_path + '/world.png'),
                                                  :filename => 'world.png')
       content = double("file")

data/sufia-models/app/models/batch.rb

@@ -8,10 +8,7 @@ class Batch < ActiveFedora::Base
   belongs_to :user, :property => "creator"
   has_many :generic_files, :property => :is_part_of
 
-  delegate :title, :to => :descMetadata, multiple: true
-  delegate :creator, :to => :descMetadata, multiple: true
-  delegate :part, :to => :descMetadata, multiple: true
-  delegate :status, :to => :descMetadata, multiple: true
+  has_attributes :title, :creator, :part, :status, datastream: :descMetadata, multiple: true
 
   def self.find_or_create(pid)
     begin

data/sufia-models/lib/sufia/models/generic_file/characterization.rb

@@ -3,9 +3,9 @@ module Sufia
     module Characterization
       extend ActiveSupport::Concern
       included do
-        has_metadata :name => "characterization", :type => FitsDatastream
-        delegate :mime_type, :to => :characterization, multiple: false
-        delegate_to :characterization, [:format_label, :file_size, :last_modified,
+        has_metadata "characterization", :type => FitsDatastream
+        has_attributes :mime_type, datastream: :characterization, multiple: false
+        has_attributes :format_label, :file_size, :last_modified,
                                         :filename, :original_checksum, :rights_basis,
                                         :copyright_basis, :copyright_note,
                                         :well_formed, :valid, :status_message,
@@ -20,7 +20,7 @@ module Sufia
                                         :gps_timestamp, :latitude, :longitude,
                                         :character_set, :markup_basis,
                                         :markup_language, :duration, :bit_depth,
-                                        :sample_rate, :channels, :data_format, :offset], multiple: true
+                                        :sample_rate, :channels, :data_format, :offset, datastream: :characterization, multiple: true
 
       end
 

data/sufia-models/lib/sufia/models/generic_file/metadata.rb

@@ -10,12 +10,12 @@ module Sufia
         has_file_datastream "thumbnail"
 
 
-        delegate_to :properties, [:relative_path, :depositor, :import_url], multiple: false
-        delegate_to :descMetadata, [:date_uploaded, :date_modified], multiple: false 
-        delegate_to :descMetadata, [:related_url, :based_near, :part_of, :creator,
+        has_attributes :relative_path, :depositor, :import_url, datastream: :properties, multiple: false
+        has_attributes :date_uploaded, :date_modified, datastream: :descMetadata, multiple: false 
+        has_attributes :related_url, :based_near, :part_of, :creator,
                                     :contributor, :title, :tag, :description, :rights,
                                     :publisher, :date_created, :subject,
-                                    :resource_type, :identifier, :language], multiple: true
+                                    :resource_type, :identifier, :language, datastream: :descMetadata, multiple: true
       end
     end
   end

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

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

data/sufia-models/sufia-models.gemspec

@@ -33,10 +33,12 @@ 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 "active-fedora", "~> 6.7.0"
+  spec.add_dependency "blacklight", "~> 4.5.0"
   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'
+  spec.add_dependency 'resque', '~> 1.23'
   spec.add_dependency 'resque-pool', '0.3.0'
   spec.add_dependency 'noid', '~> 0.6.6'
   spec.add_dependency 'mailboxer', '~> 0.11.0'

data/tasks/sufia-dev.rake

@@ -26,7 +26,7 @@ end
 desc "Run specs"
 RSpec::Core::RakeTask.new(:rspec) do |t|
   t.pattern = '../**/*_spec.rb'
-  t.rspec_opts = "--colour -I ../"
+  t.rspec_opts = ["--colour -I ../", '--backtrace']
 end
 
 desc "Load fixtures"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 3.4.0.rc3
+  version: 3.4.0.rc4
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-29 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.rc3
+        version: 3.4.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0.rc3
+        version: 3.4.0.rc4
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -473,16 +473,6 @@ files:
 - lib/generators/sufia/sufia_generator.rb
 - lib/generators/sufia/templates/catalog_controller.rb
 - lib/generators/sufia/templates/config/action_dispatch_http_upload_monkey_patch.rb
-- lib/generators/sufia/templates/migrations/acts_as_follower_migration.rb
-- lib/generators/sufia/templates/migrations/add_avatars_to_users.rb
-- lib/generators/sufia/templates/migrations/add_groups_to_users.rb
-- lib/generators/sufia/templates/migrations/add_ldap_attrs_to_user.rb
-- lib/generators/sufia/templates/migrations/add_social_to_users.rb
-- lib/generators/sufia/templates/migrations/create_checksum_audit_logs.rb
-- lib/generators/sufia/templates/migrations/create_local_authorities.rb
-- lib/generators/sufia/templates/migrations/create_single_use_links.rb
-- lib/generators/sufia/templates/migrations/create_trophies.rb
-- lib/generators/sufia/templates/migrations/create_version_committers.rb
 - lib/sufia.rb
 - lib/sufia/batch_edits_controller_behavior.rb
 - lib/sufia/controller.rb
@@ -751,7 +741,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University

data/lib/generators/sufia/templates/migrations/acts_as_follower_migration.rb

@@ -1,17 +0,0 @@
-class ActsAsFollowerMigration < ActiveRecord::Migration
-  def self.up
-    create_table :follows, :force => true do |t|
-      t.references :followable, :polymorphic => true, :null => false
-      t.references :follower,   :polymorphic => true, :null => false
-      t.boolean :blocked, :default => false, :null => false
-      t.timestamps
-    end
-
-    add_index :follows, ["follower_id", "follower_type"],     :name => "fk_follows"
-    add_index :follows, ["followable_id", "followable_type"], :name => "fk_followables"
-  end
-
-  def self.down
-    drop_table :follows
-  end
-end

data/lib/generators/sufia/templates/migrations/add_avatars_to_users.rb

@@ -1,9 +0,0 @@
-class AddAvatarsToUsers < ActiveRecord::Migration
-  def self.up
-    add_attachment :users, :avatar
-  end
-
-  def self.down
-    remove_attachment :users, :avatar
-  end
-end

data/lib/generators/sufia/templates/migrations/add_groups_to_users.rb

@@ -1,11 +0,0 @@
-class AddGroupsToUsers < ActiveRecord::Migration
-  def self.up
-    add_column :users, :group_list, :text
-    add_column :users, :groups_last_update, :datetime
-  end
-
-  def self.down
-    remove_column :users, :group_list
-    remove_column :users, :groups_last_update
-  end
-end

data/lib/generators/sufia/templates/migrations/add_ldap_attrs_to_user.rb

@@ -1,27 +0,0 @@
-class AddLdapAttrsToUser < ActiveRecord::Migration
-  def self.up
-    add_column :users, :display_name, :string
-    add_column :users, :address, :string
-    add_column :users, :admin_area, :string
-    add_column :users, :department, :string
-    add_column :users, :title, :string
-    add_column :users, :office, :string
-    add_column :users, :chat_id, :string
-    add_column :users, :website, :string
-    add_column :users, :affiliation, :string
-    add_column :users, :telephone, :string
-  end
-
-  def self.down
-    remove_column :users, :display_name
-    remove_column :users, :address
-    remove_column :users, :admin_area
-    remove_column :users, :department
-    remove_column :users, :title
-    remove_column :users, :office
-    remove_column :users, :chat_id
-    remove_column :users, :website
-    remove_column :users, :affiliation
-    remove_column :users, :telephone
-  end
-end

data/lib/generators/sufia/templates/migrations/add_social_to_users.rb

@@ -1,13 +0,0 @@
-class AddSocialToUsers < ActiveRecord::Migration
-  def self.up
-    add_column :users, :facebook_handle, :string
-    add_column :users, :twitter_handle, :string
-    add_column :users, :googleplus_handle, :string
-  end
-
-  def self.down
-    remove_column :users, :facebook_handle, :string
-    remove_column :users, :twitter_handle, :string
-    remove_column :users, :googleplus_handle, :string
-  end
-end

data/lib/generators/sufia/templates/migrations/create_checksum_audit_logs.rb

@@ -1,20 +0,0 @@
-class CreateChecksumAuditLogs < ActiveRecord::Migration
-  def self.up
-    create_table :checksum_audit_logs do |t|
-      t.string :pid
-      t.string :dsid
-      t.string :version
-      t.integer :pass
-      t.string :expected_result
-      t.string :actual_result
-      t.timestamps
-    end
-    add_index :checksum_audit_logs, [:pid, :dsid], :name=>'by_pid_and_dsid', :order => {:created_at => "DESC" }
-    
-  end
-
-  def self.down
-    remove_index(:checksum_audit_logs, :name => 'by_pid_and_dsid')
-    drop_table :checksum_audit_logs
-  end
-end

data/lib/generators/sufia/templates/migrations/create_local_authorities.rb

@@ -1,50 +0,0 @@
-class CreateLocalAuthorities < ActiveRecord::Migration
-  def self.up
-    create_table :local_authority_entries, :force => true do |t|
-      t.integer :local_authority_id
-      t.string :label
-      t.string :uri
-    end
-
-    create_table :local_authorities, :force => true do |t|
-      t.string :name, :unique => true
-    end
-
-    create_table :domain_terms, :force => true do |t|
-      t.string :model
-      t.string :term
-    end
-
-    create_table :domain_terms_local_authorities, :id => false do |t|
-      t.integer :domain_term_id, :foreign_key => true
-      t.integer :local_authority_id, :foreign_key => true
-    end
-
-    create_table :subject_local_authority_entries, :force => true  do |t|
-      t.string :label
-      t.string :lowerLabel
-      t.string :url
-    end
-
-    add_index :local_authority_entries, [:local_authority_id, :label], :name => 'entries_by_term_and_label'
-    add_index :local_authority_entries, [:local_authority_id, :uri], :name => 'entries_by_term_and_uri'
-    add_index :domain_terms, [:model, :term], :name => 'terms_by_model_and_term'
-    add_index :domain_terms_local_authorities, [:local_authority_id, :domain_term_id], :name => 'dtla_by_ids1'
-    add_index :domain_terms_local_authorities, [:domain_term_id, :local_authority_id], :name => 'dtla_by_ids2'
-    add_index :subject_local_authority_entries, [:lowerLabel], :name => 'entries_by_lower_label'
-  end
-
-  def self.down
-    drop_table :local_authority_entries
-    drop_table :local_authorities
-    drop_table :domain_terms
-    drop_table :domain_terms_local_authorities
-    drop_table :subject_local_authority_entries
-    remove_index :local_authority_entries, :name => "entries_by_term_and_label"
-    remove_index :local_authority_entries, :name => "entries_by_term_and_uri"
-    remove_index :domain_terms, :name => "terms_by_model_and_term"
-    remove_index :subject_local_authority_entries, :name => 'entries_by_lower_label'
-    remove_index :domain_terms_local_authorities, :name => 'dtla_by_ids1'
-    remove_index :domain_terms_local_authorities, :name => 'dtla_by_ids2'
-  end
-end

data/lib/generators/sufia/templates/migrations/create_single_use_links.rb

@@ -1,12 +0,0 @@
-class CreateSingleUseLinks < ActiveRecord::Migration
-  def change
-    create_table :single_use_links do |t|
-      t.string :downloadKey
-      t.string :path
-      t.string :itemId
-      t.datetime :expires
-
-      t.timestamps
-    end
-  end
-end

data/lib/generators/sufia/templates/migrations/create_trophies.rb

@@ -1,10 +0,0 @@
-class CreateTrophies < ActiveRecord::Migration
-  def change
-    create_table :trophies do |t|
-      t.integer :user_id
-      t.string :generic_file_id
-
-      t.timestamps
-    end
-  end
-end

data/lib/generators/sufia/templates/migrations/create_version_committers.rb

@@ -1,15 +0,0 @@
-class CreateVersionCommitters < ActiveRecord::Migration
-  def self.up
-    create_table :version_committers do |t|
-      t.string :obj_id
-      t.string :datastream_id
-      t.string :version_id
-      t.string :committer_login
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :version_committers
-  end
-end