fcrepo_admin 0.5.4 → 0.5.5.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 846f4e519831674baf94f1db10f8c40196136d58
-  data.tar.gz: 643de27ff77646f00ab3fde0b5d73e3a79da4157
+  metadata.gz: c10e6b3628d01fdcc937e5c5c12e4704d2e06622
+  data.tar.gz: 554f2f1bad6bb56761a5968bc049a6b6c36d21bf
 SHA512:
-  metadata.gz: c2f5c11df23df0a4fc79ee771e95fa1a3537189d7c6532cc32feb11554524815b191a484ff0bb5e5b252a7ae3e61c3fc4531553d7cdf8e0890e26cbdf24b6b06
-  data.tar.gz: 045a7e428c0932f767175815aea618456879a57dbd7453894bf3c6e60bca27b041bf0f0a7ecd83e600c5618a597a9ff338995a1c0f71c66c3432e6126188969a
+  metadata.gz: ec451e2d153537b2a865ac90faa40cc6eacf3ad6cc339a4ee6e4c17201ce913fe5a36e6bc0b4a058cbb5c234462902a2c967b58c47bc4948265c41b17e302248
+  data.tar.gz: c9a962d12ad4f1b85ae5b8d7c3fe8fa8c58a7b45a6f873121fcbf92b44575b0f4e854f42b8fea7ca8bcc1e0c84597851f30e743d6a8af8785177d78895755620

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle
 Gemfile.lock
+jetty
 pkg
 spec/internal/db/*.sqlite3
 spec/internal/log/*.log

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+script: "rake fcrepo_admin:ci"

data/HISTORY.md

@@ -1,3 +1,9 @@
+#### 0.5.5 (2013-06-07)
+
+* Upgraded Rubydora to version 1.6.5 (for Rubydora::DigitalObject#object_xml)
+* Datastream downloads now routed through FcrpeoAdmin::DownloadController, which uses Hydra::Controller::DownloadBehavior.
+* Added fcrepo_admin:ci rake task for CI build and hooked into Travis.
+
 #### 0.5.4 (2013-05-24)
 
 * Changed config setting `associated_objects_sort_param` (v0.5.3) to `association_collection_query_sort_param`.

data/README.md

@@ -4,6 +4,8 @@ A Rails engine providing an administrative interface to a Fedora Commons reposit
 
 ### Status
 
+[![Build Status](https://travis-ci.org/projecthydra/fcrepo-admin.png?branch=master)](https://travis-ci.org/projecthydra/fcrepo-admin)
+
 This project should be considered *experimental*. Versions earlier than 1.0 may change API and/or UI without notice 
 or regard for backward compatibility.
 
@@ -182,7 +184,7 @@ end
 
 #### Associations
 
-Due to issues with Rails partials and relative paths, in order to use Blacklight's default document index view behavior
+Due to the way Rails resolves relative paths to partials, in order to use Blacklight's default document index view behavior
 on the associations show page and avoid missing template errors, fcrepo_admin provides a custom document partial at 
 `fcrepo_admin/catalog/document` that renders the partial at `catalog/document`, for which Blacklight provides a default.
 If you have a custom document partial at a different path that you want to use for the document list on the associations 
@@ -196,6 +198,14 @@ this content in that file:
 replacing the partial path as appropriate.  If anyone has a better solution or knows of a way to avoid providing the 
 document partial in fcrepo_admin admin, please submit a pull request.
 
+#### Blacklight document actions
+
+Blacklight's default show page for a document (i.e., Solr document for, in this case, an ActiveFedora object) includes a menu
+of actions, including a bookmark function.  In order to provide the most flexible interface with a focus on repository "administrative"
+functions, we have not included this content in the default fcrepo_admin views.  However, since the fcrepo_admin object show view
+includes the Solr document in its context, you could re-add this functionality by overriding the default template at
+`fcrepo_admin/objects/show.html.erb` or by overriding the catalog show partial which that views renders.
+
 #### Read-only mode
 
 To suppress mutating behaviors (i.e, routes, nav items, etc.) regardless of user permissions, 

data/Rakefile

@@ -6,6 +6,9 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
+require 'jettywrapper'
+
+ENGINE_PATH = File.dirname(__FILE__)
 APP_RAKEFILE = File.expand_path("../spec/internal/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 

data/app/controllers/fcrepo_admin/datastreams_controller.rb

@@ -1,5 +1,3 @@
-require 'mime/types'
-
 module FcrepoAdmin
   class DatastreamsController < ApplicationController
 
@@ -26,12 +24,6 @@ module FcrepoAdmin
     def history
     end
 
-    def download
-      # XXX Replace with Hydra download behavior?
-      mimetypes = MIME::Types[@datastream.mimeType]
-      send_data @datastream.content, :disposition => 'attachment', :type => @datastream.mimeType, :filename => "#{@datastream.pid.sub(/:/, '_')}_#{@datastream.dsid}.#{mimetypes.first.extensions.first}"                
-    end
-
     def edit
       unless @datastream.content_is_editable?
         render :text => "Datastream content is not editable", :status => 403

data/app/controllers/fcrepo_admin/download_controller.rb

@@ -0,0 +1,30 @@
+require 'mime/types'
+
+module FcrepoAdmin
+  class DownloadController < ApplicationController
+
+    include Hydra::Controller::DownloadBehavior
+
+    protected
+
+    def load_asset
+      @asset = ActiveFedora::Base.load_instance_from_solr(params[:object_id])
+    end
+
+    def datastream_to_show
+      asset.datastreams[params[:id]]
+    end
+
+    # Pattern: pid__dsid.ext (replacing colon in pid with underscore)
+    def datastream_name
+      "#{datastream.pid.sub(/:/, '_')}__#{datastream.dsid}.#{datastream_extension}"
+    end
+
+    private
+
+    def datastream_extension
+      MIME::Types[datastream.mimeType].first.extensions.first rescue 'bin'
+    end
+
+  end
+end

data/app/views/fcrepo_admin/objects/show.html.erb

@@ -1,10 +1,5 @@
-<div class="document row">
-  <div class="span7">
-	<%= render :partial => 'catalog/show_default', :locals => {:document => @document} %>
-  </div>
-  <div class="span2">
-    <%= render_show_doc_actions @document %>
-  </div>
+<div class="document">
+  <%= render_document_partial @document, :show %>
 </div>
 <div class="row">
   <div class="span5">

data/config/routes.rb

@@ -14,7 +14,7 @@ FcrepoAdmin::Engine.routes.draw do
         member do
           get 'content'
           get 'upload' unless FcrepoAdmin.read_only
-          get 'download'
+          get 'download' => 'download#show'
           get 'history'
         end
       end

data/fcrepo_admin.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
+  s.add_dependency "rubydora", ">= 1.6.5"
   s.add_dependency "hydra-head", "~> 6.0"
   s.add_dependency "active-fedora", "~> 6.1"
   s.add_dependency "blacklight"

data/lib/fcrepo_admin/decorators/active_fedora/base_decorator.rb

@@ -29,8 +29,7 @@ ActiveFedora::Base.class_eval do
   end
 
   def object_xml
-    # XXX https://github.com/projecthydra/rubydora/pull/26
-    inner_object.repository.object_xml(:pid => pid)
+    inner_object.object_xml
   end
   
 end

data/lib/fcrepo_admin/helpers/associations_helper_behavior.rb

@@ -17,7 +17,7 @@ module FcrepoAdmin::Helpers
       end
     end
 
-    # We attempt to use Blacklight's #paginate_rsolr_response, but it causes a routing error 
+    # We attempted to use Blacklight's #paginate_rsolr_response, but it causes a routing error 
     # b/c Kaminari as of version 0.14.1 cannot handle namespace-prefixed routes.
     # The fallback rendering bypasses Kaminari, but doesn't look so good on a large page set.
     # See https://github.com/amatsuda/kaminari/pull/322.

data/lib/fcrepo_admin/helpers/blacklight_helper_behavior.rb

@@ -1,7 +1,7 @@
 module FcrepoAdmin::Helpers
   module BlacklightHelperBehavior
 
-    def link_to_document(doc, opts={:label=>nil, :counter => nil, :results_view => true})
+    def link_to_document(doc, opts = {:label => nil, :counter => nil, :results_view => true})
       opts[:label] ||= blacklight_config.index.show_link.to_sym
       label = render_document_index_label doc, opts
       link_to label, fcrepo_admin.object_path(doc.id)

data/lib/fcrepo_admin/version.rb

@@ -1,3 +1,3 @@
 module FcrepoAdmin
-  VERSION = "0.5.4"
+  VERSION = "0.5.5.pre"
 end

data/spec/controllers/datastreams_controller_spec.rb

@@ -17,10 +17,6 @@ describe FcrepoAdmin::DatastreamsController do
       response.should render_template(:content)
     end
   end
-  context "#download" do
-    subject { get :download, :object_id => object, :id => object.descMetadata, :use_route => 'fcrepo_admin' }
-    it { should be_successful }
-  end
   context "change methods" do
     let(:user) { FactoryGirl.create(:user) }
     before do

data/spec/controllers/download_controller_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe FcrepoAdmin::DownloadController do
+  let(:object) { FactoryGirl.create(:item) }
+  after { object.delete }
+  context "#show" do
+    it "should have the right content and headers" do
+      get :show, :object_id => object.pid, :id => object.descMetadata, :use_route => 'fcrepo_admin'
+      response.headers['Content-Disposition'].should == "inline; filename=\"#{object.pid.sub(/:/, '_')}__descMetadata.xml\""
+    end
+  end
+end

data/spec/controllers/objects_controller_spec.rb

@@ -1,22 +1,30 @@
 require 'spec_helper'
 
 describe FcrepoAdmin::ObjectsController do
-  let!(:object) { FactoryGirl.create(:item) }
-  after { object.delete }
+  before { @object = FactoryGirl.create(:item) }
+  after { @object.delete }
   context "#show" do
-    subject { get :show, :id => object, :use_route => 'fcrepo_admin' }
-    it { should render_template(:show) }
+    context "html format" do
+      subject { get :show, :id => @object, :use_route => 'fcrepo_admin' }
+      it { should render_template(:show) }
+    end
+    context "xml format" do
+      subject { get :show, :id => @object.pid, :format => 'xml', :use_route => 'fcrepo_admin' }
+      its(:body) { should eq(@object.object_xml) }
+    end
   end
   context "#audit_trail" do
-    subject { get :audit_trail, :id => object, :use_route => 'fcrepo_admin' }
-    it { should render_template(:audit_trail) }
-  end
-  context "#audit_trail?download=true" do
-    subject { get :audit_trail, :id => object, :download => 'true', :use_route => 'fcrepo_admin' }
-    its(:response_code) { should eq(200) }
+    context "html format" do
+      subject { get :audit_trail, :id => @object, :use_route => 'fcrepo_admin' }
+      it { should render_template(:audit_trail) }
+    end
+    context "xml format" do
+      subject { get :audit_trail, :id => @object.pid, :format => 'xml', :use_route => 'fcrepo_admin' }
+      its(:body) { should eq(@object.audit_trail.to_xml) }
+    end
   end
   context "#permissions" do
-    subject { get :permissions, :id => object, :use_route => 'fcrepo_admin' }
+    subject { get :permissions, :id => @object, :use_route => 'fcrepo_admin' }
     it { should render_template(:permissions) }
   end
 end

data/spec/internal/Rakefile

@@ -2,6 +2,8 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
+require 'jettywrapper'
+
 require File.expand_path('../config/application', __FILE__)
 
 Dummy::Application.load_tasks

data/{lib/tasks → tasks}/fcrepo_admin.rake

@@ -1,4 +1,15 @@
 namespace :fcrepo_admin do
+    desc "CI Build"
+    task :ci do
+		ENV['environment'] = "test"
+		Rake::Task["jetty:clean"].invoke
+  		jetty_params = Jettywrapper.load_config
+  		jetty_params[:startup_wait] = 60
+		jetty_params[:jetty_home] = File.expand_path(File.dirname(__FILE__) + '/../jetty')
+  		Jettywrapper.wrap(jetty_params) do
+    	    Rake::Task['spec'].invoke
+  		end
+	end
     namespace :solr do
         desc "Deletes everything from the Solr index"
         task :clean => :environment do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fcrepo_admin
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5.pre
 platform: ruby
 authors:
 - David Chandek-Stark
@@ -11,8 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubydora
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +250,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - HISTORY.md
 - LICENSE
@@ -243,6 +258,7 @@ files:
 - Rakefile
 - app/controllers/fcrepo_admin/associations_controller.rb
 - app/controllers/fcrepo_admin/datastreams_controller.rb
+- app/controllers/fcrepo_admin/download_controller.rb
 - app/controllers/fcrepo_admin/objects_controller.rb
 - app/helpers/fcrepo_admin/associations_helper.rb
 - app/helpers/fcrepo_admin/datastreams_helper.rb
@@ -298,10 +314,9 @@ files:
 - lib/fcrepo_admin/helpers/objects_helper_behavior.rb
 - lib/fcrepo_admin/solr_document_extension.rb
 - lib/fcrepo_admin/version.rb
-- lib/tasks/.gitkeep
-- lib/tasks/fcrepo_admin.rake
 - spec/controllers/associations_controller_spec.rb
 - spec/controllers/datastreams_controller_spec.rb
+- spec/controllers/download_controller_spec.rb
 - spec/controllers/objects_controller_spec.rb
 - spec/factories/fcrepo_admin_factories.rb
 - spec/factories/user_factories.rb
@@ -368,6 +383,8 @@ files:
 - spec/internal/spec/fixtures/files/descMetadata.xml
 - spec/internal/spec/fixtures/files/hydra.jpg
 - spec/spec_helper.rb
+- tasks/.gitkeep
+- tasks/fcrepo_admin.rake
 homepage: http://projecthydra.org
 licenses:
 - BSD Simplified
@@ -383,9 +400,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -395,6 +412,7 @@ summary: Hydra-based Fedora Commons repository admin tool.
 test_files:
 - spec/controllers/associations_controller_spec.rb
 - spec/controllers/datastreams_controller_spec.rb
+- spec/controllers/download_controller_spec.rb
 - spec/controllers/objects_controller_spec.rb
 - spec/factories/fcrepo_admin_factories.rb
 - spec/factories/user_factories.rb