cul_scv_hydra 0.6.4 → 0.7.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTA1YzIzNjNjZWI5YjllODU5MGE3NzkwOGRlYjA5YWYyMDc4ZmU4NA==
+  data.tar.gz: !binary |-
+    ZjUyODhkNDIwMmI0ZjA2NTllMTRiNDgxYTAwZTAzNzdiYmY5OTgzMw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZTcyNWQ0MmQ1YTgwZThhNTY0NDg5NzRhNGM0N2RiNjZlODBhNjA1MTRmZWM0
+    NjcxNmQ1MzI5ZDc0ZTc3MmY1MWVlYTBmYThkYzY1MTc5YjUwYzg2NDZhNWVm
+    NGRjNGVmNWVkYTUxMzU3OWZhMmI4OWIxY2VhN2MxNDkyNzViZGY=
+  data.tar.gz: !binary |-
+    NDI5Y2JmODlkYWJmZjNlMWM4M2Y1M2RmYzZiMTgwMWI1NDAyNTk3YTA4NDkz
+    MGUzMTI5Y2E2YTdmYTJmZDE0YTUxNjdlYTQ2OWFlYWQxMDRhNjE0NDU4ZDcx
+    Yjk1OTE5N2Y0Y2E2NmU4NjFmNGEyYzVlNzczMDdjNDUxZDRlNjM=

data/app/models/content_aggregator.rb

@@ -13,4 +13,19 @@ class ContentAggregator < ::ActiveFedora::Base
   def route_as
     "multipartitem"
   end
+  
+  def thumbnail_info
+    members = resources
+    if members.length > 1
+      return {:url=>image_url("cul_scv_hydra/crystal/kmultiple.png"),:mime=>'image/png'}
+    elsif members.length == 0
+      return {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'image/png'}
+    else
+      member = ActiveFedora::Base.find(members[0], :cast=>true)
+      if member.respond_to? :thumbnail_info
+        return member.thumbnail_info
+      end
+    end
+    return {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'image/png'}
+  end
 end

data/app/models/generic_resource.rb

@@ -0,0 +1,53 @@
+require "cul_image_props"
+require "mime/types"
+require "uri"
+require "open-uri"
+require "tempfile"
+class GenericResource < ::ActiveFedora::Base
+  extend ActiveModel::Callbacks
+  include ::ActiveFedora::Finders
+  include ::ActiveFedora::DatastreamCollections
+  include ::ActiveFedora::Relationships
+  include ::Hydra::ModelMethods
+  include Cul::Scv::Hydra::ActiveFedora::Model::Common
+  include ::ActiveFedora::RelsInt
+  alias :file_objects :resources
+  
+  IMAGE_EXT = {"image/bmp" => 'bmp', "image/gif" => 'gif', "image/jpeg" => 'jpg', "image/png" => 'png', "image/tiff" => 'tif', "image/x-windows-bmp" => 'bmp'}
+  WIDTH = RDF::URI(ActiveFedora::Predicates.find_graph_predicate(:image_width))
+  LENGTH = RDF::URI(ActiveFedora::Predicates.find_graph_predicate(:image_length))
+  
+  has_datastream :name => "content", :type=>::ActiveFedora::Datastream, :versionable => true
+  
+  def assert_content_model
+    super
+    add_relationship(:rdf_type, Cul::Scv::Hydra::ActiveFedora::RESOURCE_TYPE.to_s)
+  end
+
+  def route_as
+    "resource"
+  end
+
+  def index_type_label
+    "FILE RESOURCE"
+  end
+
+  def to_solr(solr_doc = Hash.new, opts={})
+    super
+    unless solr_doc["extent_s"] || self.datastreams["content"].nil?
+      solr_doc["extent_s"] = [self.datastreams["content"].size]
+    end
+    solr_doc
+  end
+  
+  def thumbnail_info
+    thumb = relsint.relationships(datastreams['content'],:foaf_thumb).first
+    if thumb
+      t_dsid = thumb.object.to_s.split('/')[-1]
+      return {:url=>"#{ActiveFedora.fedora_config[:url]}/objects/#{pid}/datastreams/#{t_dsid}/content",:mime=>datastreams[t_dsid].mimeType}
+    else
+      return {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'image/png'}
+    end
+  end
+        
+end

data/app/models/jp2_image_aggregator.rb

@@ -35,4 +35,8 @@ class JP2ImageAggregator < ::ActiveFedora::Base
     end
     solr_doc
   end
+  
+  def thumbnail_info
+    {:url => "#{ActiveFedora.fedora_config[:url]}/objects/#{pid}/methods/ldpd:sdef.Image/getView?max=250", :mime => 'image/jpeg'}
+  end
 end

data/app/models/resource.rb

@@ -13,6 +13,11 @@ class Resource < ::ActiveFedora::Base
 
   alias :file_objects :resources
 
+  CUL_WIDTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageWidth"
+  CUL_LENGTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageLength"
+  FORMAT = "http://purl.org/dc/elements/1.1/format"
+  MEMBER_OF = "http://purl.oclc.org/NET/CUL/memberOf"
+
   def route_as
     "resource"
   end
@@ -55,4 +60,21 @@ class Resource < ::ActiveFedora::Base
         end
       end
     end
+    
+    def thumbnail_info
+      # do the triples indicate this is a thumb? fetch
+      width = object_relations[CUL_WIDTH].first.to_i
+      length = object_relations[CUL_LENGTH].first.to_i
+      if width <= 251 && length <= 251
+        mime = object_relations[FORMAT].first
+        url = {:url=>"#{ActiveFedora.fedora_config[:url]}/objects/#{self.pid}/datastreams/CONTENT/content", :mime=>mime}
+      else
+        if object_relations[MEMBER_OF].blank?
+          return {:url=>image_url("cul_scv_hydra/crystal/file.png"),:mime=>'image/png'}
+        else
+          url = StaticImageAggregator.find(object_relations[MEMBER_OF].first).thumbnail_info
+        end
+      end
+      return url
+    end
 end

data/app/models/static_audio_aggregator.rb

@@ -17,4 +17,8 @@ class StaticAudioAggregator < ::ActiveFedora::Base
   def index_type_label
     "PART"
   end
+  
+  def thumbnail_info
+    return {:url=>image_url("cul_scv_hydra/crystal/mp3.png"),:mime=>'image/png'}
+  end
 end

data/app/models/static_image_aggregator.rb

@@ -9,6 +9,9 @@ class StaticImageAggregator < ::ActiveFedora::Base
   include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator
 
   alias :file_objects :resources
+  
+  CUL_WIDTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageWidth"
+  CUL_LENGTH = "http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/imageLength"
 
   def route_as
     "image"
@@ -17,4 +20,24 @@ class StaticImageAggregator < ::ActiveFedora::Base
   def index_type_label
     "PART"
   end
+  
+  def thumbnail_info
+    candidate = nil
+    max_dim = 251
+    resources.each do |pid|
+      resource = Resource.find(pid)
+      width = resource.object_relations[CUL_WIDTH].first.to_i
+      length = resource.object_relations[CUL_LENGTH].first.to_i
+      max = (width > length) ? width : length
+      if max_dim > max
+        candidate = resource
+        max_dim = max
+      end
+    end
+    if candidate.nil?
+      return {:url=>image_url("cul_scv_hydra/crystal/file_broken.png"),:mime=>'image/png'}
+    else
+      return {:url=>"#{ActiveFedora.fedora_config[:url]}/objects/#{candidate.pid}/datastreams/CONTENT/content",:mime=>candidate.datastreams['CONENT'].mimeType}
+    end
+  end
 end

data/config/predicate_mappings.yml

@@ -15,6 +15,7 @@
 #
 :predicate_mapping:
   http://purl.oclc.org/NET/CUL/:
+    :cul_has_member: hasMember
     :cul_member_of: memberOf
     :cul_metadata_for: metadataFor
   info:fedora/fedora-system:def/relations-external#: 
@@ -44,13 +45,23 @@
   info:fedora/fedora-system:def/model#:
     :has_model: hasModel
   http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/:
-    :image_width: imageWidth
-    :image_length: imageLength
+    :cul_image_width: imageWidth
+    :cul_image_length: imageLength
   http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/ASSESSMENT/:
-    :x_sampling: xSamplingFrequency
-    :y_sampling: ySamplingFrequency
-    :sampling_unit: samplingFrequencyUnit
+    :cul_x_resolution: xSamplingFrequency
+    :cul_y_resolution: ySamplingFrequency
+    :cul_resolution_unit: samplingFrequencyUnit
   http://purl.org/dc/terms/:
     :extent: extent
+    :format: format
+    :format_of: isFormatOf
+  http://www.w3.org/2003/12/exif/ns#:
+    :image_width: imageWidth
+    :image_length: imageLength
+    :x_resolution: xResolution
+    :y_resolution: yResolution
+    :resolution_unti: resolutionUnit
+  http://xmlns.com/foaf/0.1/:
+    :foaf_thumbnail: thumbnail
   http://www.w3.org/1999/02/22-rdf-syntax-ns#:
     :rdf_type: type

data/config/subs.yml

@@ -0,0 +1,12 @@
+development:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://sayers.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu/dev"
+test:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://sayers.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu/dev"
+production:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://alcott.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu"

data/lib/cul_scv_hydra.rb

@@ -6,13 +6,14 @@ module Cul
   end
 end
 # this is a hack to make requiring hydra possible
-module Hydra
-  module Datastream
-    module CommonModsIndexMethods
-    end
-  end
-end
-require 'hydra'
+#module Hydra
+#  module Datastream
+#    module CommonModsIndexMethods
+#    end
+#  end
+#end
+require 'hydra/head'
+require 'active_fedora_relsint'
 require "cul_scv_hydra/access_controls_enforcement"
 require "cul_scv_hydra/active_fedora"
 require "cul_scv_hydra/controllers"

data/lib/cul_scv_hydra/active_fedora/model/aggregator.rb

@@ -3,7 +3,7 @@ module Aggregator
   extend ActiveSupport::Concern
 
   included do
-    has_relationship "parts", :cul_member_of, :inbound => true
+    has_many :parts, :property => :cul_member_of
     after_create :aggregator!
   end
 

data/lib/cul_scv_hydra/active_fedora/model/common.rb

@@ -7,18 +7,22 @@ module Common
   included do
     define_model_callbacks :create
 
-    has_relationship "containers", :cul_member_of
-    has_relationship "rdf_type", :rdf_type
+    has_and_belongs_to_many :containers, :property=>:cul_member_of
     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 => "rightsMetadata", :type=>::Hydra::RightsMetadata, :versionable => true
+    has_metadata :name => "rightsMetadata", :type=>::Hydra::Datastream::RightsMetadata, :versionable => true
+    
   end
     
   module ClassMethods
     def pid_namespace
       "ldpd"
     end
-  end  
+  end
+
+  def rdf_type
+    relationships[:rdf_type]
+  end 
     
   def initialize(attrs = nil)
     attrs = {} if attrs.nil?
@@ -100,8 +104,8 @@ module Common
   def index_type_label
     riquery = Cul::Scv::Hydra::ActiveFedora::MEMBER_QUERY.gsub(/%PID%/, self.pid)
     begin
-      docs = ::ActiveFedora::RubydoraConnection.instance.connection.find_by_sparql riquery
-    rescue
+      docs = ::ActiveFedora::Base.connection_for_pid(self.pid).find_by_sparql riquery
+    rescue Exception=>e
       docs = self.parts
     end
     if docs.length == 0
@@ -119,7 +123,7 @@ module Common
     begin
       has_desc = self.datastreams.include? "descMetadata"
       has_desc = has_desc and self.inner_object.datastreams["descMetadata"].content.length > 0
-      has_desc = self.datastreams["descMetadata"].term_values(:identifier).length > 0
+      has_desc = has_desc and self.datastreams["descMetadata"].term_values(:identifier).length > 0
     rescue
       has_desc = false
     end
@@ -134,14 +138,14 @@ module Common
       solr_doc["descriptor_s"] = ["dublin core"]
     end
     # if no mods, pull some values from DC
-    if not (solr_doc["title_display"] and solr_doc["title_display"].length > 0)
-      if self.dc.term_values(:title).first
-        solr_doc["title_display"] = [self.dc.term_values(:title).first]
+    if (solr_doc["title_display"].nil? or solr_doc["title_display"].length == 0)
+      if self.dc.term_values(:dc_title).first
+        solr_doc["title_display"] = [self.dc.term_values(:dc_title).first]
       else
-        solr_doc["title_display"] = [self.dc.term_values(:identifier).first]
+        solr_doc["title_display"] = [self.dc.term_values(:dc_identifier).first]
       end
-      if self.dc.term_values(:relation).first
-        self.dc.term_values(:relation).each {|val|
+      if self.dc.term_values(:dc_relation).first
+        self.dc.term_values(:dc_relation).each {|val|
           if val =~ /clio:/
             solr_doc["clio_s"] ||= []
             solr_doc["clio_s"] << val.split(':')[-1]
@@ -149,6 +153,9 @@ module Common
         }
       end
     end
+    if (solr_doc["title_display"].length > 1)
+      solr_doc["title_display"].uniq!
+    end
     solr_doc["format"] = [self.route_as]
     solr_doc["index_type_label_s"] = [self.index_type_label]
     solr_doc
@@ -178,6 +185,10 @@ module Common
     end
     return result
   end
+  
+  def thumbnail_info
+    {:url=>image_url("cul_scv_hydra/crystal/kmultiple.png"),:mime_type=>"image/png"}
+  end
 
   private
   def value_changed?(ds,pointer,values)

data/lib/cul_scv_hydra/active_fedora/model/resource.rb

@@ -11,13 +11,21 @@ module Resource
   ]
 
   included do
-    if self.respond_to? :has_relationship
-      has_relationship "image_width", :image_width
-      has_relationship "image_length", :image_length
-      has_relationship "x_sampling", :x_sampling
-      has_relationship "y_sampling", :y_sampling
-      has_relationship "sampling_unit", :sampling_unit
-      has_relationship "extent", :extent
+    if self.is_a? ::ActiveFedora::SemanticNode
+      props = {
+        "image_width" => :image_width,
+        "image_length" => :image_length,
+        "x_sampling" => :x_sampling,
+        "y_sampling" => :y_sampling,
+        "sampling_unit" => :sampling_unit,
+        "extent" => :extent,
+      }
+      props.each { |x, y|
+        class_eval %Q{
+          def #{x}
+            return relationships[:#{y.to_s}]
+        }
+      }
       
       after_create :resource!      
     end

data/lib/cul_scv_hydra/controllers/helpers/hydra_assets_helper_behavior.rb

@@ -1,7 +1,7 @@
-require 'mediashelf/active_fedora_helper'
+#require 'mediashelf/active_fedora_helper'
 
 module Cul::Scv::Hydra::Controllers::Helpers::HydraAssetsHelperBehavior
-  include MediaShelf::ActiveFedoraHelper
+#  include MediaShelf::ActiveFedoraHelper
 
   def link_to_create_asset(link_label, content_type, container_id=nil)
     opts = {:action => 'new', :controller => "#{content_type}s", :content_type => content_type}
@@ -13,23 +13,23 @@ module Cul::Scv::Hydra::Controllers::Helpers::HydraAssetsHelperBehavior
     end
   end
 
-  def get_file_asset_description(document)
-    obj = load_af_instance_from_solr(document)
-    if obj.nil? || obj.file_objects.empty?
-      return ""
-    else
-       fobj = Resource.load_instance_from_solr(obj.file_objects.first.pid)
-       fad = ""
-       unless fobj.nil?
-         unless fobj.datastreams["descMetadata"].nil?
-           fad = short_description(fobj.datastreams["descMetadata"].get_values("description").first)
-         else
-           fad = short_description(fobj.datastreams["DC"].get_values("description").first)
-         end
-       end
-       fad
-    end
-  end
+#  def get_file_asset_description(document)
+#    obj = load_af_instance_from_solr(document)
+#    if obj.nil? || obj.file_objects.empty?
+#      return ""
+#    else
+#       fobj = Resource.load_instance_from_solr(obj.file_objects.first.pid)
+#       fad = ""
+#       unless fobj.nil?
+#         unless fobj.datastreams["descMetadata"].nil?
+#           fad = short_description(fobj.datastreams["descMetadata"].get_values("description").first)
+#         else
+#           fad = short_description(fobj.datastreams["DC"].get_values("description").first)
+#         end
+#       end
+#       fad
+#    end
+#  end
 
   def apply_depositor_metadata(user, is_public=false)
     if self.is_a? ActiveFedora::Base 

data/lib/cul_scv_hydra/controllers/terms.rb

@@ -1,11 +1,12 @@
 require 'cul_scv_hydra'
 require 'json'
+require 'blacklight'
 module Cul::Scv::Hydra::Controllers
 module Terms
   extend ActiveSupport::Concern
   included do
-    include Blacklight::SolrHelper
-    include MediaShelf::ActiveFedoraHelper
+    include ::Blacklight::SolrHelper
+    #include MediaShelf::ActiveFedoraHelper
   end
 
   def index

data/lib/cul_scv_hydra/om/dc_metadata.rb

@@ -11,21 +11,21 @@ module Om
              "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.contributor(:path=>"contributor", :namespace_prefix=>"dc")
-      t.coverage(:path=>"coverage", :namespace_prefix=>"dc")
-      t.creator(:path=>"creator", :namespace_prefix=>"dc")
-      t.date(:path=>"date", :namespace_prefix=>"dc")
-      t.description(:path=>"description", :namespace_prefix=>"dc")
-      t.format(:path=>"format", :namespace_prefix=>"dc")
-      t.identifier(:path=>"identifier", :namespace_prefix=>"dc")
-      t.language(:path=>"language", :namespace_prefix=>"dc")
-      t.publisher(:path=>"publisher", :namespace_prefix=>"dc")
-      t.relation(:path=>"relation", :namespace_prefix=>"dc")
-      t.rights(:path=>"rights", :namespace_prefix=>"dc")
-      t.source(:path=>"source", :namespace_prefix=>"dc")
-      t.subject(:path=>"subject", :namespace_prefix=>"dc")
-      t.title(:path=>"title", :namespace_prefix=>"dc")
-      t.dc_type(:path=>"type", :namespace_prefix=>"dc")
+      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", :index_as=>[:displayable, :searchable])
+      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

data/lib/cul_scv_hydra/om/scv_mods_document.rb

@@ -40,21 +40,21 @@ module Om
 # pattern matches
       t.identifier(:path=>"identifier", :attributes=>{:type=>"local"}, :data_type=>:symbol)
       t.identifier_text(:ref=>:identifier, :index_as=>[:not_searchable, :textable])
-      t.clio(:path=>"identifier", :attributes=>{:type=>"CLIO"}, :data_type=>:symbol)
+      t.clio(:path=>"identifier", :attributes=>{:type=>"CLIO"}, :data_type=>:symbol, :index_as=>[:searchable, :displayable])
       t.abstract
       t.subject {
         t.topic
       }
-      t.type_of_resource(:path=>"typeOfResource", :index_as=>[:not_searchable])
+      t.type_of_resource(:path=>"typeOfResource", :index_as=>[:not_searchable,:displayable])
       t.physical_description(:path=>"physicalDescription", :index_as=>[:not_searchable]){
-        t.form_marc(:path=>"form", :attributes=>{:authority=>"marcform"}, :index_as=>[:not_searchable])
-        t.form_aat(:path=>"form", :attributes=>{:authority=>"aat"}, :index_as=>[:not_searchable])
-        t.form(:attributes=>{:authority=>:none}, :index_as=>[:not_searchable])
+        t.form_marc(:path=>"form", :attributes=>{:authority=>"marcform"}, :index_as=>[:not_searchable,:displayable])
+        t.form_aat(:path=>"form", :attributes=>{:authority=>"aat"}, :index_as=>[:not_searchable,:displayable])
+        t.form(:attributes=>{:authority=>:none}, :index_as=>[:not_searchable,:displayable])
         t.form_nomarc(:path=>"form[@authority !='marcform']", :index_as=>[:not_searchable, :displayable, :facetable])
-        t.extent(:path=>"extent", :index_as=>[:not_searchable])
-        t.reformatting_quality(:path=>"reformattingQuality", :index_as=>[:not_searchable])
-        t.internet_media_type(:path=>"internetMediaType", :index_as=>[:not_searchable])
-        t.digital_origin(:path=>"digitalOrigin", :index_as=>[:not_searchable])
+        t.extent(:path=>"extent", :index_as=>[:searchable, :displayable])
+        t.reformatting_quality(:path=>"reformattingQuality", :index_as=>[:not_searchable,:displayable])
+        t.internet_media_type(:path=>"internetMediaType", :index_as=>[:not_searchable,:displayable])
+        t.digital_origin(:path=>"digitalOrigin", :index_as=>[:not_searchable,:displayable])
       }
       t.lib_format(:proxy=>[:physical_description, :form_nomarc])
       t.location(:path=>"location", :index_as=>[:not_searchable]){

data/lib/cul_scv_hydra/solrizer/terminology_based_solrizer.rb

@@ -1,14 +1,10 @@
-require 'solrizer'
+require 'om'
 module Cul::Scv::Hydra::Solrizer::TerminologyBasedSolrizer
 # copied from Solrizer::XML::TerminologyBasedSolrizer
   def self.default_field_mapper
     @@default_field_mapper ||= Cul::Scv::Hydra::Solrizer::FieldMapper.default
   end
 
-  def self.default_extractor
-    @@default_extractor ||= Cul::Scv::Hydra::Solrizer::Extractor.new
-  end
-
   def self.default_value_mapper
     @@value_mapper ||= Cul::Scv::Hydra::Solrizer::ValueMapper.new
   end
@@ -71,26 +67,26 @@ module Cul::Scv::Hydra::Solrizer::TerminologyBasedSolrizer
     end
     generic_field_name_base = OM::XML::Terminology.term_generic_name(*term_pointer)
     
-    self.insert_field_value(solr_doc, term, generic_field_name_base, node_value, term.data_type, term.index_as, field_mapper)
+    self.insert_field_value(solr_doc, term, generic_field_name_base, node_value, field_mapper)
     
     if term_pointer.length > 1
       hierarchical_field_name_base = OM::XML::Terminology.term_hierarchical_name(*term_pointer)
-      self.insert_field_value(solr_doc, term, hierarchical_field_name_base, node_value, term.data_type, term.index_as, field_mapper)
+      self.insert_field_value(solr_doc, term, hierarchical_field_name_base, node_value, field_mapper)
     end
     if term.variant_of and term.variant_of[:field_base]
-      self.insert_field_value(solr_doc, term, term.variant_of[:field_base], node_value, term.data_type, term.index_as, field_mapper, true)
+      self.insert_field_value(solr_doc, term, term.variant_of[:field_base], node_value, field_mapper, true)
     end
     solr_doc
   end
 
-  def self.insert_field_value(solr_doc, term, field_base_name, field_value, data_type, index_as, field_mapper=nil , unique=false)
+  def self.insert_field_value(solr_doc, term, field_base_name, field_value, field_mapper=nil , unique=false)
     field_mapper = self.default_field_mapper if field_mapper.nil?
-    field_mapper.solr_names_and_values(field_base_name, field_value, data_type, index_as).each { |field_name, field_value|
+    field_mapper.solr_names_and_values(field_base_name, field_value, term.type, term.index_as).each { |field_name, field_value|
         unless field_value.join("").strip.empty?
           if term.variant_of and term.variant_of[:map]
             field_value = default_value_mapper.solr_value(term.variant_of[:map], field_value)
           end
-          self.default_extractor.insert_solr_field_value(solr_doc, field_name, field_value, (unique || (field_name == 'text')))
+          Cul::Scv::Hydra::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_name, field_value, (unique || (field_name == 'text')))
         end
     }
   end

data/lib/cul_scv_hydra/version.rb

@@ -1,7 +1,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.6.4'
+        VERSION = '0.7.0'
         def self.version
           VERSION
         end

data/lib/tasks/cmodel.rake

@@ -0,0 +1,97 @@
+APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
+
+def filename_for_pid(pid)
+  pid.gsub(/\:/,'_') + '.xml'
+end
+
+def pid_for_filename(fname)
+  fname.sub(/\.xml$/,'').sub(/_/,':')
+end
+
+def cmodel_fixture(name)
+  path = File.join(APP_ROOT, 'fixtures','cmodels',name)
+  File.open(path, 'rb')
+end
+
+def each_cmodel
+  path = File.join(APP_ROOT, 'fixtures','cmodels')
+  Dir.new(path).each do |fname|
+    if fname =~ /\.xml$/
+      yield pid_for_filename(fname)
+    end
+  end
+end
+
+def config_subs
+  cfile = File.open(File.join(APP_ROOT,'config','subs.yml'))
+  YAML::load(cfile)[Rails.env]
+end
+
+def do_subs(orig)
+  content = orig.clone
+  config_subs.each do |key, val|
+    content.gsub!(/\$#{key.to_s}\$/, val)
+  end
+  content
+end
+
+def connection
+  # no need to go through AF for this except laziness re: finding the YAML
+  @connection ||= (ActiveFedora::Base.fedora_connection[0] ||= ActiveFedora::RubydoraConnection.new(ActiveFedora.config.credentials)).connection
+end
+
+def content_for(pid)
+  fname = filename_for_pid(pid)
+  fcontent = cmodel_fixture(fname).read
+  fcontent = do_subs(fcontent)
+end
+
+def load_content(content, pid)
+  connection.ingest(:file=>StringIO.new(content), :pid=>pid)
+end
+
+def purge(pid)
+  connection.purge_object :pid=>pid
+end
+
+def reload(pid)
+  fcontent = content_for(pid)
+  purge(pid)
+  load_content(fcontent, pid)
+end
+  
+
+namespace :cul_scv_hydra do
+  namespace :cmodel do
+    task :test => :environment do
+      pid = ENV["PID"]
+      puts content_for(pid)
+    end
+
+    task :load => :environment do
+      pid = ENV["PID"]
+      load_content(content_for(pid),pid)
+    end
+
+    task :purge => :environment do
+      pid = ENV["PID"]
+      purge(pid)
+    end
+
+    task :reload => :environment do
+      pid = ENV["PID"]
+      reload(pid)
+    end
+
+    task :reload_all => :environment do
+      pattern = ENV["PATTERN"]
+      pattern = Regexp.compile(pattern) if pattern
+      each_cmodel do |pid|
+        unless (pattern and not pid =~ pattern)
+          puts "reloading #{pid}"
+          reload(pid)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,192 +1,211 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.6.4
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cul_image_props
-  requirement: &70137717919400 !ruby/object:Gem::Requirement
-    none: false
+  name: blacklight
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70137717919400
-- !ruby/object:Gem::Dependency
-  name: blacklight
-  requirement: &70137717918600 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70137717918600
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70137717917880 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70137717917880
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: active-fedora
-  requirement: &70137717916580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137717916580
-- !ruby/object:Gem::Dependency
-  name: active_fedora_finders
-  requirement: &70137717916000 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *70137717916000
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rubydora
-  requirement: &70137717915280 !ruby/object:Gem::Requirement
-    none: false
+  name: hydra-head
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: '5.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70137717915280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: hydra-mods
-  requirement: &70137717914580 !ruby/object:Gem::Requirement
-    none: false
+  name: active_fedora_finders
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70137717914580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: hydra-head
-  requirement: &70137717913880 !ruby/object:Gem::Requirement
-    none: false
+  name: active_fedora_relsint
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137717913880
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &70137717913200 !ruby/object:Gem::Requirement
-    none: false
+  name: cul_image_props
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137717913200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: om
-  requirement: &70137717912520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70137717912520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: solrizer
-  requirement: &70137717911840 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70137717911840
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70137717911080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70137717911080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70137717910300 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70137717910300
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70137717909700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.12.7
   type: :development
   prerelease: false
-  version_requirements: *70137717909700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.7
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70137717908940 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *70137717908940
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
-  requirement: &70137717908260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137717908260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveFedora, OM, and Solrizer implementations for CUL Staff Collection
   Viewer
 email: armintor@gmail.com
@@ -230,43 +249,57 @@ files:
 - lib/cul_scv_hydra/solrizer.rb
 - lib/cul_scv_hydra/version.rb
 - lib/cul_scv_hydra.rb
+- lib/tasks/cmodel.rake
+- app/assets/images/cul_scv_hydra/crystal/binary.png
+- app/assets/images/cul_scv_hydra/crystal/document.png
+- app/assets/images/cul_scv_hydra/crystal/file.png
+- app/assets/images/cul_scv_hydra/crystal/file_broken.png
+- app/assets/images/cul_scv_hydra/crystal/folder_documents.png
+- app/assets/images/cul_scv_hydra/crystal/folder_images.png
+- app/assets/images/cul_scv_hydra/crystal/folder_music.png
+- app/assets/images/cul_scv_hydra/crystal/folder_sound.png
+- app/assets/images/cul_scv_hydra/crystal/folder_video.png
+- app/assets/images/cul_scv_hydra/crystal/kmultiple.png
+- app/assets/images/cul_scv_hydra/crystal/knotify.png
+- app/assets/images/cul_scv_hydra/crystal/mp3.png
+- app/assets/images/cul_scv_hydra/crystal/multimedia2.png
+- app/assets/images/cul_scv_hydra/crystal/video.png
 - app/models/bag_aggregator.rb
 - app/models/content_aggregator.rb
 - app/models/dcdocument.rb
 - app/models/generic_aggregator.rb
 - app/models/generic_object.rb
+- app/models/generic_resource.rb
 - app/models/jp2_image_aggregator.rb
 - app/models/mets_structured_aggregator.rb
 - app/models/resource.rb
 - app/models/static_audio_aggregator.rb
 - app/models/static_image_aggregator.rb
-- config/fedora.yml
 - config/predicate_mappings.yml
-- config/solr.yml
 - config/solr_mappings.yml
 - config/solr_value_maps.yml
+- config/subs.yml
 homepage: https://github.com/cul/cul_scv_hydra
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveFedora, OM, and Solrizer implementations for CUL Staff Collection Viewer
 test_files: []

data/config/fedora.yml

@@ -1,12 +0,0 @@
-development:
-  :url: http://127.0.0.1:8983/fedora
-  :user: fedoraAdmin
-  :password: fedoraAdmin
-test:
-  :url: http://127.0.0.1:8983/fedora
-  :user: fedoraAdmin
-  :password: fedoraAdmin
-default:
-  :url: http://127.0.0.1:8983/fedora
-  :user: fedoraAdmin
-  :password: fedoraAdmin

data/config/solr.yml

@@ -1,6 +0,0 @@
-development:
-  url: http://127.0.0.1:8983/solr/development
-test:
-  url: http://127.0.0.1:8983/solr/test
-default:
-  url: http://127.0.0.1:8983/solr/test