cul_hydra 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8467bb84e67bddce15ffaf614759619ea3118f9394b313f01f1a81972067a25f
-  data.tar.gz: 3778549e6620a5b85267e4be6e7ae3a1657789eff74c8ec17350d0e8c94ad902
+  metadata.gz: 508c0e32e914c363417b52a01d19ee0612b4dafebeccf8034d257b48aa9bc202
+  data.tar.gz: 8e3f07a2e0a5bb2e2ff926fb9cf51060e69c2a301a746709cb07195f4d0e01e5
 SHA512:
-  metadata.gz: 72aed1e10c7f2f064a9e694a32294677db91d179e434b71d7c316331ac3c99b87bf2f8ade614493e50a4c9e730a8c96454432935a7bb49eaf2c4128daee0cc6d
-  data.tar.gz: 88409f4788ceb83586556a1687c80385515aa06c924cbdfd63b3609364421ca6cae29a2ebf0d71a3198cfcfe8ca124da13f06f1f04ce6c6d50b4303d6ba0ec7b
+  metadata.gz: 43002c0a624e05152e017b2cffecac2f95533075648e18de883b8fdec64bd652a77887a8386df0e242a5d7c74f7a851632010ad4b73adf6c500ce64b1ce7a5e9
+  data.tar.gz: e090e289157046e51ba2e129776d760043d0c4770e0ea82a8d66999a5a01ddf007da1afb501533293a5e28b34c737d6957fdbd0b7d3ff5c9b441b276e47fbacf

data/app/controllers/concerns/cul/hydra/application_id_behavior.rb

@@ -1,11 +1,8 @@
 module Cul::Hydra::ApplicationIdBehavior
   extend ActiveSupport::Concern
-  included do
-    include Blacklight::SolrHelper
-  end
 
   def find_for_params(path,solr_params)
-    res = blacklight_solr.send_and_receive(path, {key=>solr_params.to_hash, method:blacklight_config.http_method})
+    res = blacklight_config.repository.send_and_receive(path, {key=>solr_params.to_hash, method:blacklight_config.http_method})
     Blacklight::SolrResponse.new(res, solr_params, solr_document_model: blacklight_config.solr_document_model)
   end
 
@@ -19,7 +16,8 @@ module Cul::Hydra::ApplicationIdBehavior
     p[:fq] = "identifier_ssim:#{(id)}"
     p[:fl] ||= '*'
     #p[:qt] ||= blacklight_config.document_solr_request_handler
-    solr_response = find(blacklight_config.document_solr_path, p)
+    repository = blacklight_config.repository_class.new(blacklight_config)
+    solr_response = repository.search(p)
     raise Blacklight::Exceptions::InvalidSolrID.new(id) if solr_response.docs.empty?
     document = SolrDocument.new(solr_response.docs.first, solr_response)
     @response, @document = [solr_response, document]
@@ -35,7 +33,8 @@ module Cul::Hydra::ApplicationIdBehavior
     p[:fq] = "dc_identifier_ssim:#{(id)}"
     p[:fl] ||= '*'
     #p[:qt] ||= blacklight_config.document_solr_request_handler
-    solr_response = find(blacklight_config.document_solr_path, p)
+    repository = blacklight_config.repository_class.new(blacklight_config)
+    solr_response = repository.search(p)
     raise Blacklight::Exceptions::InvalidSolrID.new(id) if solr_response.docs.empty?
     document = SolrDocument.new(solr_response.docs.first, solr_response)
     @response, @document = [solr_response, document]

data/app/models/administrative_set.rb

@@ -3,7 +3,6 @@ require "active_fedora_finders"
 class AdministrativeSet < ::ActiveFedora::Base
   include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
-  include Hydra::ModelMethods
   include Cul::Hydra::Models::Common
   include Pcdm::Models
 

data/app/models/concept.rb

@@ -3,7 +3,6 @@ require "active_fedora_finders"
 class Concept < GenericAggregator
   include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
-  include ::Hydra::ModelMethods
   include Cul::Hydra::Models::Common
   include Cul::Hydra::Models::Aggregator
 

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

@@ -18,6 +18,7 @@ module Hydra
     autoload :Common, 'cul/hydra/models/common'
     autoload :ImageResource, 'cul/hydra/models/image_resource'
     autoload :LinkableResources, 'cul/hydra/models/linkable_resources'
+    autoload :RelsInt, 'cul/hydra/models/rels_int'
     autoload :Resource, 'cul/hydra/models/resource'
   end
 end

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

@@ -8,7 +8,6 @@ module Cul::Hydra::Models::Common
     define_model_callbacks :create
     has_metadata :name => "DC", :type=>Cul::Hydra::Datastreams::DCMetadata, :versionable => true
     has_metadata :name => "descMetadata", :type=>Cul::Hydra::Datastreams::ModsDocument, :versionable => true
-    has_metadata :name => "rightsMetadata", :type=>::Hydra::Datastream::RightsMetadata, :versionable => true
     has_many :publishers, :property => :publisher, :class_name=>'ActiveFedora::Base'
     after_create :rdf_types!
   end
@@ -247,7 +246,7 @@ module Cul::Hydra::Models::Common
     else
       # If there isn't a structMap, just get the first child
       member_pids = Cul::Hydra::RisearchMembers.get_direct_member_pids(self.pid, true)
-      logger.warn "Warning: #{self.pid} is a member of itself!" if member_pids.include?(self.pid)
+      Rails.logger.warn "Warning: #{self.pid} is a member of itself!" if member_pids.include?(self.pid)
       if member_pids.first
         child_obj = ActiveFedora::Base.find(member_pids.first)
         return child_obj.get_representative_generic_resource
@@ -257,12 +256,12 @@ module Cul::Hydra::Models::Common
       end
     end
   rescue ActiveFedora::ObjectNotFoundError
-    logger.warn "#{get_singular_rel(:schema_image)} not found in repository for #{self.pid}"
+    Rails.logger.warn "#{get_singular_rel(:schema_image)} not found in repository for #{self.pid}"
     return nil
   end
 
   def update_datastream_attributes(params={}, opts={})
-    logger.debug "Common.update_datastream_attributes"
+    Rails.logger.debug "Common.update_datastream_attributes"
     result = params.dup
     params.each_pair do |dsid, ds_params|
       if datastreams.include?(dsid)
@@ -272,12 +271,12 @@ module Cul::Hydra::Models::Common
           changed ||= value_changed?(datastreams[dsid],pointer,values)
         }
         if changed
-          logger.debug "Common.update_datastream_attributes calling update_indexed_attributes"
+          Rails.logger.debug "Common.update_datastream_attributes calling update_indexed_attributes"
           result[dsid] = datastreams[dsid].update_indexed_attributes(ds_params)
         else
           result[dsid] = no_update(ds_params)
         end
-        logger.debug "change detected? #{changed} digital_object? #{datastreams[dsid].changed?}"
+        Rails.logger.debug "change detected? #{changed} digital_object? #{datastreams[dsid].changed?}"
       else
         result.delete(dsid)
       end
@@ -308,7 +307,7 @@ module Cul::Hydra::Models::Common
     else
       values = {"0"=>values}
     end
-    logger.debug "submitted values for #{pointer.inspect} : #{values.inspect}"
+    Rails.logger.debug "submitted values for #{pointer.inspect} : #{values.inspect}"
     return true if values["-1"]
     changed = false
     old_values = ds.get_values(pointer)
@@ -316,10 +315,10 @@ module Cul::Hydra::Models::Common
     old_values.each_index {|ix| indexed_values[ix.to_s] = old_values[ix] }
     indexed_values.each {|k,v|
       new_val = values.delete(k)
-      logger.debug "old: #{v} new: #{new_val} changed? #{!(v.eql? new_val)}"
+      Rails.logger.debug "old: #{v} new: #{new_val} changed? #{!(v.eql? new_val)}"
       changed ||= !(v.eql? new_val)
     }
-    logger.debug "remaining values! #{values.inspect}" if values.length > 0
+    Rails.logger.debug "remaining values! #{values.inspect}" if values.length > 0
     changed || (values.length > 0)
   end
 

data/app/models/concerns/cul/hydra/models/rels_int.rb

@@ -0,0 +1,18 @@
+# -*- encoding : utf-8 -*-
+require 'active_support'
+module Cul::Hydra::Models
+  module RelsInt
+    extend ActiveSupport::Concern
+    included do
+      self.has_metadata :name=>"RELS-INT", :type=>Cul::Hydra::Datastreams::RelsInt
+    end
+
+    def rels_int
+      if !datastreams.has_key?("RELS-INT")
+        ds = Cul::Hydra::Datastreams::RelsInt.new(@inner_object, "RELS-INT")
+        add_datastream(ds)
+      end
+      return datastreams["RELS-INT"]
+    end
+  end
+end

data/app/models/concerns/ore/proxy.rb

@@ -5,7 +5,7 @@ module ORE
 class Proxy < ActiveTriples::Resource
   include Digest
   include Solrizer::Common
-  include ActiveFedora::Rdf::Indexing
+  include ActiveFedora::RDF::Indexing
 
   module Id
     class Descriptor < Solrizer::Descriptor
@@ -22,7 +22,7 @@ class Proxy < ActiveTriples::Resource
   def self.type
     RDF::ORE.Proxy
   end
-  property :id, predicate: RDF.nodeID, multivalue: false do |ix|
+  property :id_node, predicate: RDF.nodeID, multivalue: false do |ix|
     ix.as Id::Descriptor.new
   end
   property :isAggregatedBy, predicate: RDF::ORE.isAggregatedBy, multivalue: false do |ix|
@@ -119,6 +119,5 @@ class Proxy < ActiveTriples::Resource
       config
     end
   end
-
 end
 end

data/app/models/cul/hydra/datastreams/rels_int.rb

@@ -0,0 +1,179 @@
+# -*- encoding : utf-8 -*-
+require 'active-fedora'
+require 'rdf/rdfxml'
+module Cul
+module Hydra
+  module Datastreams
+    class RelsInt < ActiveFedora::Datastream
+      XSD_INT_BITLENGTH = 31
+      class_attribute :profile_solr_name
+      attr_accessor :relationships_loaded
+
+      self.profile_solr_name = ActiveFedora::SolrService.solr_name("rels_int_profile", :stored_searchable)
+
+      def serialize!
+        self.content = to_rels_int() if changed_attributes.include? 'relationships'
+        clear_attribute_changes 'relationships'
+      end
+
+      def relationships_will_change!
+        changed_attributes['relationships'] = nil
+      end
+
+      def content
+        if self.new? and @content.nil?
+          content= RelsInt.xml_template
+        else
+          super
+        end
+      end
+
+      def content= new_content
+        super
+        relationships_loaded=false
+        load_relationships
+      end
+
+      def to_resource(object, literal=false)
+        if object.is_a? ActiveFedora::Datastream
+          ::RDF::URI.new("info:fedora/#{object.pid}/#{object.dsid}")
+        elsif object.respond_to? :internal_uri
+          ::RDF::URI.new(object.internal_uri)
+        elsif object.is_a? ::RDF::Resource
+          object
+        elsif literal
+          result = ::RDF::Literal.new(object)
+          case # invalid datatypes for FCRepo 3
+          when result.datatype.eql?(::RDF::XSD.integer)
+            result.datatype = (signed_bit_length(result.object) > XSD_INT_BITLENGTH ? ::RDF::XSD.long : ::RDF::XSD.int)
+          when result.datatype.eql?(::RDF::XSD.decimal)
+            result.datatype = ::RDF::XSD.double
+          when result.datatype.eql?(::RDF::XSD.boolean)
+            result.datatype = nil
+          when result.datatype.eql?(::RDF::XSD.date)
+            result = ::RDF::Literal.new(object.to_datetime)
+          when result.datatype.eql?(::RDF::XSD.time)
+            result = ::RDF::Literal.new(object.to_datetime)
+          end
+          result
+        else
+          ::RDF::URI.new(object.to_s)
+        end
+      end
+
+      def to_predicate(arg)
+        return :p if arg.nil?
+        if arg.is_a? Symbol
+          arg = ActiveFedora::Predicates.find_graph_predicate(arg)
+        elsif arg.is_a? ::RDF::Resource
+          arg
+        else
+          ::RDF::URI.new(arg.to_s)
+        end
+      end
+
+      def build_statement(datastream, predicate, object, literal=false)
+        subject = to_resource(datastream)
+        predicate = to_predicate(predicate)
+        object = to_resource(object,literal)
+        ::RDF::Statement.new(subject,predicate,object)
+      end
+
+      def add_relationship(datastream, predicate, target, literal=false)
+        stmt = build_statement(datastream, predicate, target, literal)
+        graph.insert(stmt) unless graph.has_statement? stmt
+        relationships_will_change!
+      end
+
+      def remove_relationship(datastream, predicate, target, literal=false)
+        stmt = build_statement(datastream, predicate, target, literal)
+        graph.delete(stmt)
+        relationships_will_change!
+      end
+
+      def clear_relationship(datastream, predicate)
+        graph.delete [to_resource(datastream), to_predicate(predicate), nil]
+        relationships_will_change!
+      end
+
+      def relationships(*args)
+        q_args = args.empty? ? [:s, :p, :o] : [to_resource(args.first), to_predicate(args[1]), (args[2] || :o)]
+        query = ::RDF::Query.new do |query|
+          query << q_args
+        end
+        query.execute(graph).map(&:to_hash).map do |hash|
+          stmt = q_args.map {|k| hash[k] || k}
+          ::RDF::Statement.new(*stmt)
+        end
+      end
+
+      def load_relationships
+        # load from content
+        g = ::RDF::Graph.new
+        ::RDF::RDFXML::Reader.new(content).each do |stmt|
+          g << stmt
+        end
+        self.relationships_loaded = true
+        clear_attribute_changes 'relationships'
+        @graph = g
+      end
+
+      def graph
+        @graph ||= load_relationships
+      end
+
+      def to_rels_int
+        xml = Cul::Hydra::RelsInt::RDFXMLWriter.buffer(:max_depth=>1) do |writer|
+          graph.each_statement do |statement|
+            writer << statement
+          end
+        end
+        xml
+      end
+
+      def self.xml_template
+        "<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"></rdf:RDF>"
+      end
+
+      def to_solr(solr_doc=Hash.new)
+        result = super(solr_doc)
+        result = solrize_relationships(result)
+        result
+      end
+
+      def from_solr(solr_doc)
+        predicate_symbol = self.profile_solr_name
+        value = (solr_doc[predicate_symbol].nil? ? solr_doc[predicate_symbol.to_s]: solr_doc[predicate_symbol])
+        @solr_hash = value.blank? ? nil : JSON.parse(value[0])
+      end
+
+      def solrize_relationships(solr_doc=Hash.new)
+        rel_hash = {} # the rels_int_profile is a hash of hashes in json
+        graph.each_statement do |statement|
+          predicate = ActiveFedora::Predicates.short_predicate(statement.predicate)
+          literal = statement.object.kind_of?(::RDF::Literal)
+          val = literal ? statement.object.value : statement.object.to_str
+          rel_hash[statement.subject] ||= {}
+          rel_hash[statement.subject][predicate] ||= []
+          rel_hash[statement.subject][predicate] << val
+        end
+        solr_doc[self.class.profile_solr_name] = rel_hash.to_json unless rel_hash.blank?
+        solr_doc
+      end
+      class UriObject
+        def initialize(resource)
+          @resource = resource
+        end
+      end
+      private
+      def signed_bit_length(num)
+        if num.respond_to? :bit_length
+          num.bit_length
+        else # in MRI 1.9.x, we need to implement the two complement bitlength
+          Math.log2(num < 0 ? num.abs : num+1).ceil
+        end
+      end
+    end
+  end
+end
+end

data/app/models/dc_document.rb

@@ -4,7 +4,6 @@ class DcDocument < ActiveFedora::Base
   include ::ActiveFedora::Associations
   include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
-  include Hydra::ModelMethods
   include Cul::Hydra::Models::Common
   #alias :file_objects :resources
 

data/app/models/generic_aggregator.rb

@@ -3,7 +3,6 @@ require "active_fedora_finders"
 class GenericAggregator < ::ActiveFedora::Base
   include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
-  include Hydra::ModelMethods
   include Cul::Hydra::Models::Common
   include Cul::Hydra::Models::Aggregator
 

data/app/models/generic_object.rb

@@ -4,7 +4,6 @@ class GenericObject < ::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
 

data/app/models/generic_resource.rb

@@ -8,11 +8,10 @@ class GenericResource < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
-  include ::Hydra::ModelMethods
   include Cul::Hydra::Models::Common
   include Cul::Hydra::Models::ImageResource
+  include Cul::Hydra::Models::RelsInt
   include Cul::Hydra::Fedora::UrlHelperBehavior
-  include ::ActiveFedora::RelsInt
 
   has_and_belongs_to_many :containers, :property=>:cul_member_of, :class_name=>'ActiveFedora::Base'
 
@@ -22,7 +21,6 @@ class GenericResource < ::ActiveFedora::Base
 
   has_datastream :name => "content", :type=>::ActiveFedora::Datastream, :versionable => true
   has_metadata :name => "accessControlMetadata", :type=>Cul::Hydra::Datastreams::AccessControlMetadata, :versionable => false
-  has_metadata :name=>"RELS-INT", :type=>ActiveFedora::RelsInt::Datastream
 
   rdf_types(RDF::CUL.Resource)
   rdf_types(RDF::PCDM.Object)

data/fixtures/spec/CUL_RELS_INT/rels_int_blank.xml

@@ -0,0 +1,2 @@
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+</rdf:RDF>

data/fixtures/spec/CUL_RELS_INT/rels_int_profile.xml

@@ -0,0 +1,19 @@
+<datastreamProfile xmlns="http://www.fedora.info/definitions/1/0/management/"
+xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://www.fedora.info/definitions/1/0/management/ http://www.fedora.info/definitions/1/0/datastreamProfile.xsd"
+pid="test:relsint" dsID="RELS-INT">
+<dsLabel>Mock Profile Response</dsLabel>
+<dsVersionID>RELS-INT.0</dsVersionID>
+<dsCreateDate>2012-07-23T21:56:16.636Z</dsCreateDate>
+<dsState>A</dsState>
+<dsMIME>application/rdf+xml</dsMIME>
+<dsFormatURI />
+<dsControlGroup>X</dsControlGroup>
+<dsSize>802</dsSize>
+<dsVersionable>true</dsVersionable>
+<dsInfoType/>
+<dsLocation>mocked+object</dsLocation>
+<dsLocationType/>
+<dsChecksumType>DISABLED</dsChecksumType>
+<dsChecksum>none</dsChecksum>
+</datastreamProfile>

data/fixtures/spec/CUL_RELS_INT/rels_int_test.xml

@@ -0,0 +1,12 @@
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+	<rdf:Description rdf:about="info:fedora/test:relsint/DC">
+		<isMetadataFor rdf:resource="info:fedora/test:relsint/RELS-INT" xmlns="info:fedora/fedora-system:def/relations-external#"/>
+		<isMetadataFor rdf:resource="info:fedora/test:relsint/RELS-EXT" xmlns="info:fedora/fedora-system:def/relations-external#"/>
+	</rdf:Description>
+	<rdf:Description rdf:about="info:fedora/test:relsint/RELS-EXT">
+		<asserts xmlns="http://projecthydra.org/ns/relations#">FOO</asserts>
+	</rdf:Description>
+	<rdf:Description rdf:about="info:fedora/test:relsint/RELS-INT">
+		<asserts xmlns="http://projecthydra.org/ns/relations#">BAR</asserts>
+	</rdf:Description>
+</rdf:RDF>