Merge pull request #6146 from avalonmediasystem/speedy_edit

Use SpeedyAF when loading edit pages

Author: masaball

app/controllers/concerns/workflow_controller_behavior.rb

@@ -90,8 +90,13 @@ def update
   def custom_update
   end
 
+  # Use SpeedyAF for loading edit pages more quickly, switch to fedora for saves
   def model_object
-    @model_object ||= ActiveFedora::Base.find(params[:id], cast: true)
+    @model_object ||= if params[:action] == "edit"
+                        SpeedyAF::Base.find(params[:id])
+                      else
+                        ActiveFedora::Base.find(params[:id], cast: true)
+                      end
   end
 
   def build_context

app/controllers/media_objects_controller.rb

@@ -23,9 +23,9 @@ class MediaObjectsController < ApplicationController
   include SecurityHelper
 
   before_action :authenticate_user!, except: [:show, :set_session_quality, :show_stream_details, :manifest]
-  before_action :load_resource, except: [:create, :destroy, :update_status, :set_session_quality, :tree, :deliver_content, :confirm_remove, :show_stream_details, :add_to_playlist, :intercom_collections, :manifest, :move_preview, :edit, :update, :json_update]
-  load_and_authorize_resource except: [:create, :destroy, :update_status, :set_session_quality, :tree, :deliver_content, :confirm_remove, :show_stream_details, :add_to_playlist, :intercom_collections, :manifest, :move_preview, :show_progress]
-  authorize_resource only: [:create]
+  before_action :load_resource, except: [:create, :destroy, :update_status, :set_session_quality, :tree, :deliver_content, :confirm_remove, :show_stream_details, :add_to_playlist, :intercom_collections, :manifest, :move_preview, :update, :json_update]
+  load_and_authorize_resource except: [:create, :destroy, :update_status, :set_session_quality, :tree, :deliver_content, :confirm_remove, :show_stream_details, :add_to_playlist, :intercom_collections, :manifest, :move_preview, :show_progress, :edit]
+  authorize_resource only: [:create, :edit]
 
   before_action :inject_workflow_steps, only: [:edit, :update], unless: proc { request.format.json? }
   before_action :load_player_context, only: [:show]

app/presenters/speedy_af/proxy/admin/collection.rb

@@ -31,6 +31,14 @@ def to_model
     self
   end
 
+  def dropbox
+    Avalon::Dropbox.new( dropbox_absolute_path, self )
+  end
+
+  def dropbox_absolute_path( name = nil )
+    File.join(Settings.dropbox.path, name || dropbox_directory_name)
+  end
+
   def persisted?
     id.present?
   end

app/presenters/speedy_af/proxy/media_object.rb

@@ -12,7 +12,11 @@
 #   specific language governing permissions and limitations under the License.
 # ---  END LICENSE_HEADER BLOCK  ---
 
+require 'active_model'
+
 class SpeedyAF::Proxy::MediaObject < SpeedyAF::Base
+  extend ActiveModel::Translation
+
   SINGULAR_FIELDS = [:title, :statement_of_responsibility, :date_created, :date_issued, :copyright_date, :abstract, :terms_of_use, :rights_statement]
   HASH_FIELDS = [:note, :other_identifier, :related_item_url]
 
@@ -44,8 +48,12 @@ def initialize(solr_document, instance_defaults = {})
     end
     # Convert empty strings to nil
     @attrs.transform_values! { |value| value == "" ? nil : value }
+    @errors = ActiveModel::Errors.new(self)
   end
 
+  attr_accessor :name
+  attr_accessor :errors
+
   def to_model
     self
   end
@@ -156,6 +164,10 @@ def permalink_with_query(query_vars = {})
     val ? val.to_s : nil
   end
 
+  def workflow
+    WorkflowDatastream.find("#{id}/workflow")
+  end
+
   protected
 
   # Overrides from SpeedyAF::Base

spec/factories/media_objects.rb

@@ -42,10 +42,10 @@
         physical_description { [Faker::Lorem.word] }
         table_of_contents { [Faker::Lorem.paragraph] }
         note { [{ note: Faker::Lorem.paragraph, type: 'general' }, { note: Faker::Lorem.paragraph, type: 'local' }] }
-        other_identifier { [{ id: Faker::Lorem.word, source: 'local' }] }
+        other_identifier { [{ id: Faker::Lorem.unique.word, source: 'local' }] }
         language { ['eng'] }
         related_item_url { [{ url: Faker::Internet.url, label: Faker::Lorem.sentence }]}
-        bibliographic_id { { id: Faker::Lorem.word, source: 'local' } }
+        bibliographic_id { { id: Faker::Lorem.unique.word, source: 'local' } }
         comment { ['MO comment'] }
         rights_statement { ['http://rightsstatements.org/vocab/InC-EDU/1.0/'] }
         terms_of_use { [ 'Terms of Use: Be kind. Rewind.' ] }