hydra-core 6.4.0.rc1 → 6.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 971808baf10468692c5a85289d8f4e368ba71378
-  data.tar.gz: 66b33608c488f50c8e4446d4232e41845e0dd798
+  metadata.gz: 73518753cc25d894192e9dbe23f98b551b6a2c10
+  data.tar.gz: c22d931800dfcdb715a71b1d0d98cb46048e9151
 SHA512:
-  metadata.gz: 98e616d74d8b9d676d32fecad01c447d5be2361f3f5a4a79503b0c236deaf5b5ce0e584d46b8c79f2079de6bf8d7ad8c2fc8a9f694c6eb27bcfa9f9f4d2af958
-  data.tar.gz: 34f27eb90ffc38bd4fdbb1ab5222b5299b28cd2393fe382b969ec45f943b22130f5619f946a8ab324675324fae45ebf28d25f684328b0adebd07185e14d6d038
+  metadata.gz: 37ec5db783c7e106a6f817002ae0149e15aad17a541719e89906a2a69c6f7cdae179a259e9045b83c6b49dc1e9ffbb7072e40c7b7cf4e1dc7c1a9cec0cda870f
+  data.tar.gz: 8d47af5e6dced0a0887652ccb926cfb955862bb3ddbadd696a3a9fe479497a3f7742ae475648ea4c667f2fdfa11a1b46847c3dbc4e366dde940f18d7469c6555

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "6.4.0.rc1"
+  VERSION = "6.4.0.rc2"
 end
 

data/lib/hydra/model_mixins/common_metadata.rb

@@ -10,16 +10,15 @@
 #   RELS-EXT datastream -- Handled by ActiveFedora::Base & ActiveFedora::RelsExtDatastream
 #   optional datastreams (contentMetadata, technicalMetadata, provenanceMetadata, sourceMetadata)
 #
-# will move to lib/hydra/model/common_metadata_behavior in release 5.x
 module Hydra::ModelMixins
   module CommonMetadata
+    extend Deprecation
+    extend ActiveSupport::Concern
   
-    def self.included(klazz)
+    included do
       # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
-      klazz.has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata
-    
-      # Ensure that objects assert the commonMetadata cModel
-      # klazz.relationships << :has_model => "info:fedora/hydra-cModel:commonMetadata"
+      has_metadata "rightsMetadata", type: Hydra::Datastream::RightsMetadata
+      Deprecation.warn(CommonMetadata, "Hydra::ModelMixins::CommonMetadata is deprecated and will be removed in hydra-head 7.  Use Hydra::AccessControls::Permissions instead.", caller(1))
     end
   end
 end

data/lib/hydra/model_mixins/solr_document_extension.rb

@@ -1,5 +1,8 @@
 module Hydra::ModelMixins
   module SolrDocumentExtension
+    extend Deprecation
+    self.deprecation_horizon = 'hydra-head 7.0.0'
+
     def document_type display_type = CatalogController.blacklight_config.show.display_type
       type = self.fetch(:medium_t, nil)
 
@@ -7,6 +10,7 @@ module Hydra::ModelMixins
 
       type.first.to_s.gsub("info:fedora/afmodel:","").gsub("Hydrangea","").gsub(/^Generic/,"")
     end
+    deprecation_deprecate :document_type
 
     def get_person_from_role(role, opts={})
       i = 0
@@ -18,9 +22,12 @@ module Hydra::ModelMixins
         i += 1
       end
     end
+    deprecation_deprecate :get_person_from_role
+
     def get_file_asset_count()
       ActiveFedora::Base.count(:conditions=>"is_part_of_t:#{ActiveFedora::Base.quote_for_solr(id)}")
     end
+    deprecation_deprecate :get_file_asset_count
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 6.4.0.rc1
+  version: 6.4.0.rc2
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.0.rc1
+        version: 6.4.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.0.rc1
+        version: 6.4.0.rc2
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement