cul_scv_hydra 0.10.0 → 0.11.0

data/app/models/bag_aggregator.rb

@@ -1,12 +1,13 @@
 require "active-fedora"
 require "active_fedora_finders"
+require "hydra-core"
 class BagAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::ActiveFedora::Model::Common
-  include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator
+  include Cul::Scv::Hydra::Models::Common
+  include Cul::Scv::Hydra::Models::Aggregator
 
   alias :file_objects :resources
 

data/app/models/concerns/cul.rb

@@ -0,0 +1,7 @@
+module Cul
+	extend ActiveSupport::Autoload
+  autoload :'Scv::Hydra::Models', 'cul/scv/hydra/models'
+  autoload :'Scv::Hydra::Models::Common', 'cul/scv/hydra/models/common'
+  autoload :'Scv::Hydra::Models::Aggregator', 'cul/scv/hydra/models/aggregator'
+  autoload :'Scv::Hydra::Models::Resource', 'cul/scv/hydra/models/resource'
+end

data/{lib/cul_scv_hydra/active_fedora.rb → app/models/concerns/cul/scv/hydra/models.rb}

@@ -3,9 +3,9 @@ require "cul_scv_hydra/om"
 require 'uri'
 require 'rdf'
 module Cul
-  module Scv
-  module Hydra
-  module ActiveFedora
+module Scv
+module Hydra
+  module Models
     AGGREGATOR_TYPE = (URI.parse("http://purl.oclc.org/NET/CUL/Aggregator"))
     RESOURCE_TYPE = (URI.parse("http://purl.oclc.org/NET/CUL/Resource"))
     MEMBER_QUERY = <<-SPARQL
@@ -14,5 +14,4 @@ module Cul
   end
 end
 end
-end
-require 'cul_scv_hydra/active_fedora/model.rb'
+end

data/{lib/cul_scv_hydra/active_fedora/model → app/models/concerns/cul/scv/hydra/models}/aggregator.rb

@@ -1,15 +1,15 @@
-module Cul::Scv::Hydra::ActiveFedora::Model
+module Cul::Scv::Hydra::Models
 module Aggregator
   extend ActiveSupport::Concern
 
   included do
-    has_metadata :name => "structMetadata", :type=>Cul::Scv::Hydra::ActiveFedora::Model::StructMetadata, :versionable => true, :controlGroup => 'M'
+    has_metadata :name => "structMetadata", :type=>Cul::Scv::Hydra::Datastreams::StructMetadata, :versionable => true, :controlGroup => 'M'
     has_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'
     after_create :aggregator!
   end
 
   def aggregator!
-    add_relationship(:rdf_type, Cul::Scv::Hydra::ActiveFedora::AGGREGATOR_TYPE.to_s)
+    add_relationship(:rdf_type, Cul::Scv::Hydra::Models::AGGREGATOR_TYPE.to_s)
     @metadata_is_dirty = true
     self.save
   end

data/{lib/cul_scv_hydra/active_fedora/model → app/models/concerns/cul/scv/hydra/models}/common.rb

@@ -1,15 +1,18 @@
 require 'active-fedora'
 require 'uri'
-module Cul::Scv::Hydra::ActiveFedora::Model
+module Cul::Scv::Hydra::Models
 module Common
   extend ActiveSupport::Concern
-    
+    DC_SPEC = {
+      :name => "DC", :type=>Cul::Scv::Hydra::Datastreams::DCMetadata,
+      :versionable => true, :label => 'Dublin Core Record for this object'
+    }
   included do
     define_model_callbacks :create
-
     has_and_belongs_to_many :containers, :property=>:cul_member_of, :class_name=>'ActiveFedora::Base'
-    has_metadata :name => "DC", :type=>Cul::Scv::Hydra::Om::DCMetadata, :versionable => true
-    has_metadata :name => "descMetadata", :type=>Cul::Scv::Hydra::Om::ModsDocument, :versionable => true
+    has_metadata :name => "DC", :type=>Cul::Scv::Hydra::Datastreams::DCMetadata, :versionable => true
+    #self.ds_specs['DC'] = DC_SPEC
+    has_metadata :name => "descMetadata", :type=>Cul::Scv::Hydra::Datastreams::ModsDocument, :versionable => true
     has_metadata :name => "rightsMetadata", :type=>::Hydra::Datastream::RightsMetadata, :versionable => true
     
   end
@@ -18,6 +21,31 @@ module Common
     def pid_namespace
       'ldpd'
     end
+
+    # override a buggy impl in AF
+    def has_datastream(args)
+      unless args.has_key?(:name)
+        return false
+      end
+      unless args.has_key?(:prefix)
+        args.merge!({:prefix=>args[:name].to_s.upcase})
+      end
+      unless class_named_datastreams_desc.has_key?(args[:name]) 
+        class_named_datastreams_desc[args[:name]] = {} 
+      end
+          
+      args.merge!({:mimeType=>args[:mime_type]}) if args.has_key?(:mime_type)
+      
+      unless class_named_datastreams_desc[args[:name]].has_key?(:type) 
+        #default to type ActiveFedora::Datastream
+        args[:type] ||= ActiveFedora::Datastream
+      end
+      args[:type] = args[:type].constantize if args[:type].is_a? String
+      raise args[:type] unless args[:type].name
+      class_named_datastreams_desc[args[:name]]= args   
+      create_named_datastream_finders(args[:name],args[:prefix])
+      create_named_datastream_update_methods(args[:name])
+    end
   end
 
   def rdf_type
@@ -102,15 +130,15 @@ module Common
   end
   
   def index_type_label
-    riquery = Cul::Scv::Hydra::ActiveFedora::MEMBER_QUERY.gsub(/%PID%/, self.pid)
+    riquery = Cul::Scv::Hydra::Models::MEMBER_QUERY.gsub(/%PID%/, self.pid)
     begin
       docs = ::ActiveFedora::Base.connection_for_pid(self.pid).find_by_sparql riquery
     rescue Exception=>e
       docs = self.parts
     end
-    if docs.length == 0
+    if docs.size == 0
       label = "EMPTY"
-    elsif docs.length == 1
+    elsif docs.size == 1
       label = "SINGLE PART"
     else
       label = "MULTIPART"
@@ -180,7 +208,6 @@ module Common
     params.each_pair do |dsid, ds_params| 
       if datastreams.include?(dsid)
         verify_params = ds_params.dup
-        current_indexed_attributes = {}
         changed = false
         verify_params.each { |pointer, values|
           changed ||= value_changed?(datastreams[dsid],pointer,values)

data/{lib/cul_scv_hydra/active_fedora/model → app/models/concerns/cul/scv/hydra/models}/resource.rb

@@ -1,4 +1,4 @@
-module Cul::Scv::Hydra::ActiveFedora::Model
+module Cul::Scv::Hydra::Models
 module Resource
     extend ActiveSupport::Concern
 # constants #
@@ -35,7 +35,7 @@ module Resource
   end
 
   def resource!
-    add_relationship(:rdf_type, Cul::Scv::Hydra::ActiveFedora::RESOURCE_TYPE.to_s)
+    add_relationship(:rdf_type, Cul::Scv::Hydra::Models::RESOURCE_TYPE.to_s)
     @metadata_is_dirty = true
     update
   end

data/app/models/content_aggregator.rb

@@ -1,11 +1,12 @@
 require "active-fedora"
+require "active_fedora_finders"
 class ContentAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::ActiveFedora::Model::Common
-  include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator
+  include Cul::Scv::Hydra::Models::Common
+  include Cul::Scv::Hydra::Models::Aggregator
 
   alias :file_objects :resources
 

data/app/models/cul/scv/hydra/datastreams/dc_metadata.rb

@@ -0,0 +1,109 @@
+require 'active-fedora'
+module Cul
+module Scv
+module Hydra
+module Datastreams
+class DCMetadata < ::ActiveFedora::OmDatastream
+
+  after_save :action_after_save
+  set_terminology do |t|
+    t.root(:path=>"dc", :namespace_prefix=>"oai_dc",
+           "xmlns:oai_dc"=>"http://www.openarchives.org/OAI/2.0/oai_dc/",
+           "xmlns:dc"=>"http://purl.org/dc/elements/1.1/",
+           :schema=>"http://www.openarchives.org/OAI/2.0/oai_dc.xsd")
+    t.dc_contributor(:path=>"contributor", 
+      :namespace_prefix=>"dc",
+      :index_as=>[:displayable, :searchable])
+    t.dc_coverage(:path=>"coverage",
+      :namespace_prefix=>"dc",
+      :index_as=>[:displayable, :searchable])
+    t.dc_creator(:path=>"creator",
+      :namespace_prefix=>"dc",
+      :index_as=>[:displayable, :searchable])
+    t.dc_date(:path=>"date",
+      :namespace_prefix=>"dc",
+      :index_as=>[:displayable, :searchable])
+    t.dc_description(:path=>"description",
+      :namespace_prefix=>"dc",
+      :index_as=>[:displayable, :searchable])
+    t.dc_format(:path=>"format",
+      :namespace_prefix=>"dc",
+      :index_as=>[:displayable, :searchable])
+    t.dc_identifier(:path=>"identifier",
+      :namespace_prefix=>"dc",
+      :type=>:string,
+      :index_as=>[:symbol])
+    t.dc_language(:path=>"language",
+      :namespace_prefix=>"dc",
+      :index_as=>[:displayable, :searchable])
+    t.dc_publisher(:path=>"publisher",
+      :namespace_prefix=>"dc",
+      :index_as=>[:displayable, :searchable])
+    t.dc_relation(:path=>"relation",
+      :namespace_prefix=>"dc",
+      :index_as=>[:displayable, :searchable])
+    t.dc_rights(:path=>"rights",
+      :namespace_prefix=>"dc",
+      :index_as=>[:displayable, :searchable])
+    t.dc_source(:path=>"source",
+      :namespace_prefix=>"dc",
+      :index_as=>[:displayable, :searchable])
+    t.dc_subject(:path=>"subject",
+      :namespace_prefix=>"dc",
+      :index_as=>[:displayable, :searchable])
+    t.dc_title(:path=>"title",
+      :namespace_prefix=>"dc",
+      :index_as=>[:displayable, :searchable])
+    t.dc_type(:path=>"type",
+      :namespace_prefix=>"dc",
+      :index_as=>[:displayable, :searchable])
+  end
+
+  def self.xml_template
+
+    Nokogiri::XML::Document.parse(<<-src
+<oai_dc:dc
+    xmlns:oai_dc='http://www.openarchives.org/OAI/2.0/oai_dc/'
+    xmlns:dc='http://purl.org/dc/elements/1.1/'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+    xsi:schemaLocation='http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd'></oai_dc:dc>
+src
+)
+  end
+  # Because FCRepo 3.5+ modifies DC on saves (to ensure that PID is a dc:identifier value),
+  # this datastream's content must be reloaded after saves
+  def action_after_save
+    @content = nil
+    @ng_xml = nil
+    remove_instance_variable(:@ng_xml)
+  end
+
+  def prefix
+    if ::ActiveFedora::VERSION >= '8'
+      Rails.logger.warn("the prefix method of #{self.class.name} was overriden to maintain backwards compatibility")
+    end
+    ''
+  end
+
+  def method_missing method, *args
+    query = false
+    _mname = method.id2name
+    if _mname[-1,1] == '?'
+      query = true
+      _mname = _mname[0,_mname.length-1]
+    end
+    _msym = _mname.to_sym
+    has_term = self.class.terminology.has_term?(_msym)
+    return false if query and not has_term
+    _r = super(_mname.to_sym, *args)
+    if query
+      _r.length > 0
+    else
+      _r
+    end
+  end
+end
+end
+end
+end
+end

data/app/models/cul/scv/hydra/datastreams/mods_document.rb

@@ -0,0 +1,157 @@
+require 'active-fedora'
+require 'solrizer'
+require 'cul_scv_hydra/solrizer'
+module Cul
+module Scv
+module Hydra
+module Datastreams
+class ModsDocument < ::ActiveFedora::OmDatastream
+  include ::OM::XML::TerminologyBasedSolrizer
+  include Cul::Scv::Hydra::Solrizer::TerminologyBasedSolrizer
+  include Cul::Scv::Hydra::Solrizer::ScvModsFieldable
+
+  map_field("lib_repo_sim", :marc_to_facet)
+  map_field("lib_repo_ssm", :marc_to_display)
+  map_field("lib_project_sim", :project_to_facet)
+
+  set_terminology do |t|
+    t.root(:path=>"mods",
+           :xmlns=>"http://www.loc.gov/mods/v3",
+           :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-4.xsd") {
+    }
+
+    t.main_title_info(:path=>'titleInfo', :index_as=>[], :attributes=>{:type=>:none}){
+      t.non_sort(:path=>"nonSort", :index_as=>[])
+      t.main_title(:path=>"title", :index_as=>[])
+    }
+    
+    t.title(:proxy=>[:mods, :main_title_info, :main_title], :type=>:string,
+     :index_as=>[:searchable, :sortable, :textable])
+    t.title_display(:proxy=>[:mods, :main_title_info], :type=>:string,
+     :index_as=>[:displayable])
+
+    t.search_title_info(:path=>'titleInfo', :index_as=>[]){
+      t.search_title(:path=>'title', :index_as=>[:searchable])
+    }
+    t.project(:path=>"relatedItem", :attributes=>{:type=>"host", :displayLabel=>"Project"}, :index_as=>[]){
+      t.project_title_info(:path=>'titleInfo', :index_as=>[]){
+        t.lib_project(:path=>'title',:index_as=>[])
+      }
+    }
+    t.collection(:path=>"relatedItem", :attributes=>{:type=>"host", :displayLabel=>"Collection"}, :index_as=>[]){
+      t.collection_title_info(:path=>'titleInfo', :index_as=>[:facetable, :displayable]){
+        t.lib_collection(:path=>'title', :index_as=>[])
+      }
+    }
+    t.lib_project(:proxy=>[:project,:project_title_info],
+      :index_as=>[:displayable, :searchable, :project_facetable, :textable])
+    t.lib_collection(:proxy=>[:collection,:collection_title_info])
+# pattern matches
+    t.identifier(:path=>"identifier", :attributes=>{:type=>"local"}, :type=>:string, :index_as=>[:symbol, :textable])
+    t.clio(:path=>"identifier", :attributes=>{:type=>"CLIO"}, :data_type=>:symbol, :index_as=>[:symbol, :textable])
+    t.abstract
+    t.subject {
+      t.topic
+    }
+    t.type_of_resource(:path=>"typeOfResource", :index_as=>[:displayable])
+    t.physical_description(:path=>"physicalDescription", :index_as=>[]){
+      t.form_marc(:path=>"form", :attributes=>{:authority=>"marcform"}, :index_as=>[:displayable])
+      t.form_aat(:path=>"form", :attributes=>{:authority=>"aat"}, :index_as=>[:displayable])
+      t.form(:attributes=>{:authority=>:none}, :index_as=>[:displayable])
+      t.form_nomarc(:path=>"form[@authority !='marcform']", :index_as=>[])
+      t.extent(:path=>"extent", :index_as=>[:searchable, :displayable])
+      t.reformatting_quality(:path=>"reformattingQuality", :index_as=>[:displayable])
+      t.internet_media_type(:path=>"internetMediaType", :index_as=>[:displayable])
+      t.digital_origin(:path=>"digitalOrigin", :index_as=>[:displayable])
+    }
+    t.lib_format(:proxy=>[:physical_description, :form_nomarc], :index_as=>[:displayable, :facetable])
+    t.location(:path=>"location", :index_as=>[]){
+      t.repo_text(:path=>"physicalLocation",:attributes=>{:authority=>:none},  :index_as=>[])
+      t.lib_repo(:path=>"physicalLocation",
+        :attributes=>{:authority=>"marcorg"},
+        :index_as=>[])
+      t.shelf_locator(:path=>"shelfLocator", :index_as=>[:textable])
+    }
+    t.lib_repo(:proxy=>[:location, :lib_repo], :type=>:text,
+     :index_as=>[:marc_code_facetable, :marc_code_displayable, :marc_code_textable])
+    t.lib_name(
+      :path=>'name',:attributes=>{:type=>'personal'},
+      :index_as=>[:facetable, :displayable, :searchable, :textable]){
+      t.name_part(:path=>'namePart', :index_as=>[])
+    }
+    t.name_corporate(
+      :path=>'name',:attributes=>{:type=>'corporate'}, 
+      :index_as=>[:facetable, :displayable, :searchable],
+      :variant_of=>{:field_base=>:lib_name}){
+      t.name_part(
+        :path=>'namePart',
+        :index_as=>[])
+    }
+    t.note(:path=>"note", :index_as=>[:textable])
+    t.access_condition(:path=>"accessCondition",
+     :attributes=>{:type=>"useAndReproduction"},
+     :index_as => [:searchable, :symbol])
+    t.record_info(:path=>"recordInfo", :index_as=>[]) {
+      t.record_creation_date(:path=>"recordCreationDate",:attributes=>{:encoding=>"w3cdtf"}, :index_as=>[])
+      t.record_content_source(:path=>"recordContentSource",:attributes=>{:authority=>"marcorg"}, :index_as=>[])
+      t.language_of_cataloging(:path=>"languageOfCataloging", :index_as=>[]){
+        t.language_term(:path=>"languageTerm", :index_as=>[], :attributes=>{:type=>:none})
+        t.language_code(:path=>"languageTerm",:attributes=>{:type=>'code',:authority=>"iso639-2b"}, :index_as=>[])
+      }
+      t.record_origin(:path=>"recordOrigin", :index_as=>[])
+    }
+    t.language_term(:proxy=>[:record_info, :language_of_cataloging, :language_term])
+    t.language_code(:proxy=>[:record_info, :language_of_cataloging, :language_code])
+
+    t.origin_info(:path=>"originInfo", :index_as=>[]){
+      t.date(:path=>"dateIssued", :attributes=>{:encoding=>'w3cdtf'}, :index_as=>[])
+      t.lib_date(:path=>"dateIssued", :attributes=>{:encoding=>'w3cdtf',:keyDate=>'yes'},
+       :index_as=>[:date_sortable])
+      t.start_date(:path=>"dateIssued", :attributes=>{:encoding=>'w3cdtf',:keyDate=>'yes',:point=>'start'}, :index_as=>[])
+      t.end_date(:path=>"dateIssued", :attributes=>{:encoding=>'w3cdtf',:point=>'end'}, :index_as=>[])
+    }
+  end
+
+  def self.xml_template
+    builder = Nokogiri::XML::Builder.new do |xml|
+      xml.mods(:version=>"3.4", 
+         "xmlns"=>"http://www.loc.gov/mods/v3",
+         "xmlns:xlink"=>"http://www.w3.org/1999/xlink",
+         "xmlns:xsi"=>"http://www.w3.org/2001/XMLSchema-instance"){
+      }
+    end
+    builder.doc.encoding = 'UTF-8'
+    # for some reason, this is the only way to get an equivalent nokogiri root node; the attribute can't be in the original builder call
+    builder.doc.root["xsi:schemaLocation"] = 'http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-4.xsd'
+    return builder.doc
+  end
+
+  def prefix
+    if ::ActiveFedora::VERSION >= '8'
+      Rails.logger.warn("the prefix method of #{self.class.name} was overriden to maintain backwards compatibility")
+    end
+    ''
+  end
+
+  def method_missing method, *args
+    query = false
+    _mname = method.id2name
+    if _mname[-1,1] == '?'
+      query = true
+      _mname = _mname[0,_mname.length-1]
+    end
+    _msym = _mname.to_sym
+    has_term = self.class.terminology.has_term?(_msym)
+    return false if query and not has_term
+    _r = super(_mname.to_sym, *args)
+    if query
+      _r.length > 0
+    else
+      _r
+    end
+  end
+end
+end
+end
+end
+end