fcrepo_admin 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b41a170f6b9f8ad2296559c6ff76f85c1b325c2
-  data.tar.gz: ce970e804c3e9fec32d7ac493bdb001e775f765d
+  metadata.gz: d96f1bb3976444ea4f8397a4e929415d07637a93
+  data.tar.gz: 2a297f927e6d1d723502f857bd4e2fe6947574fd
 SHA512:
-  metadata.gz: 13935a3cdf2cc95bd0048caf3a25c3e1442b4229b2f874ad93c0eb47bb4bbc2164a9f78da5acbef5dec5ca39e949d7db46b4fa1b167d821d16e88b8308ecff08
-  data.tar.gz: bd682bf0c49d2f06dd2aef3c630d4da5ed723c2efc6e1d1005a3801f40d25f7df096a4267f9e63566481556b691213915fcb6c4ffb969b04397477a584688d53
+  metadata.gz: d00acee3472c6f98978af43063abc5d7c47c4dcebbe68cb8ce9327bd32a04a8daf9739a8eee8ddbc0d6178cbdc3b8816283a47e34af514002af8bdee7250cb18
+  data.tar.gz: 80d93b9748fc1021c2128b2076765b5e8640f107ff7ece56b2fa1bb51e555f9be664ac6e32938c0e55340ec36c70918a3891032f659849d6866d8374df46e67e

data/HISTORY.rdoc

@@ -1,3 +1,9 @@
+==== 0.5.1 (2013-05-21)
+
+* Association show view paginated (Fixes #18). 
+* Association show view uses blacklight document list rendering.
+* Object show view loads Solr document for object and incorporates Blacklight document show fields.
+
 === 0.5.0 (2013-05-17)
 
 * Feature: Configurable settings.

data/README.rdoc

@@ -4,8 +4,8 @@ A Rails engine providing an administrative interface to a Fedora Commons reposit
 
 === Status
 
-This project should be considered *experimental* and not ready for production deployment.
-Versions earlier than 1.0 may change API and/or UI without notice or regard for backward compatibility.
+This project should be considered *experimental*. Versions earlier than 1.0 may change API and/or UI without notice 
+or regard for backward compatibility.
 
 === Requirements
 
@@ -90,7 +90,7 @@ You should start with this content:
       end
     end
 
-Refer to the default configuration settings at https://github.com/projecthydra/fcrepo-admin/blob/master/lib/fcrepo_admin.rb.
+Refer to the default configuration settings at https://github.com/projecthydra/fcrepo-admin/blob/master/lib/fcrepo_admin/configurable.rb.
 
 All configuration options are set by module methods prefixed by FcrepoAdmin, for example:
 

data/app/controllers/fcrepo_admin/associations_controller.rb

@@ -3,8 +3,6 @@ module FcrepoAdmin
 
     layout 'fcrepo_admin/objects'
 
-    include Hydra::Controller::ControllerBehavior
-    include Hydra::PolicyAwareAccessControlsEnforcement
     include FcrepoAdmin::Controller::ControllerBehavior
 
     before_filter :load_and_authorize_object
@@ -14,9 +12,12 @@ module FcrepoAdmin
     end
 
     def show
+      render(:text => "Association not found", :status => 404) if @association.nil?
       if @association.collection?
         get_collection_from_solr
-      else
+      else 
+        # This shouldn't normally happen b/c UI links directly to target object view in this case
+        # but we'll handle it gracefully anyway.
         target = @object.send("#{@association.name}_id")
         if target
           redirect_to :controller => 'objects', :action => 'show', :id => target, :use_route => 'fcrepo_admin'
@@ -34,20 +35,27 @@ module FcrepoAdmin
     end
 
     def get_collection_query_result
-      args = {raw: true}
-      apply_gated_discovery(args, {}) # add args to enforce Hydra permissions and admin policies
-      ActiveFedora::SolrService.query(construct_collection_query, args)
+      ActiveFedora::SolrService.query(construct_collection_query, collection_query_args)
+    end
+
+    def collection_query_args
+      page = params[:page] ||= 1
+      rows = FcrepoAdmin.associated_objects_per_page
+      start = (page.to_i - 1) * rows
+      args = {raw: true, start: start, rows: rows}
+      apply_gated_discovery(args, nil) # add args to enforce Hydra access controls
+      args
     end
 
     def construct_collection_query
       # Copied from ActiveFedora::Associations::AssociationCollection#construct_query
       clauses = {@association.options[:property] => @object.internal_uri}
       clauses[:has_model] = @association.class_name.constantize.to_class_uri if @association.class_name && @association.class_name != 'ActiveFedora::Base'
-      query = ActiveFedora::SolrService.construct_query_for_rel(clauses)
+      ActiveFedora::SolrService.construct_query_for_rel(clauses)
     end
 
     def load_association
-      @association = @object.reflections[params[:id].to_sym] # XXX raise exception if nil
+      @association = @object.reflections[params[:id].to_sym]
     end
 
   end

data/app/controllers/fcrepo_admin/datastreams_controller.rb

@@ -6,8 +6,6 @@ module FcrepoAdmin
     layout 'fcrepo_admin/datastreams', :except => :index
     layout 'fcrepo_admin/objects', :only => :index
 
-    include Hydra::Controller::ControllerBehavior
-    include Hydra::PolicyAwareAccessControlsEnforcement
     include FcrepoAdmin::Controller::ControllerBehavior
 
     before_filter :load_and_authorize_object

data/app/controllers/fcrepo_admin/objects_controller.rb

@@ -3,11 +3,10 @@ module FcrepoAdmin
 
     layout 'fcrepo_admin/objects'
 
-    include Hydra::Controller::ControllerBehavior
-    include Hydra::PolicyAwareAccessControlsEnforcement
     include FcrepoAdmin::Controller::ControllerBehavior
 
     before_filter :load_and_authorize_object
+    before_filter :load_solr_document, :only => :show
     
     def show
     end
@@ -25,5 +24,12 @@ module FcrepoAdmin
     def permissions
     end
 
+    protected
+
+    def load_solr_document
+      query = ActiveFedora::SolrService.construct_query_for_pids([@object.pid])
+      @document = SolrDocument.new(ActiveFedora::SolrService.query(query).first, nil)
+    end
+
   end
 end

data/app/views/fcrepo_admin/associations/_document_header.html.erb

@@ -0,0 +1,12 @@
+     
+      <% # header bar for doc items in index view -%>
+      <div class="documentHeader clearfix">
+        
+        <% # main title container for doc partial view -%>
+          <h5 class="index_title"><%= t('blacklight.search.documents.counter', :counter => (document_counter + 1 + @response.params[:start].to_i)) %><%= link_to_document document, :label=>document_show_link_field(document), :counter => (document_counter + 1 + @response.params[:start].to_i) %></h5>
+
+        
+        <% # bookmark functions for items/docs -%>
+        <%= render_index_doc_actions document, :wrapping_class => "documentFunctions span2" %>
+      </div>
+      

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

@@ -1,12 +1,16 @@
 <h3><%= t("fcrepo_admin.object.associations.title") %>: <%= @association.name %></h3>
 
 <% if @response.total > 0 %>
-  <%= content_tag :ol, :start => @response.params[:start].to_i + 1 do %>
-    <% @documents.each do |doc| %>
-	  <li>
-		<%= link_to doc.id, fcrepo_admin.object_path(doc.id) %>
-	  </li>
-	<% end %>
+  <% if @response.total > associated_objects_per_page %>
+    <div class="pagination">
+	  <%= render_pagination_info @response %>
+	</div>
+  <% end %>
+  <%= render :partial => 'catalog/document_list', :locals => {:documents => @documents} %>
+  <% if @response.total > associated_objects_per_page %>
+    <div class="pagination">
+      <%= paginate_rsolr_response @response, :layout => 'blacklight' %>
+    </div>
   <% end %>
 <% else %>
   <div class="alert">

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

@@ -1,6 +1,6 @@
 <h4><%= t("fcrepo_admin.object.permissions.inherited") %></h4>
 
-<% if object_is_governable? %>
+<% if object.governable? %>
   <div class="alert alert-info">
 	<% if object_is_governed_by %>
 	  <%= t("fcrepo_admin.object.apo.governed_by") %>: 

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

@@ -4,7 +4,7 @@
 	<%= render :partial => 'direct_permissions', :locals => {:object => @object} %>
   </div>
   <div class="span5">
-	<%= render 'inherited_permissions' %>
+	<%= render :partial => 'inherited_permissions', :locals => {:object => @object} %>
   </div>
 </div>
 

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

@@ -1,3 +1,6 @@
+<div class="row">
+   <%= render_document_partial @document, :show %>
+</div>
 <div class="row">
   <div class="span5">
 	<%= render :partial => 'datastreams', :locals => {:object => @object} %>

data/lib/fcrepo_admin.rb

@@ -4,54 +4,8 @@ require 'hydra/head'
 
 module FcrepoAdmin
 
-  #
-  # FcrepoAdmin configuration settings
-  #
-  mattr_accessor :read_only
-  self.read_only = false
-
-  # MIME types representing text content that do not have "text" media type.
-  mattr_accessor :extra_text_mime_types
-  self.extra_text_mime_types = ['application/xml', 'application/rdf+xml', 'application/json']
-
-  # Datastream profile keys for values to display on datastream index view
-  mattr_accessor :datastream_index_columns
-  self.datastream_index_columns = ["dsLabel", "dsMIME", "dsSize", "dsCreateDate"]
-
-  # Datastream profile keys for values to display on datastream history view
-  mattr_accessor :datastream_history_columns
-  self.datastream_history_columns = ["dsCreateDate"]
-
-  # Datastream context navigation items
-  mattr_accessor :datastream_nav_items
-  self.datastream_nav_items = [:dsid, :version, :current_version, :summary, :content, :download, :edit, :upload, :history]
-
-  mattr_accessor :datastream_show_profile_keys
-  self.datastream_show_profile_keys = ["dsLabel", "dsMIME", "dsVersionID", "dsCreateDate", "dsState", 
-                                       "dsFormatURI", "dsControlGroup", "dsSize", "dsVersionable", 
-                                       "dsInfoType", "dsLocation", "dsLocationType", "dsChecksumType",
-                                       "dsChecksum"]
-
-  # Sanity check on amount of text data to make editable via web form
-  mattr_accessor :max_editable_datastream_size
-  self.max_editable_datastream_size = 1024 * 64
-
-  # Object context navigation items
-  mattr_accessor :object_nav_items
-  self.object_nav_items = [:pid, :summary, :datastreams, :permissions, :associations, :audit_trail]
-
-  # Datastream profile values to display on object show view
-  mattr_accessor :object_show_datastream_columns
-  self.object_show_datastream_columns = ["dsLabel"]
-
-  # Methods on ActiveFedora::Base objects that represent Fcrepo object properties
-  mattr_accessor :object_properties
-  self.object_properties = [:label, :state, :create_date, :modified_date, :owner_id]
-
-  #
-  # Autoloading
-  #
   autoload :Ability, 'fcrepo_admin/ability'
+  autoload :Configurable, 'fcrepo_admin/configurable'
 
   module Helpers
     autoload :BlacklightHelperBehavior, 'fcrepo_admin/helpers/blacklight_helper_behavior'
@@ -65,4 +19,6 @@ module FcrepoAdmin
     autoload :ControllerBehavior, 'fcrepo_admin/controller/controller_behavior'
   end
 
+  include FcrepoAdmin::Configurable
+
 end

data/lib/fcrepo_admin/configurable.rb

@@ -0,0 +1,55 @@
+module FcrepoAdmin::Configurable
+  extend ActiveSupport::Concern
+
+  included do
+    #
+    # FcrepoAdmin configuration settings
+    #
+    mattr_accessor :read_only
+    self.read_only = false
+
+    # MIME types representing text content that do not have "text" media type.
+    mattr_accessor :extra_text_mime_types
+    self.extra_text_mime_types = ['application/xml', 'application/rdf+xml', 'application/json']
+
+    # Datastream profile keys for values to display on datastream index view
+    mattr_accessor :datastream_index_columns
+    self.datastream_index_columns = ["dsLabel", "dsMIME", "dsSize", "dsCreateDate"]
+
+    # Datastream profile keys for values to display on datastream history view
+    mattr_accessor :datastream_history_columns
+    self.datastream_history_columns = ["dsCreateDate"]
+
+    # Datastream context navigation items
+    mattr_accessor :datastream_nav_items
+    self.datastream_nav_items = [:dsid, :version, :current_version, :summary, :content, :download, :edit, :upload, :history]
+
+    # Datastream profile keys to display on datastream show page
+    mattr_accessor :datastream_show_profile_keys
+    self.datastream_show_profile_keys = ["dsLabel", "dsMIME", "dsVersionID", "dsCreateDate", "dsState", 
+                                         "dsFormatURI", "dsControlGroup", "dsSize", "dsVersionable", 
+                                         "dsInfoType", "dsLocation", "dsLocationType", "dsChecksumType",
+                                         "dsChecksum"]
+
+    # Sanity check on amount of text data to make editable via web form
+    mattr_accessor :max_editable_datastream_size
+    self.max_editable_datastream_size = 1024 * 64
+
+    # Object context navigation items
+    mattr_accessor :object_nav_items
+    self.object_nav_items = [:pid, :summary, :datastreams, :permissions, :associations, :audit_trail, :bookmark]
+
+    # Datastream profile values to display on object show view
+    mattr_accessor :object_show_datastream_columns
+    self.object_show_datastream_columns = ["dsLabel"]
+
+    # Methods on ActiveFedora::Base objects that represent Fcrepo object properties
+    mattr_accessor :object_properties
+    self.object_properties = [:label, :state, :create_date, :modified_date, :owner_id]
+    
+    # Number of objects to display per page on object associations show view
+    mattr_accessor :associated_objects_per_page
+    self.associated_objects_per_page = 10
+  end
+
+end

data/lib/fcrepo_admin/controller/controller_behavior.rb

@@ -3,8 +3,6 @@ module FcrepoAdmin::Controller
     extend ActiveSupport::Concern
 
     included do
-      helper_method :object_is_auditable?
-      helper_method :object_is_governable?
       helper_method :object_is_governed_by
     end
 
@@ -28,28 +26,8 @@ module FcrepoAdmin::Controller
       authorize! params[:action].to_sym, @object
     end
 
-    def object_is_auditable?
-      begin
-        @object && @object.is_a?(ActiveFedora::Auditable)
-      rescue
-        false
-      end
-    end
-
     def object_is_governed_by
-      @object_is_governed_by ||= object_is_governable? && @object.send(is_governed_by_association_name)
-    end
-
-    def object_is_governable?
-      !is_governed_by_association_name.nil?
-    end
-
-    def is_governed_by_association_name
-      @object.reflections.each do |name, reflection|
-        if reflection.macro == :belongs_to && reflection.options[:property] == :is_governed_by # TODO add policy class
-          return reflection.name
-        end
-      end
+      @object_is_governed_by ||= @object.send(@object.governed_by_association.name) rescue nil
     end
 
     # #solr_response_for_raw_result and #solr_documents_for_response

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

@@ -17,11 +17,9 @@ ActiveFedora::Base.class_eval do
   end
 
   def governable?
-    !is_governed_by_association.nil?
+    !governed_by_association.nil?
   end
 
-  private
-
   def governed_by_association
     self.reflections.each do |name, reflection|
       # FIXME add class name condition, i.e.:

data/lib/fcrepo_admin/helpers/associations_helper_behavior.rb

@@ -16,5 +16,9 @@ module FcrepoAdmin::Helpers
       end
     end
 
+    def associated_objects_per_page
+      FcrepoAdmin.associated_objects_per_page
+    end
+
   end
 end

data/lib/fcrepo_admin/helpers/datastreams_helper_behavior.rb

@@ -139,7 +139,7 @@ module FcrepoAdmin::Helpers
     def format_datastream_profile_value(ds, key)
       case
       when key == "dsSize" then number_to_human_size(ds.dsSize)
-      when key == "dsCreateDate" then ds.dsCreateDate.strftime("%Y-%m-%dT%H:%M:%S.%LZ")
+      when key == "dsCreateDate" then ds.dsCreateDate.localtime
       when key == "dsLocation" && ds.content_is_url? then link_to(ds.dsLocation, ds.dsLocation)
       when key == "dsState" then format_datastream_state(ds)
       when key == "dsControlGroup" then format_datastream_control_group(ds)

data/lib/fcrepo_admin/helpers/objects_helper_behavior.rb

@@ -10,7 +10,30 @@ module FcrepoAdmin::Helpers
     end
 
     def object_properties
-      FcrepoAdmin.object_properties.inject(Hash.new) { |h, p| h[p] = @object.send(p); h }
+      FcrepoAdmin.object_properties.inject(Hash.new) { |hash, prop| hash[prop] = object_property(prop); hash }
+    end
+
+    def object_property(prop)
+      case
+      when prop == :state then object_state
+      when prop == :create_date then object_date(@object.create_date)
+      when prop == :modified_date then object_date(@object.modified_date)
+      else @object.send(prop)
+      end
+    end
+
+    def object_date(dt)
+      Time.parse(dt).localtime
+    end
+
+    def object_state
+      state = @object.state
+      value = case 
+              when state == 'A' then "A (Active)"
+              when state == 'I' then "I (Inactive)"
+              when state == 'D' then "D (Deleted)"
+              end
+      value
     end
 
     def object_show_datastream_columns
@@ -37,6 +60,8 @@ module FcrepoAdmin::Helpers
       when item == :permissions  then link_to_object item, @object.has_permissions? && can?(:permissions, @object)
       when item == :associations then link_to_object item
       when item == :audit_trail  then link_to_object item, @object.auditable? && can?(:audit_trail, @object)
+      when item == :bookmark
+        render(:partial => 'catalog/bookmark_control', :locals => {:document=> @document}) if @document
       else custom_object_nav_item item
       end
     end
@@ -61,6 +86,6 @@ module FcrepoAdmin::Helpers
     def custom_object_nav_item(item)
       # Override this method with your custom item behavior
     end
-    
+
   end
 end

data/lib/fcrepo_admin/version.rb

@@ -1,3 +1,3 @@
 module FcrepoAdmin
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fcrepo_admin
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - David Chandek-Stark
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -250,6 +250,7 @@ files:
 - app/mailers/.gitkeep
 - app/models/.gitkeep
 - app/views/fcrepo_admin/associations/_associations.html.erb
+- app/views/fcrepo_admin/associations/_document_header.html.erb
 - app/views/fcrepo_admin/associations/index.html.erb
 - app/views/fcrepo_admin/associations/show.html.erb
 - app/views/fcrepo_admin/catalog/_document.html.erb
@@ -286,6 +287,7 @@ files:
 - lib/assets/.gitkeep
 - lib/fcrepo_admin.rb
 - lib/fcrepo_admin/ability.rb
+- lib/fcrepo_admin/configurable.rb
 - lib/fcrepo_admin/controller/controller_behavior.rb
 - lib/fcrepo_admin/decorators/active_fedora/base_decorator.rb
 - lib/fcrepo_admin/decorators/active_fedora/datastream_decorator.rb