hydra-core 6.4.0.rc1 → 6.4.0.rc2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/hydra-head/version.rb +1 -1
  3. data/lib/hydra/model_mixins/common_metadata.rb +5 -6
  4. data/lib/hydra/model_mixins/solr_document_extension.rb +7 -0
  5. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 971808baf10468692c5a85289d8f4e368ba71378
4
- data.tar.gz: 66b33608c488f50c8e4446d4232e41845e0dd798
3
+ metadata.gz: 73518753cc25d894192e9dbe23f98b551b6a2c10
4
+ data.tar.gz: c22d931800dfcdb715a71b1d0d98cb46048e9151
5
5
  SHA512:
6
- metadata.gz: 98e616d74d8b9d676d32fecad01c447d5be2361f3f5a4a79503b0c236deaf5b5ce0e584d46b8c79f2079de6bf8d7ad8c2fc8a9f694c6eb27bcfa9f9f4d2af958
7
- data.tar.gz: 34f27eb90ffc38bd4fdbb1ab5222b5299b28cd2393fe382b969ec45f943b22130f5619f946a8ab324675324fae45ebf28d25f684328b0adebd07185e14d6d038
6
+ metadata.gz: 37ec5db783c7e106a6f817002ae0149e15aad17a541719e89906a2a69c6f7cdae179a259e9045b83c6b49dc1e9ffbb7072e40c7b7cf4e1dc7c1a9cec0cda870f
7
+ data.tar.gz: 8d47af5e6dced0a0887652ccb926cfb955862bb3ddbadd696a3a9fe479497a3f7742ae475648ea4c667f2fdfa11a1b46847c3dbc4e366dde940f18d7469c6555
data/lib/hydra-head/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module HydraHead
2
- VERSION = "6.4.0.rc1"
2
+ VERSION = "6.4.0.rc2"
3
3
  end
4
4
 
data/lib/hydra/model_mixins/common_metadata.rb CHANGED
@@ -10,16 +10,15 @@
10
10
  # RELS-EXT datastream -- Handled by ActiveFedora::Base & ActiveFedora::RelsExtDatastream
11
11
  # optional datastreams (contentMetadata, technicalMetadata, provenanceMetadata, sourceMetadata)
12
12
  #
13
- # will move to lib/hydra/model/common_metadata_behavior in release 5.x
14
13
  module Hydra::ModelMixins
15
14
  module CommonMetadata
15
+ extend Deprecation
16
+ extend ActiveSupport::Concern
16
17
 
17
- def self.included(klazz)
18
+ included do
18
19
  # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
19
- klazz.has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata
20
-
21
- # Ensure that objects assert the commonMetadata cModel
22
- # klazz.relationships << :has_model => "info:fedora/hydra-cModel:commonMetadata"
20
+ has_metadata "rightsMetadata", type: Hydra::Datastream::RightsMetadata
21
+ Deprecation.warn(CommonMetadata, "Hydra::ModelMixins::CommonMetadata is deprecated and will be removed in hydra-head 7. Use Hydra::AccessControls::Permissions instead.", caller(1))
23
22
  end
24
23
  end
25
24
  end
data/lib/hydra/model_mixins/solr_document_extension.rb CHANGED
@@ -1,5 +1,8 @@
1
1
  module Hydra::ModelMixins
2
2
  module SolrDocumentExtension
3
+ extend Deprecation
4
+ self.deprecation_horizon = 'hydra-head 7.0.0'
5
+
3
6
  def document_type display_type = CatalogController.blacklight_config.show.display_type
4
7
  type = self.fetch(:medium_t, nil)
5
8
 
@@ -7,6 +10,7 @@ module Hydra::ModelMixins
7
10
 
8
11
  type.first.to_s.gsub("info:fedora/afmodel:","").gsub("Hydrangea","").gsub(/^Generic/,"")
9
12
  end
13
+ deprecation_deprecate :document_type
10
14
 
11
15
  def get_person_from_role(role, opts={})
12
16
  i = 0
@@ -18,9 +22,12 @@ module Hydra::ModelMixins
18
22
  i += 1
19
23
  end
20
24
  end
25
+ deprecation_deprecate :get_person_from_role
26
+
21
27
  def get_file_asset_count()
22
28
  ActiveFedora::Base.count(:conditions=>"is_part_of_t:#{ActiveFedora::Base.quote_for_solr(id)}")
23
29
  end
30
+ deprecation_deprecate :get_file_asset_count
24
31
  end
25
32
  end
26
33
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hydra-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.4.0.rc1
4
+ version: 6.4.0.rc2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-09-30 00:00:00.000000000 Z
12
+ date: 2013-10-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -93,14 +93,14 @@ dependencies:
93
93
  requirements:
94
94
  - - '='
95
95
  - !ruby/object:Gem::Version
96
- version: 6.4.0.rc1
96
+ version: 6.4.0.rc2
97
97
  type: :runtime
98
98
  prerelease: false
99
99
  version_requirements: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - '='
102
102
  - !ruby/object:Gem::Version
103
- version: 6.4.0.rc1
103
+ version: 6.4.0.rc2
104
104
  - !ruby/object:Gem::Dependency
105
105
  name: jettywrapper
106
106
  requirement: !ruby/object:Gem::Requirement