cul_scv_hydra 0.12.0 → 0.12.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OThmMDMzYmQxNWU0NTk2OGRlNDI0ZmUwNWZmYWZjYTViNzM2NmU3Yg==
+  data.tar.gz: !binary |-
+    ZGU4NTMxODQ0YTZkYjRhMzQ1MjFjYWQ2YzYzZTc5ZTk4NmU3N2ZhMQ==
+SHA512:
+  metadata.gz: !binary |-
+    NWU5NGE1MDcwY2VkOThmZGNlYTVjNjlhYjNjN2QyNDk3Y2UzODE1MjZhNzVi
+    NzdkMmM3ZDExNDdjZDA1YzNhYjgwYzRjNGY0ZDE1NmI5NDI4ZWQ5YjNkN2Y2
+    ZjlkMzU0OTk4MTZiNWRkZWMzZmY2OTZmNDRkMjUyMWE2Njc4ZTQ=
+  data.tar.gz: !binary |-
+    ZmFkY2VmOTQ5ODVjNzE5Y2M4MWM3OGM3N2NlMzI4YTkxYTdjNTE2MjBkMGE4
+    MTI5MDhhMDU3YjM2MjA1MzMwYTk3NzM4ZWRjZTY2MGQyYjdiNDQ3MDI3NmY2
+    ODQ2MTJmY2ZiODFhOGEwNGRjNzQxNzgyNWM2ZTNkOTVlYjI3Zjk=

data/app/models/concerns/cul/scv/hydra/models/aggregator.rb

@@ -1,5 +1,4 @@
-module Cul::Scv::Hydra::Models
-module Aggregator
+module Cul::Scv::Hydra::Models::Aggregator
   extend ActiveSupport::Concern
 
   included do
@@ -56,7 +55,7 @@ module Aggregator
   def members(opts={})
     solr_members(opts)
   end
-  
+
   def members_ids(opts={})
     opts = opts.merge({:response_format=>:id_array})
     solr_members(opts)
@@ -133,4 +132,3 @@ module Aggregator
     return obj
   end
 end
-end

data/app/models/concerns/cul/scv/hydra/models/common.rb

@@ -1,17 +1,16 @@
 require 'active-fedora'
 require 'uri'
-module Cul::Scv::Hydra::Models
-module Common
+module Cul::Scv::Hydra::Models::Common
   extend ActiveSupport::Concern
 
   included do
+    extend ActiveModel::Callbacks
     define_model_callbacks :create
     has_metadata :name => "DC", :type=>Cul::Scv::Hydra::Datastreams::DCMetadata, :versionable => true
     has_metadata :name => "descMetadata", :type=>Cul::Scv::Hydra::Datastreams::ModsDocument, :versionable => true
     has_metadata :name => "rightsMetadata", :type=>::Hydra::Datastream::RightsMetadata, :versionable => true
-    
   end
-    
+
   module ClassMethods
     def pid_namespace
       'ldpd'
@@ -21,20 +20,20 @@ module Common
 
   def rdf_type
     relationships[:rdf_type]
-  end 
-    
+  end
+
   def initialize(attrs = nil)
     attrs = {} if attrs.nil?
     attrs[:namespace] = self.class.pid_namespace unless attrs[:namespace]
     super
   end
-    
+
   def create
     run_callbacks :create do
       super
     end
   end
-    
+
   def cmodel_pid(klass)
     klass.pid_namespace + ":" + klass.name.split("::")[-1]
   end
@@ -44,7 +43,7 @@ module Common
     self.datastreams_xml['datastream'].each do |ds|
       dsid = ds["dsid"]
       ds.merge!({:pid => self.pid, :dsID => dsid, :dsLabel => ds["label"]})
-      if dsid == "RELS-EXT" 
+      if dsid == "RELS-EXT"
         mds.merge!({dsid => ActiveFedora::RelsExtDatastream.new(ds)})
       else
         if self.class.ds_specs.has_key? dsid
@@ -61,7 +60,7 @@ module Common
   def route_as
     "default"
   end
-  
+
   def has_desc?
     has_desc = false
     begin
@@ -106,7 +105,7 @@ module Common
     end
     solr_doc["format_ssi"] = [self.route_as]
     solr_doc["index_type_label_ssi"] = [self.index_type_label]
-    
+
     solr_doc.each_pair {|key, value|
       if value.is_a? Array
         value.each {|v| v.strip! unless v.nil? }
@@ -117,11 +116,11 @@ module Common
     solr_doc[:structured_bsi] = 'false' unless solr_doc.has_key? :structured_bsi
     solr_doc
   end
-  
+
   def update_datastream_attributes(params={}, opts={})
     logger.debug "Common.update_datastream_attributes"
     result = params.dup
-    params.each_pair do |dsid, ds_params| 
+    params.each_pair do |dsid, ds_params|
       if datastreams.include?(dsid)
         verify_params = ds_params.dup
         changed = false
@@ -141,7 +140,7 @@ module Common
     end
     return result
   end
-  
+
   def thumbnail_info
     {:url=>image_url("cul_scv_hydra/crystal/kmultiple.png"),:mime_type=>"image/png"}
   end
@@ -167,7 +166,7 @@ module Common
     logger.debug "remaining values! #{values.inspect}" if values.length > 0
     changed || (values.length > 0)
   end
- 
+
   def no_update(ds_params)
     response = {}
     ds_params.each{|pointer, values|
@@ -182,4 +181,3 @@ module Common
     }
   end
 end
-end

data/app/models/concerns/cul/scv/hydra/models/image_resource.rb

@@ -1,80 +1,78 @@
-module Cul::Scv::Hydra::Models
-  module ImageResource
-    IMAGE_EXT = {"image/bmp" => 'bmp', "image/gif" => 'gif', "image/jpeg" => 'jpg', "image/png" => 'png', "image/tiff" => 'tif', "image/x-windows-bmp" => 'bmp', 'image/jp2' => 'jp2'}
-    WIDTH = RDF::URI(ActiveFedora::Predicates.find_graph_predicate(:image_width))
-    LENGTH = RDF::URI(ActiveFedora::Predicates.find_graph_predicate(:image_length))
-    WIDTH_PREDICATE = ActiveFedora::Predicates.short_predicate("http://www.w3.org/2003/12/exif/ns#imageWidth").to_s
-    LENGTH_PREDICATE = ActiveFedora::Predicates.short_predicate("http://www.w3.org/2003/12/exif/ns#imageLength").to_s
-    EXTENT_PREDICATE = ActiveFedora::Predicates.short_predicate("http://purl.org/dc/terms/extent").to_s
-    FORMAT_OF_PREDICATE = ActiveFedora::Predicates.short_predicate("http://purl.org/dc/terms/isFormatOf").to_s
-    FORMAT_URI = RDF::URI("http://purl.org/dc/terms/format")
+module Cul::Scv::Hydra::Models::ImageResource
+  IMAGE_EXT = {"image/bmp" => 'bmp', "image/gif" => 'gif', "image/jpeg" => 'jpg', "image/png" => 'png', "image/tiff" => 'tif', "image/x-windows-bmp" => 'bmp', 'image/jp2' => 'jp2'}
+  WIDTH = RDF::URI(ActiveFedora::Predicates.find_graph_predicate(:image_width))
+  LENGTH = RDF::URI(ActiveFedora::Predicates.find_graph_predicate(:image_length))
+  WIDTH_PREDICATE = ActiveFedora::Predicates.short_predicate("http://www.w3.org/2003/12/exif/ns#imageWidth").to_s
+  LENGTH_PREDICATE = ActiveFedora::Predicates.short_predicate("http://www.w3.org/2003/12/exif/ns#imageLength").to_s
+  EXTENT_PREDICATE = ActiveFedora::Predicates.short_predicate("http://purl.org/dc/terms/extent").to_s
+  FORMAT_OF_PREDICATE = ActiveFedora::Predicates.short_predicate("http://purl.org/dc/terms/isFormatOf").to_s
+  FORMAT_URI = RDF::URI("http://purl.org/dc/terms/format")
 
-    DJATOKA_THUMBNAIL_PARMS = {
-      "url_ver" => "Z39.88-2004",
-      "svc_id" => "info:lanl-repo/svc/getRegion",
-      "svc_val_fmt" => "info:ofi/fmt:kev:mtx:jpeg2000",
-      "svc.format" => "image/jpeg",
-      "svc.level" => "",
-      "svc.rotate" => "0",
-      "svc.scale" => "200",
-      "svc.clayers" => ""
-    }
+  DJATOKA_THUMBNAIL_PARMS = {
+    "url_ver" => "Z39.88-2004",
+    "svc_id" => "info:lanl-repo/svc/getRegion",
+    "svc_val_fmt" => "info:ofi/fmt:kev:mtx:jpeg2000",
+    "svc.format" => "image/jpeg",
+    "svc.level" => "",
+    "svc.rotate" => "0",
+    "svc.scale" => "200",
+    "svc.clayers" => ""
+  }
 
-    DJATOKA_BASE_URL = "http://iris.cul.columbia.edu:8888/resolve"
+  DJATOKA_BASE_URL = "http://iris.cul.columbia.edu:8888/resolve"
 
-    def long
-      @long_side ||= max(width(), length())
-    end
+  def long
+    @long_side ||= max(width(), length())
+  end
 
-    def width
-      @width ||= begin
-        ds = datastreams["content"]
-        width = 0
-        unless ds.nil? or rels_int.relationships(ds,:exif_image_width).blank?
-          width = rels_int.relationships(ds,:exif_image_width).first.object.to_s.to_i
-        end
-        width = relationships(:image_width).first.to_s.to_i if width == 0
-        width
+  def width
+    @width ||= begin
+      ds = datastreams["content"]
+      width = 0
+      unless ds.nil? or rels_int.relationships(ds,:exif_image_width).blank?
+        width = rels_int.relationships(ds,:exif_image_width).first.object.to_s.to_i
       end
+      width = relationships(:image_width).first.to_s.to_i if width == 0
+      width
     end
+  end
 
-    def length
-      @length ||= begin
-        ds = datastreams["content"]
-        length = 0
-        unless ds.nil? or rels_int.relationships(ds,:exif_image_length).blank?
-          length = rels_int.relationships(ds,:exif_image_length).first.object.to_s.to_i
-        end
-        length = relationships(:image_length).first.to_s.to_i if length == 0
-        length
+  def length
+    @length ||= begin
+      ds = datastreams["content"]
+      length = 0
+      unless ds.nil? or rels_int.relationships(ds,:exif_image_length).blank?
+        length = rels_int.relationships(ds,:exif_image_length).first.object.to_s.to_i
       end
+      length = relationships(:image_length).first.to_s.to_i if length == 0
+      length
     end
+  end
 
-    def zooming?
-      zoom = rels_int.relationships(datastreams['content'],:foaf_zooming).first
-      return zoom.object.to_s if zoom
-      datastreams.each do |k,v|
-        if v.mimeType =~ /image\/jp2$/i
-          zoom = "info:fedora/#{k.dsid}"
-        end
+  def zooming?
+    zoom = rels_int.relationships(datastreams['content'],:foaf_zooming).first
+    return zoom.object.to_s if zoom
+    datastreams.each do |k,v|
+      if v.mimeType =~ /image\/jp2$/i
+        zoom = "info:fedora/#{k.dsid}"
       end
-      return zoom  
     end
+    return zoom
+  end
 
-    def thumbnail_info
-      thumb = rels_int.relationships(datastreams['content'],:foaf_thumbnail).first
-      if thumb
-        t_dsid = thumb.object.to_s.split('/')[-1]
-        t_url = "#{ActiveFedora.fedora_config.credentials[:url]}/objects/#{pid}/datastreams/#{t_dsid}/content"
-        return {:url=>t_url,:mime=>datastreams[t_dsid].mimeType}
-      elsif (zoom = self.zooming?)
-        t_dsid = zoom.split('/')[-1]
-        t_parms = DJATOKA_THUMBNAIL_PARMS.merge({"rft_id" => datastreams[t_dsid].dsLocation})
-        url = "#{DJATOKA_BASE_URL}?#{options.map { |key, value|  "#{CGI::escape(key.to_s)}=#{CGI::escape(value.to_s)}"}.join("&")  }"
-        {:url => url, :mime => t_parms["svc.format"]}
-      else
-        return {:asset=>"cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
-      end
+  def thumbnail_info
+    thumb = rels_int.relationships(datastreams['content'],:foaf_thumbnail).first
+    if thumb
+      t_dsid = thumb.object.to_s.split('/')[-1]
+      t_url = "#{ActiveFedora.fedora_config.credentials[:url]}/objects/#{pid}/datastreams/#{t_dsid}/content"
+      return {:url=>t_url,:mime=>datastreams[t_dsid].mimeType}
+    elsif (zoom = self.zooming?)
+      t_dsid = zoom.split('/')[-1]
+      t_parms = DJATOKA_THUMBNAIL_PARMS.merge({"rft_id" => datastreams[t_dsid].dsLocation})
+      url = "#{DJATOKA_BASE_URL}?#{options.map { |key, value|  "#{CGI::escape(key.to_s)}=#{CGI::escape(value.to_s)}"}.join("&")  }"
+      {:url => url, :mime => t_parms["svc.format"]}
+    else
+      return {:asset=>"cul_scv_hydra/crystal/file.png",:mime=>'image/png'}
     end
   end
-end
+end

data/app/models/concerns/cul/scv/hydra/models/linkable_resources.rb

@@ -1,111 +1,108 @@
-module Cul::Scv::Hydra::Models
-  module LinkableResources
-    include Cul::Scv::Fedora::UrlHelperBehavior
-    # so as to avoid including all the url hepers via:
-    ## include Rails.application.routes.url_helpers
-    # we are just going to delegate
-    delegate :fedora_content_path,  :to => 'Rails.application.routes.url_helpers'
-    delegate :cache_path,  :to => 'Rails.application.routes.url_helpers'
+module Cul::Scv::Hydra::Models::LinkableResources
+  include Cul::Scv::Fedora::UrlHelperBehavior
+  # so as to avoid including all the url hepers via:
+  ## include Rails.application.routes.url_helpers
+  # we are just going to delegate
+  delegate :fedora_content_path,  :to => 'Rails.application.routes.url_helpers'
+  delegate :cache_path,  :to => 'Rails.application.routes.url_helpers'
 
-    def http_client
-      unless @http_client
-        @http_client ||= HTTPClient.new
-        @http_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        uname = Cul::Scv::Fedora.repository.config[:user]
-        pwd = Cul::Scv::Fedora.repository.config[:password]
-        @http_client.set_auth(nil, uname, pwd)
-      end
-      @http_client
+  def http_client
+    unless @http_client
+      @http_client ||= HTTPClient.new
+      @http_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      uname = Cul::Scv::Fedora.repository.config[:user]
+      pwd = Cul::Scv::Fedora.repository.config[:password]
+      @http_client.set_auth(nil, uname, pwd)
     end
+    @http_client
+  end
 
-    def linkable_resources
-      r = self.parts(:response_format => :solr)
-      return [] if r.blank?
-      members = r.collect {|hit|
-        SolrDocument.new(hit)
-      }
-      members.delete_if { |sd| (sd[:has_model_ssim] & ["info:fedora/ldpd:Resource"]).blank? }
-      case self.route_as
-      when "zoomingimage"
-        results = members.collect {|doc| image_resource(doc)}
-        base_id = self.pid
-        url = fedora_ds_url(base_id, 'SOURCE') + '/content'
-        head_req = http_client().head(url)
-        file_size = head_req.header["Content-Length"].first.to_i
-        results << {
-          :dimensions => "Original",
-          :mime_type => "image/jp2",
-          :uri=>base_id, :block=>"SOURCE", :filename=>base_id + "_source.jp2",
-          :content_models=>[]}  
-      when "audio"
-        results = members.collect {|doc| audio_resource(doc)}
-      when "image"
-        results = members.collect {|doc| image_resource(doc)}
-      else
-        raise "Unknown format #{self.route_as}"
-      end
-      return results
-    end
-    
-    def basic_resource(document)
-      res = {}
-      res[:pid] = document["id"]
-      res[:dsid] = "CONTENT"
-      res[:mime_type] = document["dc_format_ssm"] ? document["dc_format_ssm"].first : "application/octect-stream"
-      res[:content_models] = document["has_model_ssim"]
-      res[:file_size] = document["extent_ssim"].first.to_i
-      res[:size] = (document["extent_ssim"].first.to_i / 1024).to_s + " Kb"
-      res
+  def linkable_resources
+    r = self.parts(:response_format => :solr)
+    return [] if r.blank?
+    members = r.collect {|hit|
+      SolrDocument.new(hit)
+    }
+    members.delete_if { |sd| (sd[:has_model_ssim] & ["info:fedora/ldpd:Resource"]).blank? }
+    case self.route_as
+    when "zoomingimage"
+      results = members.collect {|doc| image_resource(doc)}
+      base_id = self.pid
+      url = fedora_ds_url(base_id, 'SOURCE') + '/content'
+      head_req = http_client().head(url)
+      file_size = head_req.header["Content-Length"].first.to_i
+      results << {
+        :dimensions => "Original",
+        :mime_type => "image/jp2",
+        :uri=>base_id, :block=>"SOURCE", :filename=>base_id + "_source.jp2",
+        :content_models=>[]}
+    when "audio"
+      results = members.collect {|doc| audio_resource(doc)}
+    when "image"
+      results = members.collect {|doc| image_resource(doc)}
+    else
+      raise "Unknown format #{self.route_as}"
     end
+    return results
+  end
 
-    def image_resource(document)
-      res = basic_resource(document)
-      if document["image_width_ssim"]
-        res[:dimensions] = document["image_width_ssim"].first + " x " + document["image_length_ssim"].first
-        res[:width] = document["image_width_ssim"].first
-        res[:height] = document["image_length_ssim"].first
-      else
-        res[:dimensions] = "? x ?"
-        res[:width] = "0"
-        res[:height] = "0"
-      end
-      base_id = document["id"]
-      base_filename = base_id.gsub(/\:/,"")
-      img_filename = base_filename + "." + document["dc_format_ssm"].first.gsub(/^[^\/]+\//,"")
-      res[:filename] = img_filename
-      res[:block] = "CONTENT"
-      res[:mime_type] = document["dc_format_ssm"] ? document["dc_format_ssm"].first : "application/octect-stream"
-      res[:content_models] = document["has_model_ssim"]
-      res[:file_size] = document["extent_ssim"].first.to_i
-      res[:size] = (document["extent_ssim"].first.to_i / 1024).to_s + " Kb"
-      res[:uri] = base_id
-      res
+  def basic_resource(document)
+    res = {}
+    res[:pid] = document["id"]
+    res[:dsid] = "CONTENT"
+    res[:mime_type] = document["dc_format_ssm"] ? document["dc_format_ssm"].first : "application/octect-stream"
+    res[:content_models] = document["has_model_ssim"]
+    res[:file_size] = document["extent_ssim"].first.to_i
+    res[:size] = (document["extent_ssim"].first.to_i / 1024).to_s + " Kb"
+    res
+  end
+
+  def image_resource(document)
+    res = basic_resource(document)
+    if document["image_width_ssim"]
+      res[:dimensions] = document["image_width_ssim"].first + " x " + document["image_length_ssim"].first
+      res[:width] = document["image_width_ssim"].first
+      res[:height] = document["image_length_ssim"].first
+    else
+      res[:dimensions] = "? x ?"
+      res[:width] = "0"
+      res[:height] = "0"
     end
+    base_id = document["id"]
+    base_filename = base_id.gsub(/\:/,"")
+    img_filename = base_filename + "." + document["dc_format_ssm"].first.gsub(/^[^\/]+\//,"")
+    res[:filename] = img_filename
+    res[:block] = "CONTENT"
+    res[:mime_type] = document["dc_format_ssm"] ? document["dc_format_ssm"].first : "application/octect-stream"
+    res[:content_models] = document["has_model_ssim"]
+    res[:file_size] = document["extent_ssim"].first.to_i
+    res[:size] = (document["extent_ssim"].first.to_i / 1024).to_s + " Kb"
+    res[:uri] = base_id
+    res
+  end
 
-    def audio_resource(document)
-      res = basic_resource(document)
-      base_id = document["id"]
-      base_filename = base_id.gsub(/\:/,"")
-      if res[:mime_type] =~ /wav/
-        ext = 'wav'
-      elsif res[:mime_type] =~ /mpeg/
-        ext = 'mp3'
-      else
-        ext = 'bin'
-      end
-      filename = base_filename + "." + ext
-      dc_filename = base_filename + "_dc.xml"
-      res[:uri] = base_id
-      res[:block] = "CONTENT"
-      res[:filename] = filename
-      res[:dc_path] = fedora_content_path(:download_method=>"show_pretty", :uri=>base_id, :block=>"DC", :filename=>dc_filename)
-      res[:mime_type] = document["dc_format_ssm"] ? document["dc_format_ssm"].first : "application/octect-stream"
-      res[:content_models] = document["has_model_ssim"]
-      res[:file_size] = document["extent_ssim"].first.to_i
-      res[:size] = (document["extent_ssim"].first.to_i / 1024).to_s + " Kb"
-      res
+  def audio_resource(document)
+    res = basic_resource(document)
+    base_id = document["id"]
+    base_filename = base_id.gsub(/\:/,"")
+    if res[:mime_type] =~ /wav/
+      ext = 'wav'
+    elsif res[:mime_type] =~ /mpeg/
+      ext = 'mp3'
+    else
+      ext = 'bin'
     end
-    
+    filename = base_filename + "." + ext
+    dc_filename = base_filename + "_dc.xml"
+    res[:uri] = base_id
+    res[:block] = "CONTENT"
+    res[:filename] = filename
+    res[:dc_path] = fedora_content_path(:download_method=>"show_pretty", :uri=>base_id, :block=>"DC", :filename=>dc_filename)
+    res[:mime_type] = document["dc_format_ssm"] ? document["dc_format_ssm"].first : "application/octect-stream"
+    res[:content_models] = document["has_model_ssim"]
+    res[:file_size] = document["extent_ssim"].first.to_i
+    res[:size] = (document["extent_ssim"].first.to_i / 1024).to_s + " Kb"
+    res
   end
 
-end
+end

data/app/models/concerns/cul/scv/hydra/models/resource.rb

@@ -1,5 +1,4 @@
-module Cul::Scv::Hydra::Models
-module Resource
+module Cul::Scv::Hydra::Models::Resource
     extend ActiveSupport::Concern
 # constants #
   IMAGE_MIME_TYPES = [
@@ -26,8 +25,8 @@ module Resource
             return relationships[:#{y.to_s}]
         }
       }
-      
-      after_create :resource!      
+
+      after_create :resource!
     end
     if self.respond_to? :has_datastream
       has_datastream :name => "CONTENT", :type=>::ActiveFedora::Datastream, :versionable => true
@@ -86,4 +85,3 @@ module Resource
     mime_type = mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
   end
 end
-end

data/app/models/{dcdocument.rb → dc_document.rb}

@@ -6,8 +6,8 @@ class DcDocument < ActiveFedora::Base
   include ::ActiveFedora::DatastreamCollections
   include Hydra::ModelMethods
   include Cul::Scv::Hydra::Models::Common
-  alias :file_objects :resources
-  
+  #alias :file_objects :resources
+
   has_and_belongs_to_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'
 
   def self.load_instance_from_solr(pid,solr_doc=nil)
@@ -20,7 +20,7 @@ class DcDocument < ActiveFedora::Base
     else
       raise "Solr document record id and pid do not match" unless pid == solr_doc[SOLR_DOCUMENT_ID]
     end
-     
+
     create_date = solr_doc[::ActiveFedora::SolrService.solr_name(:system_create, :date)].nil? ? solr_doc[::ActiveFedora::SolrService.solr_name(:system_create, :date).to_s] : solr_doc[::ActiveFedora::SolrService.solr_name(:system_create, :date)]
     modified_date = solr_doc[::ActiveFedora::SolrService.solr_name(:system_create, :date)].nil? ? solr_doc[::ActiveFedora::SolrService.solr_name(:system_modified, :date).to_s] : solr_doc[::ActiveFedora::SolrService.solr_name(:system_modified, :date)]
     obj = DcDocument.new({:pid=>solr_doc[SOLR_DOCUMENT_ID],:create_date=>create_date,:modified_date=>modified_date})

data/app/models/generic_object.rb

@@ -10,7 +10,7 @@ class GenericObject < ::ActiveFedora::Base
 
   has_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'
 
-  alias :file_objects :resources
+  #alias :file_objects :resources
 
   def route_as
     "multipartitem"

data/app/models/mets_structured_aggregator.rb

@@ -10,7 +10,7 @@ class METSStructuredAggregator < ::ActiveFedora::Base
 
   has_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'
 
-  alias :file_objects :resources
+  #alias :file_objects :resources
 
   def route_as
     "multipartitem"

data/lib/cul_scv_hydra/version.rb

@@ -1,10 +1,10 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.12.0'
+        VERSION = '0.12.1'
         def self.version
           VERSION
         end
     end
   end
-end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.12.0
-  prerelease: 
+  version: 0.12.1
 platform: ruby
 authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: active_fedora_finders
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: active_fedora_relsint
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cul_image_props
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mods
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -209,41 +184,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/rails
-- lib/cul_scv_fedora/dummy_object.rb
-- lib/cul_scv_fedora/rubydora_patch.rb
-- lib/cul_scv_fedora/url_helper_behavior.rb
-- lib/cul_scv_hydra/access_controls_enforcement.rb
-- lib/cul_scv_hydra/controllers/aggregates.rb
-- lib/cul_scv_hydra/controllers/aggregator_controller_helper.rb
-- lib/cul_scv_hydra/controllers/catalog.rb
-- lib/cul_scv_hydra/controllers/content_aggregators.rb
-- lib/cul_scv_hydra/controllers/datastreams.rb
-- lib/cul_scv_hydra/controllers/helpers/active_fedora_helper_behavior.rb
-- lib/cul_scv_hydra/controllers/helpers/application_helper_behavior.rb
-- lib/cul_scv_hydra/controllers/helpers/dc_metadata_helper_behavior.rb
-- lib/cul_scv_hydra/controllers/helpers/hydra_assets_helper_behavior.rb
-- lib/cul_scv_hydra/controllers/helpers/hydra_autocomplete_helper_behavior.rb
-- lib/cul_scv_hydra/controllers/helpers/hydra_uploader_helper_behavior.rb
-- lib/cul_scv_hydra/controllers/helpers/resources_helper_behavior.rb
-- lib/cul_scv_hydra/controllers/helpers.rb
-- lib/cul_scv_hydra/controllers/resources.rb
-- lib/cul_scv_hydra/controllers/static_image_aggregators.rb
-- lib/cul_scv_hydra/controllers/suggestions.rb
-- lib/cul_scv_hydra/controllers/terms.rb
-- lib/cul_scv_hydra/controllers.rb
-- lib/cul_scv_hydra/engine.rb
-- lib/cul_scv_hydra/om/standard_mods.rb
-- lib/cul_scv_hydra/om.rb
-- lib/cul_scv_hydra/solrizer/extractor.rb
-- lib/cul_scv_hydra/solrizer/field_mapper.rb
-- lib/cul_scv_hydra/solrizer/scv_mods_fieldable.rb
-- lib/cul_scv_hydra/solrizer/terminology_based_solrizer.rb
-- lib/cul_scv_hydra/solrizer/value_mapper.rb
-- 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
@@ -259,18 +199,17 @@ files:
 - 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/concerns/cul/scv/hydra/models.rb
 - app/models/concerns/cul/scv/hydra/models/aggregator.rb
 - app/models/concerns/cul/scv/hydra/models/common.rb
 - app/models/concerns/cul/scv/hydra/models/image_resource.rb
 - app/models/concerns/cul/scv/hydra/models/linkable_resources.rb
 - app/models/concerns/cul/scv/hydra/models/resource.rb
-- app/models/concerns/cul/scv/hydra/models.rb
-- app/models/concerns/cul.rb
 - app/models/content_aggregator.rb
 - app/models/cul/scv/hydra/datastreams/dc_metadata.rb
 - app/models/cul/scv/hydra/datastreams/mods_document.rb
 - app/models/cul/scv/hydra/datastreams/struct_metadata.rb
-- app/models/dcdocument.rb
+- app/models/dc_document.rb
 - app/models/generic_aggregator.rb
 - app/models/generic_object.rb
 - app/models/generic_resource.rb
@@ -280,13 +219,49 @@ files:
 - app/models/resource_aggregator.rb
 - app/models/static_audio_aggregator.rb
 - app/models/static_image_aggregator.rb
+- bin/rails
 - config/fedora.yml
 - config/predicate_mappings.yml
 - config/solr_mappings.yml
 - config/solr_value_maps.yml
 - config/subs.yml
+- lib/cul_scv_fedora/dummy_object.rb
+- lib/cul_scv_fedora/rubydora_patch.rb
+- lib/cul_scv_fedora/url_helper_behavior.rb
+- lib/cul_scv_hydra.rb
+- lib/cul_scv_hydra/access_controls_enforcement.rb
+- lib/cul_scv_hydra/controllers.rb
+- lib/cul_scv_hydra/controllers/aggregates.rb
+- lib/cul_scv_hydra/controllers/aggregator_controller_helper.rb
+- lib/cul_scv_hydra/controllers/catalog.rb
+- lib/cul_scv_hydra/controllers/content_aggregators.rb
+- lib/cul_scv_hydra/controllers/datastreams.rb
+- lib/cul_scv_hydra/controllers/helpers.rb
+- lib/cul_scv_hydra/controllers/helpers/active_fedora_helper_behavior.rb
+- lib/cul_scv_hydra/controllers/helpers/application_helper_behavior.rb
+- lib/cul_scv_hydra/controllers/helpers/dc_metadata_helper_behavior.rb
+- lib/cul_scv_hydra/controllers/helpers/hydra_assets_helper_behavior.rb
+- lib/cul_scv_hydra/controllers/helpers/hydra_autocomplete_helper_behavior.rb
+- lib/cul_scv_hydra/controllers/helpers/hydra_uploader_helper_behavior.rb
+- lib/cul_scv_hydra/controllers/helpers/resources_helper_behavior.rb
+- lib/cul_scv_hydra/controllers/resources.rb
+- lib/cul_scv_hydra/controllers/static_image_aggregators.rb
+- lib/cul_scv_hydra/controllers/suggestions.rb
+- lib/cul_scv_hydra/controllers/terms.rb
+- lib/cul_scv_hydra/engine.rb
+- lib/cul_scv_hydra/om.rb
+- lib/cul_scv_hydra/om/standard_mods.rb
+- lib/cul_scv_hydra/solrizer.rb
+- lib/cul_scv_hydra/solrizer/extractor.rb
+- lib/cul_scv_hydra/solrizer/field_mapper.rb
+- lib/cul_scv_hydra/solrizer/scv_mods_fieldable.rb
+- lib/cul_scv_hydra/solrizer/terminology_based_solrizer.rb
+- lib/cul_scv_hydra/solrizer/value_mapper.rb
+- lib/cul_scv_hydra/version.rb
+- lib/tasks/cmodel.rake
 homepage: https://github.com/cul/cul_scv_hydra
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -295,21 +270,19 @@ require_paths:
 - lib
 - fixtures
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       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.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveFedora, OM, and Solrizer implementations for CUL Staff Collection Viewer
 test_files: []

data/app/models/concerns/cul.rb

@@ -1,7 +0,0 @@
-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