cul_scv_hydra 0.22.6 → 0.22.7

data/lib/cul_hydra/solrizer/terminology_based_solrizer.rb

@@ -0,0 +1,35 @@
+require 'om'
+module Cul::Hydra::Solrizer::TerminologyBasedSolrizer
+# copied from Solrizer::XML::TerminologyBasedSolrizer
+
+  def self.included(klass)
+    klass.send(:extend, ClassMethods)
+  end
+  
+  # Module Methods
+      
+  module ClassMethods
+  # Populate a solr document with solr fields corresponding to the given xml node
+  # Field names are generated using settings from the term in the +doc+'s terminology corresponding to +term_pointer+
+  # @param [Nokogiri::XML::Node] node to solrize
+  # @param [OM::XML::Document] doc document the node came from
+  # @param [Array] term_pointer Array pointing to the term that should be used for solrization settings
+  # @param [Hash] (optional) solr_doc (values hash) to populate
+    def solrize_node(node_value, doc, term_pointer, term, solr_doc = Hash.new, field_mapper = nil, opts = {})
+      return solr_doc unless term.index_as && !term.index_as.empty?
+      generic_field_name_base = OM::XML::Terminology.term_generic_name(*term_pointer)
+      create_and_insert_terms(generic_field_name_base, node_value, term.index_as, solr_doc)
+      if term_pointer.length > 1
+        #hierarchical_field_name_base = OM::XML::Terminology.term_hierarchical_name(*term_pointer)
+        #create_and_insert_terms(hierarchical_field_name_base, node_value, term.index_as, solr_doc)
+      end
+      if term.variant_of and term.variant_of[:field_base]
+        #create_and_insert_terms(term.variant_of[:field_base], node_value, term.index_as, solr_doc)
+        create_and_insert_terms(term.variant_of[:field_base], node_value, term.index_as, solr_doc)
+      end
+      solr_doc
+    end
+
+  end
+
+end # module

data/lib/cul_hydra/solrizer/value_mapper.rb

@@ -0,0 +1,46 @@
+module Cul::Hydra::Solrizer
+# This class uses a yaml map to translate field values for solr
+class ValueMapper
+  def self.load_value_maps(config_path=nil)
+    if config_path.nil?
+      if defined?(Rails.root) && !Rails.root.nil?
+        config_path = File.join(Rails.root, "config", "solr_value_maps.yml")
+      end
+      # Default to using the config file within the gem
+      if !File.exist?(config_path.to_s)
+        config_path = File.join(File.dirname(__FILE__), "..", "..", "..", "config", "solr_value_maps.yml")
+      end
+    end
+    #logger.info("ValueMapper: loading field value maps from #{File.expand_path(config_path)}")
+    YAML::load(File.open(config_path))
+  end
+
+  def self.default_value_maps
+    @@value_maps ||= self.load_value_maps
+  end
+  # Instance methods
+
+  def initialize(value_maps=nil)
+    @value_maps = (value_maps || Cul::Hydra::Solrizer::ValueMapper.default_value_maps).with_indifferent_access
+    @mapped_fields = {}.with_indifferent_access
+  end
+
+  def maps_field?(field_key)
+    @mapped_fields.has_key? field_key
+  end
+
+  def map_field(field_key, map_key)
+    @mapped_fields[field_key] = map_key
+  end
+
+  def map_value(field_key, value_key)
+    map_key = @mapped_fields[field_key]
+    return value_key unless @mapped_fields.has_key? field_key and @value_maps.has_key? map_key
+    if value_key.is_a? Array
+      value_key.collect{ |val| @value_maps[map_key].fetch(val, val) }
+    else
+      @value_maps[map_key].fetch(value_key, value_key)
+    end
+  end
+end
+end

data/lib/cul_hydra/version.rb

@@ -0,0 +1,8 @@
+module Cul
+  module Hydra
+    VERSION = '0.22.7'
+    def self.version
+      VERSION
+    end
+  end
+end

data/lib/cul_hydra/version.rb~

@@ -0,0 +1,8 @@
+module Cul
+  module Hydra
+    VERSION = '0.22.6'
+    def self.version
+      VERSION
+    end
+  end
+end

data/lib/cul_scv_fedora/dummy_object.rb

@@ -1,36 +1,7 @@
 module Cul
   module Scv
     module Fedora
-      class DummyObject
-        attr_accessor :pid
-        def initialize(pid, isNew=false)
-          @pid = pid
-          @isNew = isNew
-        end
-        def new_record?
-          @isNew
-        end
-        def new_record=(val)
-          @isNew = val
-        end
-        def internal_uri
-          @uri ||= "info:fedora/#{@pid}"
-        end
-        def connection
-          Cul::Scv::Fedora.connection
-        end    
-        def repository
-          Cul::Scv::Fedora.repository
-        end
-        def spawn(pid)
-          s = DummyObject.new(pid, @isNew)
-          s.connection= connection
-          s.repository= repository
-          s
-        end
-        protected
-        def connection=(connection); @connection = connection; end
-        def repository=(repo); @repository = repo; end
+      class DummyObject < Cul::Hydra::Fedora::DummyObject
       end
     end
   end

data/lib/cul_scv_fedora/rubydora_patch.rb

@@ -2,13 +2,9 @@ module Cul
   module Scv
     module Fedora
       module RubydoraPatch
-        def find_by_itql query, options = {}
-          begin
-          	self.risearch(query, {:lang => 'itql'}.merge(options))
-          rescue Exception => e
-          	logger.error e if defined?(logger)
-          	"{\"results\":[]}"
-          end
+        extend ActiveSupport::Concern
+        included do
+          include Cul::Hydra::Fedora::RubydoraPatch
         end
       end
     end

data/lib/cul_scv_fedora/url_helper_behavior.rb

@@ -2,29 +2,9 @@ module Cul
   module Scv
     module Fedora
       module UrlHelperBehavior
-
-        def fedora_url
-          @fedora_url ||= ActiveFedora.config.credentials[:url]
-        end
-
-        def pid_for_url(pid)
-          pid.gsub(/^\//,'').gsub(/info:fedora\//,'')
-        end
-
-        def fedora_object_url(pid)
-          fedora_url + '/objects/' + pid_for_url(pid)
-        end
-
-        def fedora_ds_url(pid, dsid)
-          fedora_object_url(pid) + '/datastreams/' + dsid
-        end
-
-        def fedora_method_url(pid, method)
-          fedora_object_url(pid) + '/methods/' + method
-        end
-
-        def fedora_risearch_url
-          fedora_url + '/risearch'
+        extend ActiveSupport::Concern
+        included do
+          include Cul::Hydra::Fedora::UrlHelperBehavior
         end
       end
     end

data/lib/cul_scv_hydra.rb

@@ -1,42 +1,15 @@
 require 'hydra/head'
 require 'active_fedora_relsint'
+require 'cul_hydra'
 module Cul
   module Scv
     module Hydra
     end
     module Fedora
-      require 'cul_scv_fedora/url_helper_behavior'
-      require 'cul_scv_fedora/dummy_object'
-      require 'cul_scv_fedora/rubydora_patch'
-      def self.config_path
-        File.join(Rails.root.to_s, 'config', 'fedora.yml')
-      end
-      def self.config
-        ActiveFedora.fedora_config.credentials
-      end
-      def self.connection
-        @connection ||= ActiveFedora::RubydoraConnection.new(ActiveFedora.fedora_config.credentials)
-      end
-
-      def self.repository
-        @repository ||= begin
-          repo = connection.connection
-          repo.extend(RubydoraPatch)
-          repo
-        end
-      end
-
-      def self.ds_for_uri(fedora_uri, fake_obj=nil)
-        return nil unless fedora_uri =~ /info\:fedora\/.*/
-        p = fedora_uri.split('/')
-        return ds_for_opts({pid: p[1], dsid: p[2]})
-      end
-
-      def self.ds_for_opts(opts={}, fake_obj=nil)
-        return nil unless opts[:pid] and opts[:dsid]
-        fake_obj = fake_obj.nil? ? DummyObject.new(opts[:pid]) : fake_obj.spawn(opts[:pid])
-        return (opts[:class] || ::Rubydora::Datastream).new(fake_obj, opts[:dsid])
-      end
+      extend Cul::Hydra::Fedora::ClassMethods
+      autoload :DummyObject, 'cul_scv_fedora/dummy_object'
+      autoload :RubydoraPatch, 'cul_scv_fedora/rubydora_patch'
+      autoload :UrlHelperBehavior, 'cul_scv_fedora/url_helper_behavior'
     end
   end
 end

data/lib/cul_scv_hydra/access_controls_enforcement.rb

@@ -1,53 +1,6 @@
 module Cul::Scv::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
+  extend ActiveSupport::Concern
+  included do
+    include Cul::Hydra::AccessControlsEnforcement
   end
-
-
 end

data/lib/cul_scv_hydra/controllers.rb

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

data/lib/cul_scv_hydra/controllers/aggregates.rb

@@ -1,93 +1,8 @@
-require 'cul_scv_hydra/controllers/aggregator_controller_helper'
-require 'cul_scv_hydra/controllers/helpers/resources_helper_behavior'
 module Cul::Scv::Hydra::Controllers
   module Aggregates
     extend ActiveSupport::Concern
     included do
-      include Hydra::AssetsControllerHelper
-      include Cul::Scv::Hydra::Controllers::AggregatorControllerHelper
-      include Cul::Scv::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
+      include Cul::Hydra::Controllers::Aggregates
     end
   end
 end

data/lib/cul_scv_hydra/controllers/aggregator_controller_helper.rb

@@ -1,27 +1,8 @@
-require 'active-fedora'
 module Cul::Scv::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])
+  module AggregatorControllerHelper
+    extend ActiveSupport::Concern
+    included do
+      include Cul::Hydra::Controllers::AggregatorControllerHelper
     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::Scv::Hydra::ActiveFedora::Model::Aggregator
-      @resources = @document_fedora.resources
-    else
-      logger.debug "Only aggregators have parts!"
-    end
-    @resources
   end
 end
-end