atrium 0.0.1 → 0.1.1

data/app/controllers/atrium/application_controller.rb

@@ -0,0 +1,12 @@
+module Atrium
+  class ApplicationController < ActionController::Base
+    include Atrium::ApplicationHelper
+    include Atrium::CollectionsHelper
+    include Atrium::ShowcasesHelper
+
+    def atrium_config
+      Atrium.config
+    end
+    helper_method :atrium_config
+  end
+end

data/app/controllers/atrium/browse_levels_controller.rb

@@ -0,0 +1,22 @@
+require_dependency "atrium/application_controller"
+
+module Atrium
+  class BrowseLevelsController < ApplicationController
+    def new
+
+    end
+
+    def create
+
+    end
+
+    def index
+    end
+
+    def edit
+    end
+
+    def show
+    end
+  end
+end

data/app/controllers/atrium/collections_controller.rb

@@ -1,155 +1,59 @@
-class Atrium::CollectionsController < Atrium::BaseController
+require_dependency "atrium/application_controller"
 
-  before_filter :initialize_collection, :except=>[:index, :new]
+module Atrium
+  class CollectionsController < ApplicationController
 
-  def new
-    create
-  end
-
-  def create
-    @atrium_collection = Atrium::Collection.new
-    @atrium_collection.save
-    redirect_to :action => "edit", :id=>@atrium_collection.id
-  end
-
-  #def update_embedded_search
-  #  render :partial => "shared/featured_search", :locals=>{:content=>params[:content_type]}
-  #end
-
-  def home_page_text_config
-    @atrium_collection= Atrium::Collection.find(params[:id])
-  end
-
-  def set_collection_scope
-    session[:copy_folder_document_ids] = session[:folder_document_ids]
-    session[:folder_document_ids] = []
-    @atrium_collection = Atrium::Collection.find(params[:id])
-    session[:folder_document_ids] = @atrium_collection.filter_query_params[:solr_doc_ids].split(',') if @atrium_collection.filter_query_params && @atrium_collection.filter_query_params[:solr_doc_ids]
-    p = params.dup
-    p.delete :action
-    p.delete :id
-    p.delete :controller
-    #make sure to pass in a search_fields parameter so that it shows search results immediately
-    redirect_to catalog_index_path(p)
-  end
-
-  def unset_collection_scope
-     @atrium_exhibit= Atrium::Exhibit.new
-     @atrium_collection = Atrium::Collection.find(params[:id])
-     @atrium_collection.update_attributes(:filter_query_params=>nil)
-     flash[:notice] = 'Collection scope removed successfully'
-     render :action => "edit"
-  end
-
-  def show
-    @exhibit_navigation_data = get_exhibit_navigation_data
+    def index
+      @collections = Collection.all
+    end
 
-    if(params[:collection_number])
-      @collection = Atrium::Collection.find(params[:collection_number])
-      @atrium_showcase= Atrium::Showcase.with_selected_facets(@collection.id,@collection.class.name, params[:f]).first
-    elsif(params[:id])
-      @atrium_collection= Atrium::Collection.find(params[:id])
-      @atrium_showcase= Atrium::Showcase.with_selected_facets(@atrium_collection.id,@atrium_collection.class.name, params[:f]).first
+    def new
+      @collection = Atrium::Collection.new(params[:collection])
     end
-    @collection_items_response, @collection_items_documents=get_solr_documents_from_asset(@atrium_collection)
-    if(params[:showcase_id] && @atrium_showcase.nil?)
-      @atrium_showcase = Atrium::Showcase.find(params[:showcase_id])
+
+    def create
+      @collection = Atrium::Collection.new(params[:collection])
+      if @collection.save
+        flash[:notice] = "Collection created successfully"
+        redirect_to edit_collection_path(@collection)
+      else
+        flash.now.alert = "Collection not created successfully"
+        render action: "new"
+      end
     end
-    @featured_response, @featured_documents=get_solr_documents_from_asset(@atrium_showcase) unless @atrium_showcase.nil?
-    @description_hash=get_description_for_showcase(@atrium_showcase) unless @atrium_showcase.nil?
-  end
 
-  def edit
-    #@atrium_collection = Atrium::Collection.find(params[:id])
-    @exhibit_navigation_data = get_exhibit_navigation_data
-    @atrium_exhibit= Atrium::Exhibit.new
-  end
+    def edit
+      collection
+    end
 
-  def update
-    @atrium_collection = Atrium::Collection.find(params[:id])
-    @atrium_exhibit=Atrium::Exhibit.new
-    if (params[:atrium_collection])
-      params[:atrium_collection][:search_facet_names] ||= []
-      params[:atrium_collection][:search_facet_names].delete_if { |elem| elem.empty? }  if params[:atrium_collection][:search_facet_names].length > 0
+    def show
+      @exhibits = collection.exhibits
+      respond_to do |format|
+        format.html
+        format.atom { render layout: false }
+      end
     end
-    respond_to do |format|
-      if @atrium_collection.update_attributes(params[:atrium_collection])
-        refresh_collection
+
+    def update
+      if collection.update_attributes(params[:collection])
         flash[:notice] = 'Collection was successfully updated.'
-        format.html  { render :action => "edit" }
       else
-        format.html { render :action => "edit" }
+        flash.now.alert = "Collection Not updated"
       end
+      render action: "edit"
     end
-  end
-
-  def destroy
-    @atrium_exhibit= Atrium::Exhibit.new
-    @atrium_collection = Atrium::Collection.find(params[:id])
-    @atrium_collection.destroy
-    flash[:notice] = 'Collection deleted.'
-    redirect_to catalog_index_path
-  end
-=begin
-  # Just return nil for collection facet limit because we want to display all values for browse links
-  def facet_limit_for(facet_field)
-    return nil
-  end
-  helper_method :facet_limit_for
-
-  # Returns complete hash of key=facet_field, value=limit.
-  # Used by SolrHelper#solr_search_params to add limits to solr
-  # request for all configured facet limits.
-  def facet_limit_hash
-    Blacklight.config[:facet][:limits]
-  end
-  helper_method :facet_limit_hash
-=end
-end
-
-
-def initialize_collection
-  if collection_id = determine_collection_id
-    return __initialize_collection( collection_id )
-  else
-    return false
-  end
-end
-
-#protected :initialize_collection
-
-private
-
-def determine_collection_id
-  if params.has_key? :collection_id
-      return params[:collection_id]
-  elsif params.has_key? :id
-    return params[:id]
-  elsif params.has_key? :collection_number
-    return params[:collection_number]
-  end
-end
 
-def refresh_collection
-  @exhibit_navigation_data = get_exhibit_navigation_data
-end
+    def destroy
+      collection.destroy
+      flash[:notice] = 'Collection '+ @collection.pretty_title+' was deleted successfully.'
+      redirect_to collections_path
+    end
 
-def refresh_browse_level_label(atrium_collection)
-  if params[:atrium_collection][:browse_levels_attributes]
-    params[:atrium_collection][:browse_levels_attributes].each_pair do |index,values|
-      if values[:solr_facet_name] && !values[:label]
-        #reset label if facet changing and other label not supplied
-        new_label = facet_field_labels[values[:solr_facet_name]]
-        unless new_label.nil? || new_label.empty?
-          atrium_collection.browse_levels.each_with_index do |browse_level,index|
-            if browse_level.solr_facet_name == values[:solr_facet_name]
-              atrium_collection.browse_levels[index].label = new_label
-              atrium_collection.save!
-              break
-            end
-          end
-        end
-      end
+    def collection
+      @collection ||= Atrium::Collection.find(params[:id])
     end
+    protected :collection
+    helper_method :collection
+
   end
 end

data/app/controllers/atrium/descriptions_controller.rb

@@ -1,177 +1,58 @@
-class Atrium::DescriptionsController < Atrium::BaseController
-
-  before_filter :initialize_collection, :get_exhibit_navigation_data
+require_dependency "atrium/application_controller"
 
+module Atrium
+  class DescriptionsController < ApplicationController
   def index
-    atrium_showcase=Atrium::Showcase.find(params[:showcase_id])
-    @atrium_descriptions = atrium_showcase.descriptions
-    @description_hash=get_description_for_showcase(atrium_showcase)
-    if params[:no_layout]
-      render :layout=>false
-    end
+    @descriptions = showcase.descriptions
   end
 
   def new
-    @atrium_description = Atrium::Description.new(:atrium_showcase_id=>params[:showcase_id])
-    @atrium_description.build_essay(:content_type=>"essay")
-    @atrium_description.build_summary(:content_type=>"summary")
+    @description = showcase.descriptions.build(params[:description])
+    @description.build_essay(content_type:"essay")
+    @description.build_summary(content_type:"summary")
   end
 
   def create
-    @atrium_description = Atrium::Description.new(:atrium_showcase_id=>params[:showcase_id])
-    @atrium_description.save!
-    if @atrium_description.update_attributes(params[:atrium_description])
+    @description = showcase.descriptions.build(params[:description])
+    if @description.save
       flash[:notice] = 'Description was successfully created.'
-      redirect_to :action => "edit", :id=>@atrium_description.id
+      redirect_to edit_showcase_description_path(showcase, @description)
     else
-      render :action => "new"
+      render action: "new"
     end
   end
 
   def edit
-    @atrium_description = Atrium::Description.find(params[:id])
-
-    #puts "Desc: #{@atrium_description.inspect}, essay = #{@atrium_description.essay.inspect},summary = #{@atrium_description.summary.inspect}"
-    @atrium_description.build_essay(:content_type=>"essay") unless @atrium_description.essay
-    @atrium_description.build_summary(:content_type=>"summary") unless @atrium_description.summary
+    description.build_essay(content_type:"essay") unless description.essay
+    description.build_summary(content_type:"summary") unless description.summary
   end
 
   def update
-    @atrium_description = Atrium::Description.find(params[:id])
-
-    if((params[:atrium_description]) && @atrium_description.update_attributes(params[:atrium_description]))
-
-
+    if description.update_attributes(params[:description])
       flash[:notice] = 'Description was successfully updated.'
-    elsif(params[:essay_attributes] && @atrium_description.essay.update_attributes(params[:essay_attributes]))
-      #if @atrium_description.essay.update_attributes(params[:essay_attributes])
-        #refresh_browse_level_label(@atrium_collection)
-
-
-        flash[:notice] = 'Description was successfully updated.'
-      #end
+      redirect_to edit_showcase_description_path(showcase, @description)
     else
-
-      if @atrium_description.update_attributes(params[:atrium_description])
-        #refresh_browse_level_label(@atrium_collection)
-        flash[:notice] = 'Exhibit was successfully updated.'
-      end
-    end
-    redirect_to :action => "edit", :id=>@atrium_description.id
-  end
-
-  def show
-    @atrium_description = Atrium::Description.find(params[:id])
-    @description_hash={}
-    unless @atrium_description.description_solr_id.nil?
-      p = params.dup
-      params.delete :f
-      params.delete :q
-      desc_response, desc_documents = get_solr_response_for_field_values("id",@atrium_description.description_solr_id)
-      desc_documents.each do |doc|
-        @description_hash[doc["id"]]= doc["description_content_s"].blank? ? "" : doc["description_content_s"].first
-      end
-      params.merge!(:f=>p[:f])
-      params.merge!(:q=>p[:q])
+      flash.now.alert = 'Description update failed'
+      render action: "edit"
     end
   end
 
-  def save_ids_to_descriptions
-    unless session[:folder_document_ids].empty?
-      description_hash={}
-      desc_response, desc_documents = get_solr_response_for_field_values("id",session[:folder_document_ids])
-      desc_documents.each do |doc|
-        desc_hash={}
-        desc_hash["page_display"]= doc["page_display_s"].blank? ? "" : doc["page_display_s"].first
-        desc_hash["title"]= doc["title_s"].blank? ? "" : doc["title_s"].first
-        description_hash[doc["id"]]=desc_hash
-      end
-      session[:folder_document_ids].each do |solr_id|
-        doc = description_hash[solr_id]
-        @atrium_description = Atrium::Description.new(:atrium_showcase_id=>params[:showcase_id], :description_solr_id=>solr_id, :page_display=>doc["page_display"], :title=>doc["title"])
-        @atrium_description.save!
-      end
-
-      session_folder_ids=[] || session[:copy_folder_document_ids]
-      session[:folder_document_ids] = session_folder_ids
-      session[:copy_folder_document_ids]=nil
-
-    end
-    redirect_to :action => "index", :showcase_id=>params[:showcase_id], :no_layout=>true
-  end
-
   def destroy
-    #Need to delete in AJAX way
-    @atrium_description = Atrium::Description.find(params[:id])
-    Atrium::Description.destroy(params[:id])
-    text = 'Description '+params[:id] +' was deleted successfully.'
-    render :text => text
+    description.destroy
+    flash[:notice] = 'Description '+@description.pretty_title + ' was deleted successfully.'
+    redirect_to edit_showcase_path(@showcase)
   end
 
-  def add_from_solr
-    session[:copy_folder_document_ids] = session[:folder_document_ids]
-    session[:folder_document_ids] = []
-    @atrium_showcase=Atrium::Showcase.find(params[:showcase_id])
-    parent = @atrium_showcase.parent if @atrium_showcase.parent
-    if parent.is_a?(Atrium::Collection)
-      collection_id = parent.id
-    elsif parent.is_a?(Atrium::Exhibit)
-      exhibit_id = parent.id
-      collection = parent.collection
-      collection_id = collection.id if collection
-    else
-      logger.error("Atrium showcase parent is invalid. Please check the parent")
-      collection_id = params[:collection_id]
-      exhibit_id = params[:exhibit_id]
-    end
-    solr_desc_arr=[]
-    @atrium_showcase.descriptions.each do |desc|
-      solr_desc_arr<<desc.description_solr_id
-    end
-    session[:folder_document_ids] = solr_desc_arr.uniq
-    #make sure to pass in a search_fields parameter so that it shows search results immediately
-    redirect_to catalog_index_path(:add_description=>true,:collection_id=>collection_id,:exhibit_id=>exhibit_id,:search_field=>"all_fields",:f=>{"active_fedora_model_s"=>["Description"]})
-  end
+  private
 
-  def initialize_collection
-    if collection_id = determine_collection_id
-      return __initialize_collection( collection_id )
-    else
-      return false
-    end
+  def showcase
+    @showcase ||= Atrium::Showcase.find(params[:showcase_id])
   end
+  helper_method :showcase
 
-
-private
-
-def determine_collection_id
-  if params[:id]
-    begin
-      @description = Atrium::Description.find(params[:id])
-      if @description
-        @showcase= Atrium::Showcase.find(@description.atrium_showcase_id)
-      end
-    rescue
-      raise "unable to find description or showcase from id"
-    end
-  elsif(params[:showcase_id])
-    @showcase= Atrium::Showcase.find(params[:showcase_id])
+  def description
+    @description ||= showcase.descriptions.find(params[:id])
   end
-  ##logger.debug("Showcase: #{@showcase.inspect}")
-  if @showcase && @showcase.parent
-    if @showcase.parent.is_a?(Atrium::Collection)
-      @atrium_collection = @showcase.parent
-      collection_id = @atrium_collection.id
-    elsif @showcase.parent.is_a?(Atrium::Exhibit)
-      @exhibit = @showcase.parent
-      @atrium_collection = @exhibit.collection
-      collection_id = @atrium_collection.id
-    else
-      collection_id = params[:collection_id]
-    end
+  helper_method :description
   end
-  return collection_id
-end
-
-
 end

data/app/controllers/atrium/exhibits_controller.rb

@@ -1,96 +1,70 @@
-class Atrium::ExhibitsController < Atrium::BaseController
+require_dependency "atrium/application_controller"
 
-  before_filter :initialize_collection, :except=>[:index, :create]
-
-  def new
-    @exhibit = Atrium::Exhibit.new
-    respond_to do |format|
-      format.html
+module Atrium
+  class ExhibitsController < ApplicationController
+    before_filter :find_exhibit, only: [:edit, :update, :destroy, :show]
+    def new
+      @exhibit = collection.exhibits.build(params[:exhibit])
     end
-  end
 
-  def create
-    @exhibit = Atrium::Exhibit.new(params[:atrium_exhibit])
-    if @exhibit.update_attributes(params[:atrium_exhibit])
-      flash[:notice] = 'Exhibit was successfully created.'
-      redirect_to :controller=>"atrium/collections", :action => "edit", :id=>@exhibit.atrium_collection_id
+    def create
+      @exhibit = collection.exhibits.build(params[:exhibit])
+      if @exhibit.save!
+        flash[:notice] = 'Exhibit was successfully created.'
+        redirect_to edit_collection_exhibit_path(id:@exhibit.id, collection_id:@collection)
+      else
+        render action: "new"
+      end
     end
-  end
 
-  def edit
-    @exhibit = Atrium::Exhibit.find(params[:id])
-    @atrium_collection = @exhibit.collection
-    @exhibit_navigation_data = get_exhibit_navigation_data
-  end
+    def edit
 
-  def update
-    @exhibit = Atrium::Exhibit.find(params[:id])
-    if @exhibit.update_attributes(params[:atrium_exhibit])
-      flash[:notice] = 'Exhibit was successfully updated.'
     end
-    redirect_to :action => "edit"
-  end
 
-  def show
-    #get children of emission dates
-    @members = get_all_children(@browse_document_list, "is_member_of_s")
-    @exhibit= Atrium::Exhibit.find(params[:id]) unless @exhibit
-    @exhibit_navigation_data = get_exhibit_navigation_data
-    @collection_items_response, @collection_items_documents=get_solr_documents_from_asset(@exhibit)
-    @atrium_showcase=Atrium::Showcase.with_selected_facets(@exhibit.id, @exhibit.class.name, params[:f]).first
-    @featured_response, @featured_documents=get_solr_documents_from_asset(@atrium_showcase) unless @atrium_showcase.nil?
-    @description_hash=get_description_for_showcase(@atrium_showcase) unless @atrium_showcase.nil?
-    if params[:no_layout]
-      render :layout=>false
+    def update
+      if @exhibit.update_attributes(params[:exhibit])
+        flash[:notice] = 'Exhibit was successfully updated.'
+      end
+      render action: "edit"
     end
-  end
 
-  def set_exhibit_scope
-    logger.error("into scoping")
-    session[:copy_folder_document_ids] = session[:folder_document_ids]
-    session[:folder_document_ids] = []
-    @exhibit = Atrium::Exhibit.find(params[:id])
+    def show
+      @showcases = @exhibit.showcases
+    end
 
-    session[:folder_document_ids] = @exhibit.filter_query_params[:solr_doc_ids].split(',') if @exhibit.filter_query_params && @exhibit.filter_query_params[:solr_doc_ids]
-    p = params.dup
-    p.delete :action
-    p.delete :id
-    p.delete :controller
-    #make sure to pass in a search_fields parameter so that it shows search results immediately
-    redirect_to catalog_index_path(p)
-  end
+    def destroy
+      @exhibit.destroy
+      flash[:notice] = 'Exhibit '+params[:id] +' was deleted successfully.'
+      redirect_to edit_collection_path(@collection)
+    end
 
-  def unset_exhibit_scope
-     @exhibit = Atrium::Exhibit.find(params[:id])
-     @exhibit.update_attributes(:filter_query_params=>nil)
-     flash[:notice] = 'Exhibit scope removed successfully'
-     render :action => "edit"
-  end
 
-  def destroy
-    @exhibit = Atrium::Exhibit.find(params[:id])
-    Atrium::Exhibit.destroy(params[:id])
-    flash[:notice] = 'Exhibit '+params[:id] +' was deleted successfully.'
-    redirect_to edit_atrium_collection_path(@exhibit.atrium_collection_id)
-  end
+      def find_exhibit
+        @exhibit = collection.exhibits.find(params[:id])
+      end
 
-  def initialize_collection
-    if collection_id = determine_collection_id
-      return __initialize_collection( collection_id )
-    else
-      return false
-    end
-  end
+      def collection
+        @collection ||= find_collection
 
 
-private
+      end
 
-def determine_collection_id
-  if params[:id]
-    @exhibit = Atrium::Exhibit.find(params[:id])
-    collection_id = @exhibit.atrium_collection_id if @exhibit
+      def find_collection
+        begin
+          logger.debug("Finding collection")
+          if params[:collection_id]
+            @collection = Atrium::Collection.find(params[:collection_id])
+          elsif params[:id]
+            @exhibit = Atrium::Exhibit.find(params[:id])
+            @collection = @exhibit.collection
+          else
+            raise "Could not find collection_id"
+          end
+        rescue ActiveRecord::RecordNotFound
+          flash.alert = t("Atrium.collection.or.exhibit.not_found")
+          redirect_to redirect_target and return
+        end
+        @collection
+      end
   end
-  return collection_id
-end
-
 end