hydra-file-access 5.0.0.pre4 → 5.0.0.pre6

data/hydra-file-access.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rails", '~>3.2.3' 
   gem.add_dependency "blacklight", '~>3.4'  
   gem.add_dependency "devise"
-  gem.add_dependency "active-fedora", '~>4.1'
+  gem.add_dependency "active-fedora"
   gem.add_dependency 'RedCloth', '=4.2.9'
   gem.add_dependency 'block_helpers'
   gem.add_dependency 'sanitize'

data/lib/hydra/controller/assets_controller_behavior.rb

@@ -1,7 +1,5 @@
 # @deprecated  Create Model-specific Controllers instead ie. ArticlesController, ETDController, etc.
-# Also see Hydra::Controller::AssetsControllerBehavior for more info.
-# will move to lib/hydra/controller / assets_controller_behavior.rb in release 5.x
-require 'om'
+require 'deprecation'
 
 module Hydra::Controller::AssetsControllerBehavior
   extend ActiveSupport::Concern
@@ -10,8 +8,10 @@ module Hydra::Controller::AssetsControllerBehavior
   include Hydra::Controller::RepositoryControllerBehavior
   include Hydra::AssetsControllerHelper
   include Blacklight::Catalog
+  extend Deprecation
 
   included do
+    Deprecation.warn Hydra::Controller::AssetsControllerBehavior, "Hydra::Controller::AssetsControllerBehavior will be removed in hydra-head 6.0"
     helper :hydra
     before_filter :search_session, :history_session
     before_filter :load_document, :only => :update # allows other filters to operate on the document before the update method is called

data/lib/hydra/controller/file_assets_behavior.rb

@@ -1,8 +1,15 @@
-# will move to lib/hydra/controller / file_assets_controller_behavior.rb in release 5.x
+# @deprecated
+# Include this module in a controller to generically interact with any FileAsset in generic ways
+# created with the assumption that you are using the genric AssetsControllerBehavior (also @deprecated)
+require 'deprecation'
+
 module Hydra::Controller::FileAssetsBehavior
   extend ActiveSupport::Concern
+  extend Deprecation
   
   included do
+    Deprecation.warn Hydra::Controller::FileAssetsBehavior, "Hydra::Controller::FileAssetsBehavior will be removed in hydra-head 6.0"
+    
     include Hydra::AccessControlsEnforcement
     include Hydra::AssetsControllerHelper
     include Hydra::Controller::UploadBehavior 

data/lib/hydra/submission_workflow.rb

@@ -56,7 +56,7 @@ module Hydra::SubmissionWorkflow
       return_params.delete(:wf_step)
       return catalog_path(id, return_params)
     end
-    return edit_catalog_path(id,return_params)
+    return catalog_path(id,return_params)
   end
   
   # Convenience method to return the partial for any given step by name.

data/spec/controllers/file_assets_controller_spec.rb

@@ -20,7 +20,7 @@ describe Hydra::FileAssetsController do
   describe "index" do
     
     it "should find all file assets in the repo if no container_id is provided" do
-      ActiveFedora::SolrService.should_receive(:query).with("has_model_s:info\\:fedora/afmodel\\:FileAsset", {:sort=>["system_create_dt asc"]}).and_return("solr result")
+      ActiveFedora::SolrService.should_receive(:query).with("has_model_s:info\\:fedora\\/afmodel\\:FileAsset", {:sort=>["system_create_dt asc"]}).and_return("solr result")
       controller.stub(:load_permissions_from_solr)
       ActiveFedora::Base.should_receive(:new).never
       xhr :get, :index
@@ -51,7 +51,6 @@ describe Hydra::FileAssetsController do
     it "should redirect back if current_user does not have read or edit permissions" do
       mock_user = double("User")
       mock_user.stub(:email).and_return("fake_user@example.com")
-      mock_user.stub(:is_being_superuser?).and_return(false)
       mock_user.stub(:persisted?).and_return(true)
       mock_user.stub(:new_record?).and_return(false)
       controller.stub(:current_user).and_return(mock_user)
@@ -62,7 +61,6 @@ describe Hydra::FileAssetsController do
      it "should redirect to the login page if the user is not logged in" do
       mock_user = double("User")
       mock_user.stub(:email).and_return("fake_user@example.com")
-      mock_user.stub(:is_being_superuser?).and_return(false)
       mock_user.stub(:persisted?).and_return(false)
       mock_user.stub(:new_record?).and_return(true)
       controller.stub(:current_user).and_return(mock_user)
@@ -97,7 +95,7 @@ describe Hydra::FileAssetsController do
     it "should redirect back to edit view if no Filedata is provided but container_id is provided" do
       controller.should_receive(:model_config).at_least(:once).and_return(controller.workflow_config[:mods_assets])
       xhr :post, :create, :container_id=>"_PID_", :wf_step=>"files"
-      response.should redirect_to edit_catalog_path("_PID_", :wf_step=>"permissions")
+      response.should redirect_to catalog_path("_PID_", :wf_step=>"permissions")
       request.flash[:notice].should == "You must specify a file to upload."
     end
     it "should display a message that you need to select a file to upload if no Filedata is provided" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-file-access
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre4
+  version: 5.0.0.pre6
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -65,17 +65,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +163,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre4
+        version: 5.0.0.pre6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -171,7 +171,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre4
+        version: 5.0.0.pre6
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement