hydra-file-access 5.0.0.pre11 → 5.0.0.pre12

data/hydra-file-access.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |gem|
   gem.name          = "hydra-file-access"
   gem.require_paths = ["lib"]
   gem.version       = version
-#  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 1.9.3'
 
 
   gem.add_dependency "rails", '~>3.2.3' 
-  gem.add_dependency "blacklight", '~>3.4'  
+  gem.add_dependency "blacklight"
   gem.add_dependency "devise"
   gem.add_dependency "active-fedora"
   gem.add_dependency 'RedCloth', '=4.2.9'
@@ -34,6 +34,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'jettywrapper', ">=1.3.0"
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'cucumber-rails', '>=1.2.0'
-  gem.add_development_dependency 'factory_girl_rails', '<2.0.0'  #>=2.0.0 requires ruby 1.9
+  gem.add_development_dependency 'factory_girl_rails'
   gem.add_development_dependency 'solrizer-fedora', '>=2.1.0'
 end

data/lib/generators/hydra/assets_generator.rb

@@ -0,0 +1,36 @@
+# -*- encoding : utf-8 -*-
+# Copy Blacklight assets to public folder in current app. 
+# If you want to do this on application startup, you can
+# add this next line to your one of your environment files --
+# generally you'd only want to do this in 'development', and can
+# add it to environments/development.rb:
+#       require File.join(Hydra.root, "lib", "generators", "hydra", "assets_generator.rb")
+#       Hydra::Assets.start(["--force", "--quiet"])
+
+
+# Need the requires here so we can call the generator from environment.rb
+# as suggested above. 
+require 'rails/generators'
+require 'rails/generators/base'
+module Hydra
+  class AssetsGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+  
+    def assets
+      insert_into_file "app/assets/stylesheets/application.css", :after => " *= require_self" do
+%q{
+ *
+ * Required by Hydra
+ *= require 'hydra/styles'         
+}
+      end
+
+      insert_into_file "app/assets/javascripts/application.js", :after => "//= require jquery_ujs" do
+%q{
+// Required by Hydra
+//= require 'jquery.ui.datepicker.js'      
+}          
+      end
+    end
+  end
+end

data/lib/hydra/controller/file_assets_behavior.rb

@@ -33,8 +33,8 @@ module Hydra::Controller::FileAssetsBehavior
       @solr_result = FileAsset.find_with_conditions({})
     else
       container_uri = "info:fedora/#{params[:asset_id]}"
-      escaped_uri = container_uri.gsub(/(:)/, '\\:')
-      extra_controller_params =  {:q=>"is_part_of_s:#{escaped_uri}", :qt=>'standard'}
+      escaped_uri = ActiveFedora::SolrService.escape_uri_for_query(container_uri)
+      extra_controller_params =  {:q=>"is_part_of_s:#{escaped_uri}", 'qf'=>'is_part_of_s', 'qt'=>'standard', :rows=>10}.with_indifferent_access
       @response, @document_list = get_search_results( extra_controller_params )
       
       # Including this line so permissions tests can be run against the container
@@ -66,6 +66,8 @@ module Hydra::Controller::FileAssetsBehavior
       return redirect_to next_step(params[:id])
     end
     
+    authorize! :edit, (params[:container_id] || params[:id])
+    
     if params.has_key?(:Filedata)
       notice = process_files
       flash[:notice] = notice.join("<br/>".html_safe) unless notice.blank?
@@ -106,6 +108,7 @@ module Hydra::Controller::FileAssetsBehavior
   
   # Common destroy method for all AssetsControllers 
   def destroy
+    authorize! :destroy, params[:id]
     ActiveFedora::Base.find(params[:id], :cast=>true).delete 
 
     flash[:notice] = "Deleted #{params[:id]} from #{params[:container_id]}."

data/spec/controllers/file_assets_controller_spec.rb

@@ -27,8 +27,7 @@ describe Hydra::FileAssetsController do
       assigns[:solr_result].should == "solr result"
     end
     it "should find all file assets belonging to a given container object if asset_id is provided" do
-      pid = 'hydrangea:fixture_mods_article3'
-      xhr :get, :index, :asset_id=>pid
+      xhr :get, :index, :asset_id=>'hydrangea:fixture_mods_article3'
       assigns[:response][:response][:docs].first["id"].should == "hydrangea:fixture_file_asset1"
       assigns[:document_list].first.id.should == "hydrangea:fixture_file_asset1"
       
@@ -77,13 +76,17 @@ describe Hydra::FileAssetsController do
   
   describe "create" do
     it "should create and save a file asset from the given params" do
+      # stub out authorize! call
+      controller.should_receive(:authorize!).with(:edit, "example:invalid_object").and_return(true)
       mock_fa = double("FileAsset")
       mock_file = double("File")
       mock_fa.stub(:pid).and_return("foo:pid")
       controller.should_receive(:create_and_save_file_assets_from_params).and_return([mock_fa])
-      xhr :post, :create, :Filedata=>[mock_file], :Filename=>"Foo File"
+      xhr :post, :create, :Filedata=>[mock_file], :Filename=>"Foo File", :id => "example:invalid_object"
     end
     it "if container_id is provided, should associate the created file asset wtih the container" do
+      # stub out authorize! call
+      controller.should_receive(:authorize!).with(:edit, "_PID_").and_return(true)
       stub_fa = double("FileAsset")
       stub_fa.stub(:pid).and_return("foo:pid")
       stub_fa.stub(:label).and_return("Foo File")
@@ -93,20 +96,29 @@ describe Hydra::FileAssetsController do
       xhr :post, :create, :Filedata=>[mock_file], :Filename=>"Foo File", :container_id=>"_PID_"
     end
     it "should redirect back to edit view if no Filedata is provided but container_id is provided" do
+      # stub out authorize! call
+      controller.should_receive(:authorize!).with(:edit, "_PID_").and_return(true)
       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 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
+      # stub out authorize! call
+      controller.should_receive(:authorize!).and_return(true)
       xhr :post, :create
       request.flash[:notice].include?("You must specify a file to upload.").should be_true
     end
+    it "should throw an error if you don't have the ability to edit the parent object" do
+      lambda{xhr :post, :create, :id => "hydrangea:fixture_mods_article3"}.should raise_error(CanCan::AccessDenied)
+    end
     
   end
 
   describe "destroy" do
     it "should delete the asset identified by pid" do
+      # stub out authorize! call
+      controller.should_receive(:authorize!).and_return(true)
       mock_obj = double("asset")
       mock_obj.should_receive(:delete)
       ActiveFedora::Base.should_receive(:find).with("__PID__", :cast=>true).and_return(mock_obj)
@@ -114,6 +126,8 @@ describe Hydra::FileAssetsController do
     end
     it "should remove container relationship and perform proper garbage collection" do
       pending "relies on ActiveFedora implementing Base.file_objects_remove"
+      # stub out authorize! call
+      controller.should_receive(:authorize!).and_return(true)
       mock_container = mock("asset")
       mock_container.should_receive(:file_objects_remove).with("_file_asset_pid_")
       FileAsset.should_receive(:garbage_collect).with("_file_asset_pid_")
@@ -167,6 +181,8 @@ describe Hydra::FileAssetsController do
       end
 
       it "should set is_part_of relationship on the new File Asset pointing back at the container" do
+        # stub out authorize! call
+        controller.should_receive(:authorize!).and_return(true)
         test_file = fixture_file_upload('spec/fixtures/small_file.txt', 'text/plain')
         filename = "My File Name"
         post :create, {:Filedata=>[test_file], :Filename=>filename, :container_id=>@test_container.pid}

data/tasks/rspec.rake

@@ -20,7 +20,7 @@ task :fixtures do
 end
 
 
-describe "Create the test rails app"
+desc "Create the test rails app"
 task :generate do
   unless File.exists?('spec/internal/Rakefile')
     puts "Generating rails app"
@@ -42,7 +42,7 @@ task :generate do
   puts "Running specs"
 end
 
-describe "Clean out the test rails app"
+desc "Clean out the test rails app"
 task :clean do
   puts "Removing sample rails app"
   `rm -rf spec/internal`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-file-access
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre11
+  version: 5.0.0.pre12
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,17 +33,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +163,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre11
+        version: 5.0.0.pre12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -171,7 +171,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre11
+        version: 5.0.0.pre12
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -257,17 +257,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solrizer-fedora
   requirement: !ruby/object:Gem::Requirement
@@ -424,6 +424,7 @@ files:
 - app/views/shared/_delete_asset_confirmation.html.erb
 - config/jetty.yml
 - hydra-file-access.gemspec
+- lib/generators/hydra/assets_generator.rb
 - lib/hydra-file-access.rb
 - lib/hydra/assets.rb
 - lib/hydra/assets_controller_helper.rb
@@ -472,7 +473,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: