cul_scv_hydra 0.4.1 → 0.4.2

data/app/models/bag_aggregator.rb

@@ -1,5 +1,4 @@
 require "active-fedora"
-require "hydra"
 class BagAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::DatastreamCollections

data/app/models/content_aggregator.rb

@@ -1,5 +1,4 @@
 require "active-fedora"
-require "hydra"
 class ContentAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::DatastreamCollections

data/app/models/dcdocument.rb

@@ -1,9 +1,37 @@
 require "active-fedora"
-require "hydra"
 class DcDocument < ActiveFedora::Base
   include ::ActiveFedora::DatastreamCollections
   include ::ActiveFedora::Relationships
   include Hydra::ModelMethods
   include Cul::Scv::Hydra::ActiveFedora::Model::Common
   alias :file_objects :resources
+  
+  has_relationship "parts", :cul_member_of, :inbound => true
+
+  def self.load_instance_from_solr(pid,solr_doc=nil)
+    if solr_doc.nil?
+      result = find_by_solr(pid)
+      raise "Object #{pid} not found in solr" if result.nil?
+      solr_doc = result.hits.first
+      #double check pid and id in record match
+      raise "Object #{pid} not found in Solr" unless !result.nil? && !solr_doc.nil? && pid == solr_doc[SOLR_DOCUMENT_ID]
+    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})
+    obj.new_object = false
+      #set by default to load any dependent relationship objects from solr as well
+    obj.load_from_solr = true
+      #need to call rels_ext once so it exists when iterating over datastreams
+    obj.rels_ext
+    obj.datastreams.each_value do |ds|
+      if ds.respond_to?(:from_solr)
+        ds.from_solr(solr_doc) if ds.kind_of?(::ActiveFedora::MetadataDatastream) || ds.kind_of?(::ActiveFedora::NokogiriDatastream) || ( ds.kind_of?(::ActiveFedora::RelsExtDatastream))
+      end
+    end
+    obj
+  end
 end

data/app/models/generic_aggregator.rb

@@ -1,5 +1,4 @@
 require "active-fedora"
-require "hydra"
 class GenericAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::DatastreamCollections

data/app/models/generic_object.rb

@@ -1,5 +1,4 @@
 require "active-fedora"
-require "hydra"
 class GenericObject < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::DatastreamCollections

data/app/models/jp2_image_aggregator.rb

@@ -1,5 +1,4 @@
 require "active-fedora"
-require "hydra"
 class JP2ImageAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::DatastreamCollections

data/app/models/mets_structured_aggregator.rb

@@ -1,5 +1,4 @@
 require "active-fedora"
-require "hydra"
 class METSStructuredAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::DatastreamCollections

data/app/models/resource.rb

@@ -1,6 +1,5 @@
 require "active-fedora"
 require "cul_image_props"
-require "hydra"
 require "mime/types"
 require "uri"
 class Resource < ::ActiveFedora::Base

data/app/models/static_audio_aggregator.rb

@@ -1,5 +1,4 @@
 require "active-fedora"
-require "hydra"
 class StaticAudioAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
 

data/app/models/static_image_aggregator.rb

@@ -1,5 +1,4 @@
 require "active-fedora"
-require "hydra"
 class StaticImageAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
 

data/lib/cul_scv_hydra/active_fedora/model.rb

@@ -4,5 +4,4 @@ end
 end
 require 'cul_scv_hydra/active_fedora/model/aggregator'
 require 'cul_scv_hydra/active_fedora/model/common'
-require 'cul_scv_hydra/active_fedora/model/dcdocument'
 require 'cul_scv_hydra/active_fedora/model/resource'

data/lib/cul_scv_hydra/controllers/aggregates.rb

@@ -1,20 +1,20 @@
 require 'cul_scv_hydra/controllers/aggregator_controller_helper'
 require 'cul_scv_hydra/controllers/helpers/resources_helper_behavior'
 module Cul::Scv::Hydra::Controllers
-module Aggregates
-  extend ActiveSupport::Concern
-  included do
-    include Hydra::AssetsControllerHelper
-    include Cul::Scv::Hydra::Controllers::AggregatorControllerHelper
-    include Cul::Scv::Hydra::Controllers::Helpers::ResourcesHelperBehavior  
-    include Hydra::RepositoryController  
-    include MediaShelf::ActiveFedoraHelper
-    include Blacklight::SolrHelper
-    before_filter :require_solr, :only=>[:index, :create, :show, :destroy]
-    before_filter :load_resources, :only=>[:index]
-    prepend_before_filter :sanitize_update_params
-  end
-  module InstanceMethods
+  module Aggregates
+    extend ActiveSupport::Concern
+    included do
+      include Hydra::AssetsControllerHelper
+      include Cul::Scv::Hydra::Controllers::AggregatorControllerHelper
+      include Cul::Scv::Hydra::Controllers::Helpers::ResourcesHelperBehavior  
+      include Hydra::RepositoryController  
+      include MediaShelf::ActiveFedoraHelper
+      include Blacklight::SolrHelper
+      before_filter :require_solr, :only=>[:index, :create, :show, :destroy]
+      before_filter :load_resources, :only=>[:index]
+      prepend_before_filter :sanitize_update_params
+    end
+
     def index
 
       if params[:layout] == "false"
@@ -92,4 +92,3 @@ module Aggregates
     end
   end
 end
-end

data/lib/cul_scv_hydra/controllers/content_aggregators.rb

@@ -1,4 +1,3 @@
-require 'hydra'
 require 'cul_scv_hydra/controllers/helpers/resources_helper_behavior'
 module Cul::Scv::Hydra::Controllers
  module ContentAggregators

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

@@ -2,7 +2,7 @@ module Cul::Scv::Hydra::Controllers::Helpers
   module ActiveFedoraHelperBehavior
     def load_dc_document_from_solr(doc)
       pid = doc[:id] ? doc[:id] : doc[:id.to_s]
-      result = pid ? Cul::Scv::Hydra::ActiveFedora::Model::DcDocument.load_instance_from_solr(pid,doc) : nil
+      result = pid ? DcDocument.load_instance_from_solr(pid,doc) : nil
       result
     end
   end

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

@@ -1,10 +1,9 @@
-require 'cul_scv_hydra/active_fedora/model/dcdocument'
 # Methods added to this helper will be available to all templates in the application.
 module Cul::Scv::Hydra::Controllers::Helpers
   module ApplicationHelperBehavior
     def load_dc_document_from_solr(doc)
       pid = doc[:id] ? doc[:id] : doc[:id.to_s]
-      result = pid ? Cul::Scv::Hydra::ActiveFedora::Model::DcDocument.load_instance_from_solr(pid,doc) : nil
+      result = pid ? DcDocument.load_instance_from_solr(pid,doc) : nil
       result
     end
     def get_aggregate_count(doc)

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

@@ -1,4 +1,3 @@
-require 'hydra'
 require 'net/http'
 require 'open-uri'
 require 'tempfile'

data/lib/cul_scv_hydra/version.rb

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

data/lib/cul_scv_hydra.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Benjamin Armintor
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-09 00:00:00 Z
+date: 2012-06-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cul_image_props
@@ -93,9 +93,25 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: hydra-head
+  name: hydra-mods
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: hydra-head
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -106,11 +122,11 @@ dependencies:
         - 0
         version: "4.0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -122,11 +138,11 @@ dependencies:
         - 2
         version: 1.4.2
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: om
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -138,11 +154,11 @@ dependencies:
         - 0
         version: 1.6.0
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: solrizer
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -154,11 +170,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -170,11 +186,11 @@ dependencies:
         - 0
         version: 2.10.0
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -186,11 +202,11 @@ dependencies:
         - 0
         version: 2.10.0
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -202,11 +218,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: equivalent-xml
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -218,11 +234,11 @@ dependencies:
         - 4
         version: 0.2.4
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: rbx-require-relative
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -234,7 +250,7 @@ dependencies:
         - 5
         version: 0.0.5
   type: :development
-  version_requirements: *id014
+  version_requirements: *id015
 description: ActiveFedora, OM, and Solrizer implementations for CUL Staff Collection Viewer
 email: armintor@gmail.com
 executables: []
@@ -247,7 +263,6 @@ files:
 - lib/cul_scv_hydra/access_controls_enforcement.rb
 - lib/cul_scv_hydra/active_fedora/model/aggregator.rb
 - lib/cul_scv_hydra/active_fedora/model/common.rb
-- lib/cul_scv_hydra/active_fedora/model/dcdocument.rb
 - lib/cul_scv_hydra/active_fedora/model/resource.rb
 - lib/cul_scv_hydra/active_fedora/model.rb
 - lib/cul_scv_hydra/active_fedora.rb

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

@@ -1,43 +0,0 @@
-require "active-fedora"
-require "cul_scv_hydra/active_fedora"
-require "hydra"
-module Cul::Scv::Hydra::ActiveFedora::Model
-class DcDocument < ::ActiveFedora::Base
-  include ::ActiveFedora::Relationships
-  include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::ActiveFedora::Model::Common
-  alias :file_objects :resources
-
-  # relationships #
-  has_relationship "containers", :cul_member_of
-  has_relationship "parts", :cul_member_of, :inbound => true
-
-  def self.load_instance_from_solr(pid,solr_doc=nil)
-    if solr_doc.nil?
-      result = find_by_solr(pid)
-      raise "Object #{pid} not found in solr" if result.nil?
-      solr_doc = result.hits.first
-      #double check pid and id in record match
-      raise "Object #{pid} not found in Solr" unless !result.nil? && !solr_doc.nil? && pid == solr_doc[SOLR_DOCUMENT_ID]
-    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})
-    obj.new_object = false
-      #set by default to load any dependent relationship objects from solr as well
-    obj.load_from_solr = true
-      #need to call rels_ext once so it exists when iterating over datastreams
-    obj.rels_ext
-    obj.datastreams.each_value do |ds|
-      if ds.respond_to?(:from_solr)
-        ds.from_solr(solr_doc) if ds.kind_of?(::ActiveFedora::MetadataDatastream) || ds.kind_of?(::ActiveFedora::NokogiriDatastream) || ( ds.kind_of?(::ActiveFedora::RelsExtDatastream))
-      end
-    end
-    obj
-  end
-  
-end
-end