cul_scv_hydra 0.22.6 → 0.22.7

data/app/models/dc_document.rb

@@ -5,7 +5,7 @@ class DcDocument < ActiveFedora::Base
   include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
   include Hydra::ModelMethods
-  include Cul::Scv::Hydra::Models::Common
+  include Cul::Hydra::Models::Common
   #alias :file_objects :resources
 
   has_and_belongs_to_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'

data/app/models/generic_aggregator.rb

@@ -4,8 +4,8 @@ class GenericAggregator < ::ActiveFedora::Base
   include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::Models::Common
-  include Cul::Scv::Hydra::Models::Aggregator
+  include Cul::Hydra::Models::Common
+  include Cul::Hydra::Models::Aggregator
 
   has_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'
 
@@ -14,9 +14,9 @@ class GenericAggregator < ::ActiveFedora::Base
   end
 
   def index_type_label
-    riquery = Cul::Scv::Hydra::Models::MEMBER_ITQL.gsub(/%PID%/, self.pid)
+    riquery = Cul::Hydra::Models::MEMBER_ITQL.gsub(/%PID%/, self.pid)
     begin
-      docs = Cul::Scv::Fedora.repository.find_by_itql riquery, limit: 2, format: 'count/json'
+      docs = Cul::Fedora.repository.find_by_itql riquery, limit: 2, format: 'count/json'
       docs = JSON.parse(docs)['results']
       size = docs.first && docs.first['count'] && docs.first['count'].to_i
     rescue Exception=>e
@@ -39,7 +39,7 @@ class GenericAggregator < ::ActiveFedora::Base
   # set the index type label and any RI-based fields
   # overridde
   def set_size_labels(solr_doc={})
-    count = Cul::Scv::Hydra::RisearchMembers.get_direct_member_count(pid)
+    count = Cul::Hydra::RisearchMembers.get_direct_member_count(pid)
     solr_doc["index_type_label_ssi"] = [type_label_for(count)]
     solr_doc["cul_number_of_members_isi"] = count
   end

data/app/models/generic_object.rb

@@ -5,8 +5,8 @@ class GenericObject < ::ActiveFedora::Base
   include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::Models::Common
-  include Cul::Scv::Hydra::Models::Aggregator
+  include Cul::Hydra::Models::Common
+  include Cul::Hydra::Models::Aggregator
 
   has_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'
 

data/app/models/generic_resource.rb

@@ -9,9 +9,9 @@ class GenericResource < ::ActiveFedora::Base
   include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::Models::Common
-  include Cul::Scv::Hydra::Models::ImageResource
-  include Cul::Scv::Fedora::UrlHelperBehavior
+  include Cul::Hydra::Models::Common
+  include Cul::Hydra::Models::ImageResource
+  include Cul::Hydra::Fedora::UrlHelperBehavior
   include ::ActiveFedora::RelsInt
 
   has_and_belongs_to_many :containers, :property=>:cul_member_of, :class_name=>'ActiveFedora::Base'
@@ -72,8 +72,8 @@ class GenericResource < ::ActiveFedora::Base
 
     solr_doc["fulltext_tesim"] = []
     unless self.datastreams["fulltext"].nil?
+      solr_doc["fulltext_tesim"].concat(solr_doc["title_display_ssm"]) unless solr_doc["title_display_ssm"].nil? or solr_doc["title_display_ssm"].length == 0
       solr_doc["fulltext_tesim"] << self.datastreams["fulltext"].content
-      solr_doc["fulltext_tesim"] << solr_doc["title_display_ssm"].first unless solr_doc["title_display_ssm"].nil? or solr_doc["title_display_ssm"].length == 0
     end
     relationships(:original_name).each do |original_name|
       solr_doc["original_name_tesim"] ||= []

data/app/models/mets_structured_aggregator.rb

@@ -5,8 +5,8 @@ class METSStructuredAggregator < ::ActiveFedora::Base
   include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::Models::Common
-  include Cul::Scv::Hydra::Models::Aggregator
+  include Cul::Hydra::Models::Common
+  include Cul::Hydra::Models::Aggregator
 
   has_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'
 

data/app/models/resource.rb

@@ -7,9 +7,9 @@ class Resource < ActiveFedora::Base
   include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
 #  include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::Models::Common
-  include Cul::Scv::Hydra::Models::Resource
-  include Cul::Scv::Hydra::Models::ImageResource
+  include Cul::Hydra::Models::Common
+  include Cul::Hydra::Models::Resource
+  include Cul::Hydra::Models::ImageResource
 
   belongs_to :container, :property=>:cul_member_of, :class_name=>'ActiveFedora::Base'
 

data/app/models/resource_aggregator.rb

@@ -2,9 +2,9 @@ class ResourceAggregator < ::ActiveFedora::Base
   include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::Models::Common
-  include Cul::Scv::Hydra::Models::Aggregator
-  include Cul::Scv::Hydra::Models::LinkableResources
+  include Cul::Hydra::Models::Common
+  include Cul::Hydra::Models::Aggregator
+  include Cul::Hydra::Models::LinkableResources
 
   has_many :parts, :property => :cul_member_of, :class_name=>'Resource'
 

data/fixtures/spec/CUL_MODS/mods-subjects.xml

@@ -41,4 +41,28 @@
       We Are Currently Ignoring Subject Occupation
     </occupation>
   </subject>
+  <subject>
+    <cartographics>
+      <coordinates>40.8075, -73.9619</coordinates>
+    </cartographics>
+  </subject>
+  <subject>
+    <cartographics>
+      <coordinates>40.6892, -74.0444</coordinates>
+    </cartographics>
+  </subject>
+  <subject>
+    <hierarchicalGeographic>
+      <country>United States</country>
+      <province>Nova Scotia</province>
+      <region>Northeast</region>
+      <state>New York</state>
+      <county>Westchester</county>
+      <citySection citySectionType="borough">Brooklyn</citySection>
+      <city>White Plains</city>
+      <citySection citySectionType="neighborhood">The Backpacking District</citySection>
+      <citySection citySectionType="zip code">10027</citySection>
+      <citySection citySectionType="street">123 Broadway</citySection>
+    </hierarchicalGeographic>
+  </subject>
 </mods>

data/lib/cul_hydra.rb

@@ -0,0 +1,18 @@
+require 'cul_hydra/solrizer_patch'
+module Cul
+  module Hydra
+    autoload :Controllers, 'cul_hydra/controllers'
+    autoload :Fedora, 'cul_hydra/fedora'
+    autoload :Om, 'cul_hydra/om'
+    autoload :Solrizer, 'cul_hydra/solrizer'
+  end
+end
+
+require "cul_hydra/access_controls_enforcement"
+require "cul_hydra/controllers"
+require "cul_hydra/om"
+require "cul_hydra/indexer"
+require "cul_hydra/risearch_members"
+require "cul_hydra/solrizer"
+require "cul_hydra/version"
+require "cul_hydra/engine" if defined? Rails

data/lib/cul_hydra/access_controls_enforcement.rb

@@ -0,0 +1,53 @@
+module Cul::Hydra::AccessControlsEnforcement
+
+  private
+
+  def build_lucene_query(user_query)
+    q = ""
+    # start query of with user supplied query term
+      q << "_query_:\"{!dismax qf=$qf_dismax pf=$pf_dismax}#{user_query}\""
+
+    # Append the exclusion of Resources
+      q << " AND NOT _query_:\"info\\\\:fedora/ldpd\\\\:Resource\""
+
+    # Append the query responsible for adding the users discovery level
+      permission_types = ["edit","discover","read"]
+      field_queries = []
+      embargo_query = ""
+      permission_types.each do |type|
+        field_queries << "_query_:\"#{type}_access_group_t:public\""
+      end
+
+      unless current_user.nil?
+        # for roles
+        RoleMapper.roles(current_user.login).each do |role|
+          permission_types.each do |type|
+            field_queries << "_query_:\"#{type}_access_group_t:#{role}\""
+          end
+        end
+        # for individual person access
+        permission_types.each do |type|
+          field_queries << "_query_:\"#{type}_access_person_t:#{current_user.login}\""
+        end
+        if current_user.is_being_superuser?(session)
+          permission_types.each do |type|
+            field_queries << "_query_:\"#{type}_access_person_t:[* TO *]\""
+          end
+        end
+
+        # if it is the depositor and it is under embargo, that is ok
+        # otherwise if it not the depositor and it is under embargo, don't show it
+        embargo_query = " OR  ((_query_:\"embargo_release_date_dt:[NOW TO *]\" AND  _query_:\"depositor_t:#{current_user.login}\") AND NOT (NOT _query_:\"depositor_t:#{current_user.login}\" AND _query_:\"embargo_release_date_dt:[NOW TO *]\"))"
+      end
+      
+      # remove anything with an embargo release date in the future  
+#embargo_query = " AND NOT _query_:\"embargo_release_date_dt:[NOW TO *]\"" if embargo_query.blank?
+      field_queries << " NOT _query_:\"embargo_release_date_dt:[NOW TO *]\"" if embargo_query.blank?
+      
+      q << " AND (#{field_queries.join(" OR ")})"
+      q << embargo_query 
+    return q
+  end
+
+
+end

data/lib/cul_hydra/controllers.rb

@@ -0,0 +1,13 @@
+module Cul::Hydra
+  module Controllers
+    autoload :Aggregates, 'cul_hydra/controllers/aggregates'
+    autoload :Catalog, 'cul_hydra/controllers/catalog'
+    autoload :ContentAggregators, 'cul_hydra/controllers/content_aggregators'
+    autoload :Datastreams, 'cul_hydra/controllers/datastreams'
+    autoload :Helpers, 'cul_hydra/controllers/helpers'
+    autoload :Resources, 'cul_hydra/controllers/resources'
+    autoload :StaticImageAggregators, 'cul_hydra/controllers/static_image_aggregators'
+    autoload :Suggestions, 'cul_hydra/controllers/suggestions'
+    autoload :Terms, 'cul_hydra/controllers/terms'
+  end
+end

data/lib/cul_hydra/controllers/aggregates.rb

@@ -0,0 +1,93 @@
+require 'cul_hydra/controllers/aggregator_controller_helper'
+require 'cul_hydra/controllers/helpers/resources_helper_behavior'
+module Cul::Hydra::Controllers
+  module Aggregates
+    extend ActiveSupport::Concern
+    included do
+      include Hydra::AssetsControllerHelper
+      include Cul::Hydra::Controllers::AggregatorControllerHelper
+      include Cul::Hydra::Controllers::Helpers::ResourcesHelperBehavior  
+      include Hydra::RepositoryController  
+      include MediaShelf::ActiveFedoraHelper
+      include Blacklight::SolrHelper
+      before_filter :load_resources, :only=>[:index]
+      prepend_before_filter :sanitize_update_params
+    end
+
+    def index
+
+      if params[:layout] == "false"
+        layout = false
+      end
+      container_uri = "info:fedora/#{params[:asset_id]}"
+      escaped_uri = container_uri.gsub(/(:)/, '\\:')
+      extra_controller_params =  {:q=>"cul_member_of_s:#{escaped_uri}"}
+      @response, @document_list = get_search_results( extra_controller_params )
+      
+        # Including this line so permissions tests can be run against the container
+      @container_response, @document = get_solr_response_for_doc_id(params[:asset_id])
+      
+      render :action=>params[:action], :layout=>layout
+    end
+
+    def load_aggregate
+      if params.has_key? :aggregate_id
+        af_base = ActiveFedora::Base.load_instance(params[:aggregate_id])
+      else
+        af_base = ActiveFedora::Base.load_instance(params[:id])
+      end
+      the_model = ActiveFedora::ContentModel.known_models_for( af_base ).first
+      if the_model.nil? or the_model == ActiveFedora::Base
+        the_model = DcDocument
+      end
+
+      @resource = the_model.load_instance(af_base.pid)
+    end
+  
+    # Creates and Saves a Parent - Child relationship in the Child's RELS-EXT
+    # If container_id is provided:
+    # * the File Asset will use RELS-EXT to assert that it's a part of the specified container
+    # * the method will redirect to the container object's edit view after saving
+    def create
+      if params.has_key?(:aggregate_id)
+        @resource = load_aggregate
+        logger.debug @resource.class
+        logger.debug @resource.datastreams["RELS-EXT"].content
+        logger.debug @resource.to_rels_ext(@resource.pid)
+        if !params[:asset_id].nil?
+          associate_resource_with_container(@resource, params[:asset_id])
+          @resource.save
+          flash[:notice] = "Aggregated #{@resource.pid} under #{params[:asset_id]}."
+        else
+          flash[:notice] = "You must specify a container for the aggregate."
+        end
+      else
+        flash[:notice] = "You must specify a resource to aggregate."
+      end
+    
+      if !params[:asset_id].nil?
+        redirect_params = {:controller=>"aggregates", :id=>params[:asset_id], :action=>:index}
+      end
+    
+      redirect_params ||= {:action=>:index}
+    
+      redirect_to redirect_params
+    end
+  
+    # Common destroy method for all AssetsControllers 
+    def destroy
+      @resource = load_aggregate
+      remove_resource_from_container(@resource, params[:asset_id])
+      @resource.save
+
+      flash[:notice] = "Deleted #{params[:id]} from #{params[:asset_id]}."
+      if !params[:asset_id].nil?
+        redirect_params = {:controller=>"aggregates", :id=>params[:asset_id], :action=>:index}
+      end
+    
+      redirect_params ||= {:action=>:index}
+    
+      redirect_to redirect_params
+    end
+  end
+end

data/lib/cul_hydra/controllers/aggregator_controller_helper.rb

@@ -0,0 +1,27 @@
+require 'active-fedora'
+module Cul::Hydra::Controllers
+module AggregatorControllerHelper
+  def load_fedora_document
+    if params.has_key? :asset_id
+      af_base = ActiveFedora::Base.load_instance(params[:asset_id])
+    else
+      af_base = ActiveFedora::Base.load_instance(params[:id])
+    end
+    the_model = ActiveFedora::ContentModel.known_models_for( af_base ).first
+    if the_model.nil? or the_model == ActiveFedora::Base
+      the_model = DcDocument
+    end
+
+    @document_fedora = af_base.adapt_to the_model
+  end
+  def load_resources
+    @document_fedora ||= load_fedora_document
+    if @document_fedora.is_a? Cul::Hydra::ActiveFedora::Model::Aggregator
+      @resources = @document_fedora.resources
+    else
+      logger.debug "Only aggregators have parts!"
+    end
+    @resources
+  end
+end
+end

data/lib/cul_hydra/controllers/catalog.rb

@@ -0,0 +1,12 @@
+require 'cul_hydra/controllers/aggregator_controller_helper'
+require 'cul_hydra/controllers/helpers/active_fedora_helper_behavior'
+module Cul::Hydra::Controllers
+module Catalog
+  extend ActiveSupport::Concern
+  included do
+    include Cul::Hydra::Controllers::AggregatorControllerHelper
+    include Cul::Hydra::Controllers::Helpers::ActiveFedoraHelperBehavior
+    before_filter :load_resources, :only=>[:show, :edit]
+  end
+end
+end

data/lib/cul_hydra/controllers/content_aggregators.rb

@@ -0,0 +1,81 @@
+require 'cul_hydra/controllers/helpers/resources_helper_behavior'
+module Cul::Hydra::Controllers
+ module ContentAggregators
+  extend ActiveSupport::Concern
+  included do
+    include Hydra::AssetsControllerHelper
+    include Cul::Hydra::Controllers::Helpers::ResourcesHelperBehavior
+    include Hydra::RepositoryController  
+    include MediaShelf::ActiveFedoraHelper
+    include Blacklight::SolrHelper
+    prepend_before_filter :sanitize_update_params
+  end
+  
+  def index
+    if params[:layout] == "false"
+      # action = "index_embedded"
+      layout = false
+    end
+    if !params[:container_id].nil?
+      container_uri = "info:fedora/#{params[:container_id]}"
+      escaped_uri = container_uri.gsub(/(:)/, '\\:')
+      extra_controller_params =  {:q=>"cul_member_of_s:#{escaped_uri}"}
+      @response, @document_list = get_search_results( extra_controller_params )
+      
+      # Including this line so permissions tests can be run against the container
+      @container_response, @document = get_solr_response_for_doc_id(params[:container_id])
+      
+      # Including these lines for backwards compatibility (until we can use Rails3 callbacks)
+      @container =  ActiveFedora::Base.load_instance(params[:container_id])
+      @solr_result = @container.file_objects(:response_format=>:solr)
+    else
+      # @solr_result = ActiveFedora::SolrService.instance.conn.query('has_model_field:info\:fedora/ldpd\:Resource', @search_params)
+      @solr_result = Resource.find_by_solr(:all)
+    end
+    render :action=>params[:action], :layout=>layout
+  end
+  
+  def new
+    @asset = ContentAggregator.new
+    apply_depositor_metadata(@asset)
+    set_collection_type(@asset, params[:content_type])
+    if !params[:container_id].nil?
+      associate_resource_with_container(@asset, params[:container_id])
+    end
+    @asset.save
+    msg = "Created a Content Aggregator with pid #{@asset.pid}. Now it's ready to be edited."
+    flash[:notice]= msg
+  
+    session[:scripts] = params[:combined] == "true"
+    redirect_to url_for(:action=>"edit", :id=>@asset.pid, :new_asset=>true, :controller=>'catalog')
+
+  end
+
+  # Common destroy method for all AssetsControllers 
+  def destroy
+    # The correct implementation, with garbage collection:
+    # if params.has_key?(:container_id)
+    #   container = ActiveFedora::Base.load_instance(params[:container_id]) 
+    #   container.file_objects_remove(params[:id])
+    #   FileAsset.garbage_collect(params[:id])
+    # else
+    
+    # The dirty implementation (leaves relationship in container object, deletes regardless of whether the file object has other containers)
+    ActiveFedora::Base.load_instance(params[:id]).delete 
+    render :text => "Deleted #{params[:id]} from #{params[:container_id]}."
+  end
+  
+  
+  def show
+    @image_agg = ContentAggregator.find(params[:id])
+    if (@image_agg.nil?)
+      logger.warn("No such object: " + params[:id])
+      flash[:notice]= "No such object."
+      redirect_to(:action => 'index', :q => nil , :f => nil)
+    else
+      @id_array = @image_agg.containers(:response_format => :id_array)
+    end
+    render :action=>params[:action], :layout=>(params[:layout]=="false")
+  end
+end
+end