cul_hydra 1.8.0 → 1.9.0

data/fixtures/spec/FOXML/resource-thumb.xml

@@ -20,8 +20,9 @@
       <foxml:xmlContent>
         <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
           <rdf:Description rdf:about="info:fedora/test:thumb_image">
-            <hasModel xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/ldpd:Resource"/>
+            <hasModel xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/ldpd:GenericResource"/>
             <imageWidth xmlns="http://purl.oclc.org/NET/CUL/RESOURCE/STILLIMAGE/BASIC/" >72</imageWidth>
+            <memberOf xmlns="http://purl.oclc.org/NET/CUL/" rdf:resource="info:fedora/test:c_agg"/>
           </rdf:Description>
         </rdf:RDF>
       </foxml:xmlContent>

data/lib/cul_hydra.rb

@@ -1,10 +1,7 @@
-require 'hydra/head'
-require 'active_fedora_relsint'
 require 'cul_hydra/exceptions'
 require 'cul_hydra/solrizer_patch'
 module Cul
   module Hydra
-    autoload :Controllers, 'cul_hydra/controllers'
     autoload :Fedora, 'cul_hydra/fedora'
     autoload :Om, 'cul_hydra/om'
     autoload :Solrizer, 'cul_hydra/solrizer'
@@ -13,10 +10,10 @@ module Cul
 end
 
 require "cul_hydra/access_controls_enforcement"
-require "cul_hydra/controllers"
 require "cul_hydra/om"
 require "cul_hydra/indexer"
 require "cul_hydra/risearch_members"
 require "cul_hydra/solrizer"
+require "cul_hydra/rels_int"
 require "cul_hydra/version"
 require "cul_hydra/engine" if defined? Rails

data/lib/cul_hydra/rels_int.rb

@@ -0,0 +1,9 @@
+# -*- encoding : utf-8 -*-
+require 'active_support'
+module Cul
+module Hydra
+  module RelsInt
+    autoload :RDFXMLWriter, 'cul_hydra/rels_int/rdf_xml_writer'
+  end
+end
+end

data/lib/cul_hydra/rels_int/rdf_xml_writer.rb

@@ -0,0 +1,33 @@
+# -*- encoding : utf-8 -*-
+require 'active_fedora/rdf_xml_writer'
+module Cul
+module Hydra
+  module RelsInt
+    class RDFXMLWriter < ActiveFedora::RDFXMLWriter
+      # Write a predicate with one or more values.
+      #
+      # Values may be a combination of Literal and Resource (Node or URI).
+      # @param [RDF::Resource] predicate
+      #   Predicate to serialize
+      # @param [Array<RDF::Resource>] objects
+      #   Objects to serialize
+      # @return [String]
+      def predicate(predicate, objects)
+        add_debug {"predicate: #{predicate.inspect}, objects: #{objects}"}
+
+        return if objects.to_a.empty?
+
+        add_debug {"predicate: #{get_curie(predicate)}"}
+        render_property(predicate, objects) do |o, inlist=nil|
+          # Yields each object, for potential recursive definition.
+          # If nil is returned, a leaf is produced
+          #depth {subject(o, :rel => get_curie(predicate), :inlist => inlist, :element => (:li if objects.length > 1 || inlist))} if !is_done?(o) && @subjects.include?(o)
+          # we don't ever want to recurse, so nil it all
+          nil
+        end
+      end
+
+    end
+  end
+end
+end

data/lib/cul_hydra/version.rb

@@ -1,6 +1,6 @@
 module Cul
   module Hydra
-    VERSION = '1.8.0'
+    VERSION = '1.9.0'
     def self.version
       VERSION
     end

data/lib/tasks/cul_hydra_dev.rake

@@ -1,34 +1,6 @@
 APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../") unless defined?(APP_ROOT)
 
-require 'jettywrapper'
-JETTY_ZIP_BASENAME = 'fedora-3.8.1-with-risearch'
-Jettywrapper.url = "https://github.com/cul/hydra-jetty/archive/#{JETTY_ZIP_BASENAME}.zip"
-
 namespace :cul_hydra do
-
-  begin
-    # This code is in a begin/rescue block so that the Rakefile is usable
-    # in an environment where RSpec is unavailable (i.e. production).
-
-    require 'rspec/core/rake_task'
-
-    RSpec::Core::RakeTask.new(:rspec) do |spec|
-      spec.pattern = FileList['spec/**/*_spec.rb']
-      spec.pattern += FileList['spec/*_spec.rb']
-      spec.rspec_opts = ['--backtrace'] if ENV['CI']
-    end
-
-    RSpec::Core::RakeTask.new(:rcov) do |spec|
-      spec.pattern = FileList['spec/**/*_spec.rb']
-      spec.pattern += FileList['spec/*_spec.rb']
-      spec.rcov = true
-    end
-
-  rescue LoadError => e
-    puts "[Warning] Exception creating rspec rake tasks.  This message can be ignored in environments that intentionally do not pull in the RSpec gem (i.e. production)."
-    puts e
-  end
-
   desc "CI build"
   task :ci do
     ENV['environment'] = "test"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_hydra
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,50 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bootstrap-sass
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.7
+        version: 4.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.7
+        version: 4.2.10
 - !ruby/object:Gem::Dependency
-  name: blacklight
+  name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.7
 - !ruby/object:Gem::Dependency
-  name: hydra-head
+  name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -73,28 +73,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.3.1
+        version: '8.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.3.1
+        version: '8.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.7.0
 - !ruby/object:Gem::Dependency
   name: active-triples
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: active_fedora_finders
   requirement: !ruby/object:Gem::Requirement
@@ -109,20 +115,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: active_fedora_relsint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: cul_image_props
   requirement: !ruby/object:Gem::Requirement
@@ -269,14 +261,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rspec-json_expectations
   requirement: !ruby/object:Gem::Requirement
@@ -379,6 +371,7 @@ files:
 - app/models/concerns/cul/hydra/models/common.rb
 - app/models/concerns/cul/hydra/models/image_resource.rb
 - app/models/concerns/cul/hydra/models/linkable_resources.rb
+- app/models/concerns/cul/hydra/models/rels_int.rb
 - app/models/concerns/cul/hydra/models/resource.rb
 - app/models/concerns/nfo/common.rb
 - app/models/concerns/nfo/file_data_object.rb
@@ -402,17 +395,12 @@ files:
 - app/models/cul/hydra/datastreams/access_control_metadata.rb
 - app/models/cul/hydra/datastreams/dc_metadata.rb
 - app/models/cul/hydra/datastreams/mods_document.rb
+- app/models/cul/hydra/datastreams/rels_int.rb
 - app/models/cul/hydra/datastreams/struct_metadata.rb
 - app/models/dc_document.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/resource_aggregator.rb
-- app/models/static_audio_aggregator.rb
-- app/models/static_image_aggregator.rb
 - bin/rails
 - config/fedora.yml
 - config/jetty.yml
@@ -508,6 +496,9 @@ files:
 - fixtures/spec/CUL_MODS/mods-titles.xml
 - fixtures/spec/CUL_MODS/mods-top-level-location-vs-relateditem-location.xml
 - fixtures/spec/CUL_MODS/mods-unmapped-project.xml
+- fixtures/spec/CUL_RELS_INT/rels_int_blank.xml
+- fixtures/spec/CUL_RELS_INT/rels_int_profile.xml
+- fixtures/spec/CUL_RELS_INT/rels_int_test.xml
 - fixtures/spec/CUL_SOLR/archival-context.json
 - fixtures/spec/CUL_SOLR/mods-001.xml
 - fixtures/spec/CUL_SOLR/mods-001.yml
@@ -530,25 +521,6 @@ files:
 - lib/cul_hydra.rb
 - lib/cul_hydra/access_controls_enforcement.rb
 - lib/cul_hydra/access_levels.rb
-- lib/cul_hydra/controllers.rb
-- lib/cul_hydra/controllers/aggregates.rb
-- lib/cul_hydra/controllers/aggregator_controller_helper.rb
-- lib/cul_hydra/controllers/catalog.rb
-- lib/cul_hydra/controllers/collections.rb
-- lib/cul_hydra/controllers/content_aggregators.rb
-- lib/cul_hydra/controllers/datastreams.rb
-- lib/cul_hydra/controllers/helpers.rb
-- lib/cul_hydra/controllers/helpers/active_fedora_helper_behavior.rb
-- lib/cul_hydra/controllers/helpers/application_helper_behavior.rb
-- lib/cul_hydra/controllers/helpers/dc_metadata_helper_behavior.rb
-- lib/cul_hydra/controllers/helpers/hydra_assets_helper_behavior.rb
-- lib/cul_hydra/controllers/helpers/hydra_autocomplete_helper_behavior.rb
-- lib/cul_hydra/controllers/helpers/hydra_uploader_helper_behavior.rb
-- lib/cul_hydra/controllers/helpers/resources_helper_behavior.rb
-- lib/cul_hydra/controllers/resources.rb
-- lib/cul_hydra/controllers/static_image_aggregators.rb
-- lib/cul_hydra/controllers/suggestions.rb
-- lib/cul_hydra/controllers/terms.rb
 - lib/cul_hydra/engine.rb
 - lib/cul_hydra/exceptions.rb
 - lib/cul_hydra/fedora.rb
@@ -558,6 +530,8 @@ files:
 - lib/cul_hydra/indexer.rb
 - lib/cul_hydra/om.rb
 - lib/cul_hydra/om/standard_mods.rb
+- lib/cul_hydra/rels_int.rb
+- lib/cul_hydra/rels_int/rdf_xml_writer.rb
 - lib/cul_hydra/risearch_members.rb
 - lib/cul_hydra/solrizer.rb
 - lib/cul_hydra/solrizer/access_control_metadata_fields.rb

data/app/models/jp2_image_aggregator.rb

@@ -1,34 +0,0 @@
-require "active-fedora"
-require "active_fedora_finders"
-class JP2ImageAggregator < ResourceAggregator
-
-  has_datastream :name => "SOURCE", :type=>::ActiveFedora::Datastream, :mimeType=>"image/jp2", :controlGroup=>'E'
-
-  def route_as
-    "zoomingimage"
-  end
-
-  def index_type_label
-    "PART"
-  end
-
-  def to_solr(solr_doc = Hash.new, opts={})
-    solr_doc = super
-    source = self.datastreams["SOURCE"]
-    source.profile
-    if source.controlGroup == 'E'
-      solr_doc["rft_id_ss"] = source.dsLocation
-    else
-      rc = ActiveFedora::RubydoraConnection.instance.connection
-      url = rc.config["url"]
-      uri = URI::parse(url)
-      url = "#{uri.scheme}://#{uri.host}:#{uri.port}/fedora/objects/#{pid}/datastreams/SOURCE/content"
-      solr_doc["rft_id_ss"] = url
-    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/mets_structured_aggregator.rb

@@ -1,18 +0,0 @@
-require "active-fedora"
-require "active_fedora_finders"
-class METSStructuredAggregator < ::ActiveFedora::Base
-  extend ActiveModel::Callbacks
-  include ::ActiveFedora::FinderMethods::RepositoryMethods
-  include ::ActiveFedora::DatastreamCollections
-  include ::Hydra::ModelMethods
-  include Cul::Hydra::Models::Common
-  include Cul::Hydra::Models::Aggregator
-
-  has_many :parts, :property => :cul_member_of, :class_name=>'ActiveFedora::Base'
-
-  #alias :file_objects :resources
-
-  def route_as
-    "multipartitem"
-  end
-end

data/app/models/resource.rb

@@ -1,78 +0,0 @@
-require "active-fedora"
-require "active_fedora_finders"
-require "cul_image_props"
-require "mime/types"
-require "uri"
-class Resource < ActiveFedora::Base
-  include ::ActiveFedora::FinderMethods::RepositoryMethods
-  include ::ActiveFedora::DatastreamCollections
-#  include ::Hydra::ModelMethods
-  include Cul::Hydra::Models::Common
-  include Cul::Hydra::Models::Resource
-  include Cul::Hydra::Models::ImageResource
-
-  belongs_to :container, :property=>:cul_member_of, :class_name=>'ActiveFedora::Base'
-
-#  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
-
-  def index_type_label
-    "FILE RESOURCE"
-  end
-
-  def to_solr(solr_doc = Hash.new, opts={})
-    super
-    unless solr_doc["extent_ssi"] || self.datastreams["CONTENT"].nil?
-      solr_doc["extent_ssi"] = [self.datastreams["CONTENT"].size]
-    end
-    solr_doc
-  end
-
-  def set_title_and_label(new_title, opts={})
-    if opts[:only_if_blank]
-      if self.label.nil? || self.label.empty?
-        self.label = new_title
-        self.set_title( new_title )
-      end
-    else
-      self.label = new_title
-      set_title( new_title )
-    end
-  end
-
-  # Set the title and label on the current object
-  #
-  # @param [String] new_title
-  # @param [Hash] opts (optional) hash of configuration options
-  def set_title(new_title, opts={})
-    if has_desc? 
-      desc_metadata_ds = self.datastreams["descMetadata"]
-      if desc_metadata_ds.respond_to?(:title_values)
-        desc_metadata_ds.title_values = new_title
-      else
-        desc_metadata_ds.title = new_title
-      end
-    end
-  end
-  
-  def thumbnail_info
-    # do the triples indicate this is a thumb? fetch
-    if long <= 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_hydra/crystal/file.png"),:mime=>'image/png'}
-      else
-        url = ActiveFedora::Base.find(parents.first, :cast => true).thumbnail_info
-      end
-    end
-    return url
-  end
-end