sufia 3.3.1 → 3.4.0.rc1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjhjMmYxN2Q0N2UwNTc0ZGU1YjY5MTQ0MmM4MjJiMzIwMzZmMjNkNA==
-  data.tar.gz: !binary |-
-    Y2MzMjMzMjI1MzdiMGFlN2YwYjcwNWQzZTBmZTRlMzBjMjZmODBmMA==
+SHA1:
+  metadata.gz: 9e8b880c78652a7107ed7c477a2fd60ac2a18d9b
+  data.tar.gz: f398c4358574df797fcaac72f0ba960c89f5cceb
 SHA512:
-  metadata.gz: !binary |-
-    ZjIyYjQ0OWE1ZmZjMWM3MDlkYzNlNWI3NjBiNGQyNGIxZjI4MWM2ZGMxN2Qz
-    ZWZiOGFmN2YwMjEyNjhiN2FhNWJiZDdkNGRkNTY0ZmM2YzE1YWMzM2E3ZDBk
-    MTRhMWNjYTczNTkzMjNmODY3MzJjNDIyN2Y0MTZkMWRmYTMwMTc=
-  data.tar.gz: !binary |-
-    NzZhNWQzMGMxN2M1ZGQyNjJiNjkxNmExNDRkYzY4NDU4NWE1YzdjMDhiYmU1
-    MjNjNTJmYTgzOTQ0NzFlNjg2OTgwNGY3Yjc5NzkyMmI3ODViZjU2MzdiNWFh
-    Nzk1MjBlYzJjYWFiODM4OGIxNjViM2ZlNmQ3ZmU1OWJmNjBkYjk=
+  metadata.gz: 8f053ac8dcd4692883e481ee0645f72e3f58b0fba80cfb7f12d03b3428e0bf84fa81a5ca80cafba91c73773a37e59e258620fd6bb3b7d0761fb00cf0774df2ca
+  data.tar.gz: 21ea3febe2601469eddf35eb786ab2848f2de7bb2a881153e1655d976242bf4ee9bbad12c4b7253f566217743d15af21b7b2996678d99f701ed183f7a9f4f257

data/History.md

@@ -1,7 +1,11 @@
 # History of Sufia releases
 
-## 3.3.1
-* Update gemspec to specify versions of hydra-batch-edit and hydra-collections [Jim Coble]
+## 3.4.0.rc1
+* 2013-10-01: Remove Visibility, which was moved into hydra-head [Justin Coyne]
+* 2013-10-01: Fix deprecation warnings by switching to
+  Hydra::AccessControls::Permissions [Justin Coyne]
+* 2013-09-27: Works with hydra 6.1.0.rc1 [Justin Coyne]
+
 
 ## 3.3.0
 * Fix authorities deprecations [Justin Coyne]

data/SUFIA_VERSION

@@ -1 +1 @@
-3.3.1
+3.4.0.rc1

data/lib/sufia.rb

@@ -6,8 +6,6 @@ require 'hydra-batch-edit'
 require 'sufia/models'
 
 require 'rails_autolink'
-require 'sufia/dashboard_controller_behavior'
-require "sufia/contact_form_controller_behavior"
 
 autoload :Zip, 'zipruby'
 module Sufia
@@ -20,7 +18,9 @@ module Sufia
       #{config.root}/app/controllers/concerns
       #{config.root}/app/models/concerns
       #{config.root}/app/models/datastreams
+      #{Hydra::Engine.root}/app/models/concerns
     )
+    puts "concern #{Hydra::Engine.root}/app/models/concerns"
 
   end
 

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "3.3.1"
+  VERSION = "3.4.0.rc1"
 end

data/spec/controllers/batch_edits_controller_spec.rb

@@ -8,10 +8,10 @@ describe BatchEditsController do
     User.any_instance.stub(:groups).and_return([])
     controller.stub(:clear_session_user) ## Don't clear out the authenticated session
     request.env["HTTP_REFERER"] = 'test.host/original_page'
-    @routes = Internal::Application.routes
-    
   end
 
+  routes { Internal::Application.routes }
+
   describe "edit" do
     before do
       @one = GenericFile.new(:creator=>"Fred", :language=>'en')

data/spec/controllers/downloads_controller_spec.rb

@@ -29,7 +29,7 @@ describe DownloadsController do
         it "should default to returning configured default download" do
           DownloadsController.default_content_dsid.should == "content"
           controller.stub(:render) # send_data calls render internally
-          expected_content = ActiveFedora::Base.find("sufia:test1").content.content
+          expected_content = ActiveFedora::Base.find("sufia:test1", cast: true).content.content
           controller.should_receive(:send_file_headers!).with({:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
           get "show", :id => "test1"
           response.body.should == expected_content
@@ -37,7 +37,7 @@ describe DownloadsController do
         end
         it "should return requested datastreams" do
           controller.stub(:render) # send_data calls render internally
-          expected_content = ActiveFedora::Base.find("sufia:test1").descMetadata.content
+          expected_content = ActiveFedora::Base.find("sufia:test1", cast: true).descMetadata.content
           controller.should_receive(:send_file_headers!).with({:filename => 'descMetadata', :disposition => 'inline', :type => 'text/plain' })
           get "show", :id => "test1", :datastream_id => "descMetadata"
           response.body.should == expected_content
@@ -45,7 +45,7 @@ describe DownloadsController do
         end
         it "should support setting disposition to inline" do
           controller.stub(:render) # send_data calls render internally
-          expected_content = ActiveFedora::Base.find("sufia:test1").content.content
+          expected_content = ActiveFedora::Base.find("sufia:test1", cast: true).content.content
           controller.should_receive(:send_file_headers!).with({:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
           get "show", :id => "test1", :disposition => "inline"
           response.body.should == expected_content
@@ -54,7 +54,7 @@ describe DownloadsController do
 
         it "should allow you to specify filename for download" do
           controller.stub(:render) # send_data calls render internally
-          expected_content = ActiveFedora::Base.find("sufia:test1").content.content
+          expected_content = ActiveFedora::Base.find("sufia:test1", cast: true).content.content
           controller.should_receive(:send_file_headers!).with({:filename => 'my%20dog.png', :disposition => 'inline', :type => 'image/png' })
           get "show", :id => "test1", "filename" => "my%20dog.png"
           response.body.should == expected_content

data/spec/controllers/single_use_links_viewer_controller_spec.rb

@@ -45,7 +45,7 @@ describe SingleUseLinksViewerController do
     describe "GET 'download'" do
       it "and_return http success" do
         controller.stub(:render)
-        expected_content = ActiveFedora::Base.find(@file.pid).content.content
+        expected_content = ActiveFedora::Base.find(@file.pid, cast: true).content.content
         controller.should_receive(:send_file_headers!).with({:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
         get :download, id:download_link_hash 
         response.body.should == expected_content

data/spec/features/single_use_links_spec.rb

@@ -32,7 +32,7 @@ describe "Create and use single-use links" do
 
     expect(page).to have_css '.download-link'
     find('.download-link').click
-    expected_content = ActiveFedora::Base.find(@file.pid).content.content
+    expected_content = ActiveFedora::Base.find(@file.pid, cast: true).content.content
     expect(page.body).to eq expected_content
   end
 end

data/spec/models/generic_file/visibility_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Sufia::GenericFile::Visibility do
+describe Sufia::GenericFile do
   module VisibilityOverride
     extend ActiveSupport::Concern
     include Sufia::GenericFile::Permissions

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

@@ -1,6 +1,5 @@
 class Batch < ActiveFedora::Base
-  include Hydra::ModelMixins::CommonMetadata
-  include Hydra::ModelMixins::RightsMetadata
+  include Hydra::AccessControls::Permissions
   include Sufia::ModelMethods
   include Sufia::Noid
 
@@ -9,10 +8,10 @@ class Batch < ActiveFedora::Base
   belongs_to :user, :property => "creator"
   has_many :generic_files, :property => :is_part_of
 
-  delegate :title, :to => :descMetadata
-  delegate :creator, :to => :descMetadata
-  delegate :part, :to => :descMetadata
-  delegate :status, :to => :descMetadata
+  delegate :title, :to => :descMetadata, multiple: true
+  delegate :creator, :to => :descMetadata, multiple: true
+  delegate :part, :to => :descMetadata, multiple: true
+  delegate :status, :to => :descMetadata, multiple: true
 
   def self.find_or_create(pid)
     begin

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

@@ -4,7 +4,6 @@ module Sufia
     extend ActiveSupport::Autoload
     autoload :Actions, 'sufia/models/generic_file/actions'
     autoload :Permissions, 'sufia/models/generic_file/permissions'
-    autoload :Visibility, 'sufia/models/generic_file/visibility'
     autoload :WebForm, 'sufia/models/generic_file/web_form'
     autoload :AccessibleAttributes, 'sufia/models/generic_file/accessible_attributes'
     include Sufia::ModelMethods
@@ -26,12 +25,12 @@ module Sufia
 
       belongs_to :batch, :property => :is_part_of
 
-      delegate_to :properties, [:relative_path, :depositor, :import_url], :unique => true
-      delegate_to :descMetadata, [:date_uploaded, :date_modified], :unique => true
+      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,
                                   :contributor, :title, :tag, :description, :rights,
                                   :publisher, :date_created, :subject,
-                                  :resource_type, :identifier, :language]
+                                  :resource_type, :identifier, :language], multiple: true
 
       around_save :characterize_if_changed, :retry_warming
       before_destroy :cleanup_trophies

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

@@ -4,7 +4,7 @@ module Sufia
       extend ActiveSupport::Concern
       included do
         has_metadata :name => "characterization", :type => FitsDatastream
-        delegate :mime_type, :to => :characterization, :unique => true
+        delegate :mime_type, :to => :characterization, multiple: false
         delegate_to :characterization, [:format_label, :file_size, :last_modified,
                                         :filename, :original_checksum, :rights_basis,
                                         :copyright_basis, :copyright_note,
@@ -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]
+                                        :sample_rate, :channels, :data_format, :offset], multiple: true
 
       end
 

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

@@ -2,12 +2,12 @@ module Sufia
   module GenericFile
     module Permissions
       extend ActiveSupport::Concern
-      #we're overriding the permissions= method which is in RightsMetadata
-      include Hydra::ModelMixins::RightsMetadata
-      include Sufia::GenericFile::Visibility
+      #we're overriding the permissions= method which is in Hydra::AccessControls::Permissions
+      include Hydra::AccessControls::Permissions
+      include Hydra::AccessControls::Visibility
 
       included do
-        has_metadata :name => "rightsMetadata", :type => ParanoidRightsDatastream
+        has_metadata "rightsMetadata", :type => ParanoidRightsDatastream
         validate :paranoid_permissions
       end
 
@@ -29,6 +29,11 @@ module Sufia
         rightsMetadata.update_permissions(perm_hash)
       end
 
+      def permissions
+        perms = super
+        perms.map {|p| { name: p.name, access: p.access, type:p.type } }
+      end
+
       private
 
       def permission_hash

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

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.3.1"
+    VERSION = "3.4.0.rc1"
   end
 end

data/sufia-models/sufia-models.gemspec

@@ -29,8 +29,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rails', '>= 3.2.13', '< 5.0'
   spec.add_dependency 'activeresource' # No longer a dependency of rails 4.0
-  spec.add_dependency "hydra-head", "~> 6.3.0"
-  spec.add_dependency 'active-fedora', "~> 6.5.0"
+
+  # spec.add_dependency "hydra", "6.1.0.rc1"
+  # 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 "hydra-head", "~> 6.4.0.rc1"
+  spec.add_dependency 'active-fedora', "~> 6.6.0.rc1"
 
   spec.add_dependency 'nest', '~> 1.1.1'
   spec.add_dependency 'resque', '~> 1.23.0'#, :require => 'resque/server'

data/sufia.gemspec

@@ -18,11 +18,9 @@ Gem::Specification.new do |gem|
   gem.license       = 'APACHE2'
 
   gem.add_dependency 'sufia-models', version
-  gem.add_dependency 'blacklight', '~> 4.0', '< 4.4' # blacklight 4.4.1/0 doesn't work with kaminari > 0.14.1
   gem.add_dependency 'blacklight_advanced_search', '~> 2.1.0'
 
-  gem.add_dependency 'hydra-batch-edit', '~> 1.0.2'
-  gem.add_dependency 'hydra-collections', '~> 1.0.0'
+  gem.add_dependency 'hydra-batch-edit', '>= 1.1.1', '< 2.0.0'
 
   gem.add_dependency 'daemons', '1.1.9'
   gem.add_dependency 'mail_form'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0.rc1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -16,34 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 3.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.1
-- !ruby/object:Gem::Dependency
-  name: blacklight
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.4'
+        version: 3.4.0.rc1
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -62,30 +42,22 @@ dependencies:
   name: hydra-batch-edit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-- !ruby/object:Gem::Dependency
-  name: hydra-collections
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+        version: 1.1.1
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
@@ -104,14 +76,14 @@ dependencies:
   name: mail_form
   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'
 - !ruby/object:Gem::Dependency
@@ -280,6 +252,8 @@ files:
 - app/controllers/authorities_controller.rb
 - app/controllers/batch_controller.rb
 - app/controllers/batch_edits_controller.rb
+- app/controllers/concerns/sufia/contact_form_controller_behavior.rb
+- app/controllers/concerns/sufia/dashboard_controller_behavior.rb
 - app/controllers/concerns/sufia/users_controller_behavior.rb
 - app/controllers/contact_form_controller.rb
 - app/controllers/dashboard_controller.rb
@@ -510,9 +484,7 @@ files:
 - lib/generators/sufia/templates/migrations/create_version_committers.rb
 - lib/sufia.rb
 - lib/sufia/batch_edits_controller_behavior.rb
-- lib/sufia/contact_form_controller_behavior.rb
 - lib/sufia/controller.rb
-- lib/sufia/dashboard_controller_behavior.rb
 - lib/sufia/downloads_controller_behavior.rb
 - lib/sufia/files_controller/local_ingest_behavior.rb
 - lib/sufia/files_controller/upload_complete_behavior.rb
@@ -699,7 +671,6 @@ files:
 - sufia-models/lib/sufia/models/generic_file/mime_types.rb
 - sufia-models/lib/sufia/models/generic_file/permissions.rb
 - sufia-models/lib/sufia/models/generic_file/thumbnail.rb
-- sufia-models/lib/sufia/models/generic_file/visibility.rb
 - sufia-models/lib/sufia/models/generic_file/web_form.rb
 - sufia-models/lib/sufia/models/id_service.rb
 - sufia-models/lib/sufia/models/jobs/active_fedora_pid_based_job.rb
@@ -767,17 +738,17 @@ 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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -891,3 +862,4 @@ test_files:
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
 - spec/views/batch_edits/check_all_spec.rb
+has_rdoc: 

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

@@ -1,65 +0,0 @@
-module Sufia
-  module GenericFile
-    module Visibility
-      extend ActiveSupport::Concern
-      extend Deprecation
-
-      def visibility=(value)
-        return if value.nil?
-        # only set explicit permissions
-        case value
-        when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-          public_visibility!
-        when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-          registered_visibility!
-        when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-          private_visibility!
-        else
-          raise ArgumentError, "Invalid visibility: #{value.inspect}"
-        end
-      end
-
-      def visibility
-        if read_groups.include? Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC
-          Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-        elsif read_groups.include? Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED
-          Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-        else
-          Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-        end
-      end
-
-      def set_visibility(visibility)
-        Deprecation.warn Visibility, "set_visibility is deprecated, use visibility= instead.  set_visibility will be removed in sufia 3.0", caller
-        self.visibility= visibility
-      end
-
-      def visibility_changed?
-        @visibility_will_change
-      end
-
-      private
-      def visibility_will_change!
-        @visibility_will_change = true
-      end
-
-      def public_visibility!
-        visibility_will_change! unless visibility == Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC}, "read")
-      end
-
-      def registered_visibility!
-        visibility_will_change! unless visibility == Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED}, "read")
-        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC}, "none")
-      end
-
-      def private_visibility!
-        visibility_will_change! unless visibility == Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED}, "none")
-        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC}, "none")
-      end
-
-    end
-  end
-end