hydra-collections 2.0.0 → 2.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/app/models/datastreams/hydra/collection_rdf_datastream.rb +49 -66
  4. data/hydra-collections.gemspec +0 -2
  5. data/lib/hydra/collections/selects_collections.rb +1 -1
  6. data/lib/hydra/collections/version.rb +1 -1
  7. data/spec/controllers/selects_collections_spec.rb +13 -2
  8. metadata +21 -54
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bd41a2217ea7401629be851956099428aebe6fff
4
- data.tar.gz: affc685ac79e5b4ac9234f5a67b85d63e676aff6
3
+ metadata.gz: a5951bb674c502fd03fa94025bc73d1c7da256cd
4
+ data.tar.gz: fdeebe99a36c9a18aa5d0b660f57ffafad794f82
5
5
  SHA512:
6
- metadata.gz: 3ec6260a0153978aac853ba6dd77b9f5f21dfb49685493e03987e8530ef223ff9a465f1087812efbd50ede1779a1b6d469cbbdb4795817236b097d5a5b1950c6
7
- data.tar.gz: 29fe2010e53ea5e75decb713dea95530f261c07412c890af48497c56cfa20d3c5acc10f4f58e59b232b5b0e6d42c008cf3cd4c9f317b7ff5702640f5328895ba
6
+ metadata.gz: 593cde7e6d3215e866c573258c3ee0f78d14702cc4cf313b47f8815dc1076905731404a8a56371bd3dd69ea5ac9add15a4595edbbf9c79dd1bf9a25275d1d421
7
+ data.tar.gz: f0cd79e5fac8cb24ab092c37a95f4b6470d4145d4062e87609ceac23072fa52d0d334a1d309fa792a85d31ffd62f2d332c8deabde0b6cc1da1ba05b7d83bab96
data/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # Hydra::Collections [![Version](https://badge.fury.io/rb/hydra-collections.png)](http://badge.fury.io/rb/hydra-collections) [![Build Status](https://travis-ci.org/projecthydra/hydra-collections.png?branch=master)](https://travis-ci.org/projecthydra/hydra-collections) [![Dependency Status](https://gemnasium.com/projecthydra/hydra-collections.png)](https://gemnasium.com/projecthydra/hydra-collections)
1
+ # Hydra::Collections [![Version](https://badge.fury.io/rb/hydra-collections.png)](http://badge.fury.io/rb/hydra-collections) [![Build Status](https://travis-ci.org/projecthydra-labs/hydra-collections.png?branch=master)](https://travis-ci.org/projecthydra-labs/hydra-collections) [![Dependency Status](https://gemnasium.com/projecthydra/hydra-collections.png)](https://gemnasium.com/projecthydra/hydra-collections)
2
2
 
3
3
  Add collections to your Hydra application. These collections are typically created by depositors (instead of librarians or curators). Any collectible item can belong to many different collections. The collection does not confer access rights onto any of the members of the collections.
4
4
 
data/app/models/datastreams/hydra/collection_rdf_datastream.rb CHANGED
@@ -1,72 +1,55 @@
1
- # Copyright © 2012 The Pennsylvania State University
2
- #
3
- # Licensed under the Apache License, Version 2.0 (the "License");
4
- # you may not use this file except in compliance with the License.
5
- # You may obtain a copy of the License at
6
- #
7
- # http://www.apache.org/licenses/LICENSE-2.0
8
- #
9
- # Unless required by applicable law or agreed to in writing, software
10
- # distributed under the License is distributed on an "AS IS" BASIS,
11
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- # See the License for the specific language governing permissions and
13
- # limitations under the License.
14
- require 'active_fedora'
15
-
16
1
  module Hydra
17
2
  class CollectionRdfDatastream < ActiveFedora::NtriplesRDFDatastream
18
- map_predicates do |map|
19
- map.part_of(:to => "isPartOf", :in => RDF::DC)
20
- map.contributor(:in => RDF::DC) do |index|
21
- index.as :stored_searchable, :facetable
22
- end
23
- map.creator(:in => RDF::DC) do |index|
24
- index.as :stored_searchable, :facetable
25
- end
26
- map.title(:in => RDF::DC) do |index|
27
- index.as :stored_searchable
28
- end
29
- map.description(:in => RDF::DC) do |index|
30
- index.type :text
31
- index.as :stored_searchable
32
- end
33
- map.publisher(:in => RDF::DC) do |index|
34
- index.as :stored_searchable, :facetable
35
- end
36
- map.date_created(:to => "created", :in => RDF::DC) do |index|
37
- index.as :stored_searchable
38
- end
39
- map.date_uploaded(:to => "dateSubmitted", :in => RDF::DC) do |index|
40
- index.type :date
41
- index.as :stored_sortable
42
- end
43
- map.date_modified(:to => "modified", :in => RDF::DC) do |index|
44
- index.type :date
45
- index.as :stored_sortable
46
- end
47
- map.subject(:in => RDF::DC) do |index|
48
- index.as :stored_searchable, :facetable
49
- end
50
- map.language(:in => RDF::DC) do |index|
51
- index.as :stored_searchable, :facetable
52
- end
53
- map.rights(:in => RDF::DC) do |index|
54
- index.as :stored_searchable
55
- end
56
- map.resource_type(:to => "type", :in => RDF::DC) do |index|
57
- index.as :stored_searchable, :facetable
58
- end
59
- map.identifier(:in => RDF::DC) do |index|
60
- index.as :stored_searchable
61
- end
62
- map.based_near(:in => RDF::FOAF) do |index|
63
- index.as :stored_searchable, :facetable
64
- end
65
- map.tag(:to => "relation", :in => RDF::DC) do |index|
66
- index.as :stored_searchable, :facetable
67
- end
68
- map.related_url(:to => "seeAlso", :in => RDF::RDFS)
3
+ property :part_of, predicate: RDF::DC.isPartOf
4
+ property :contributor, predicate: RDF::DC.contributor do |index|
5
+ index.as :stored_searchable, :facetable
6
+ end
7
+ property :creator, predicate: RDF::DC.creator do |index|
8
+ index.as :stored_searchable, :facetable
9
+ end
10
+ property :title, predicate: RDF::DC.title do |index|
11
+ index.as :stored_searchable
12
+ end
13
+ property :description, predicate: RDF::DC.description do |index|
14
+ index.type :text
15
+ index.as :stored_searchable
16
+ end
17
+ property :publisher, predicate: RDF::DC.publisher do |index|
18
+ index.as :stored_searchable, :facetable
19
+ end
20
+ property :date_created, predicate: RDF::DC.created do |index|
21
+ index.as :stored_searchable
22
+ end
23
+ property :date_uploaded, predicate: RDF::DC.dateSubmitted do |index|
24
+ index.type :date
25
+ index.as :stored_sortable
26
+ end
27
+ property :date_modified, predicate: RDF::DC.modified do |index|
28
+ index.type :date
29
+ index.as :stored_sortable
30
+ end
31
+ property :subject, predicate: RDF::DC.subject do |index|
32
+ index.as :stored_searchable, :facetable
33
+ end
34
+ property :language, predicate: RDF::DC.language do |index|
35
+ index.as :stored_searchable, :facetable
36
+ end
37
+ property :rights, predicate: RDF::DC.rights do |index|
38
+ index.as :stored_searchable
39
+ end
40
+ property :resource_type, predicate: RDF::DC.type do |index|
41
+ index.as :stored_searchable, :facetable
42
+ end
43
+ property :identifier, predicate: RDF::DC.identifier do |index|
44
+ index.as :stored_searchable
45
+ end
46
+ property :based_near, predicate: RDF::FOAF.based_near do |index|
47
+ index.as :stored_searchable, :facetable
48
+ end
49
+ property :tag, predicate: RDF::DC.relation do |index|
50
+ index.as :stored_searchable, :facetable
69
51
  end
52
+ property :related_url, predicate: RDF::RDFS.seeAlso
70
53
 
71
54
  def prefix
72
55
  ""
data/hydra-collections.gemspec CHANGED
@@ -20,10 +20,8 @@ Gem::Specification.new do |spec|
20
20
 
21
21
  spec.add_dependency "blacklight"
22
22
  spec.add_dependency "hydra-head", "~> 7.0.1"
23
- spec.add_dependency "active-fedora", ">= 6.7.0"
24
23
 
25
24
  spec.add_development_dependency "bundler", "~> 1.3"
26
25
  spec.add_development_dependency "rake"
27
26
  spec.add_development_dependency "rspec-rails"
28
- spec.add_development_dependency "sass-rails", "< 5", ">= 3.2"
29
27
  end
data/lib/hydra/collections/selects_collections.rb CHANGED
@@ -36,7 +36,7 @@ module Hydra::Collections::SelectsCollections
36
36
  self.class.solr_search_params_logic = collection_search_params_logic
37
37
  logger.debug "Collection Search logic: "+ self.class.solr_search_params_logic.inspect
38
38
  # run the solr query to find the collections
39
- (resp, doc_list) = get_search_results(:q => '', :rows=>100)
39
+ (resp, doc_list) = get_search_results({:q => ''}, {:rows=>100})
40
40
 
41
41
  #reset to original solr logic
42
42
  self.class.send(:define_method, "discovery_permissions") { original_permissions } unless access_level.blank?
data/lib/hydra/collections/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Hydra
2
2
  module Collections
3
- VERSION = "2.0.0"
3
+ VERSION = "2.0.1"
4
4
  end
5
5
  end
data/spec/controllers/selects_collections_spec.rb CHANGED
@@ -40,7 +40,15 @@ describe SelectsCollectionsController do
40
40
  @collection3.save
41
41
  @collection4 = Collection.new title:"Test No Access"
42
42
  @collection4.apply_depositor_metadata('abc123@test.com')
43
- @collection4.save
43
+ @collection4.save
44
+ @collections = []
45
+ (1..11).each do |i|
46
+ collection = Collection.new title:"Test Public #{i}"
47
+ collection.apply_depositor_metadata(@user.user_key)
48
+ collection.read_groups = ["public"]
49
+ collection.save
50
+ @collections << collection
51
+ end
44
52
  end
45
53
  after (:all) do
46
54
  Collection.delete_all
@@ -53,7 +61,10 @@ describe SelectsCollectionsController do
53
61
  end
54
62
  it "should return public collections" do
55
63
  @user_collections.index{|d| d.id == @collection.id}.should_not be_nil
56
- end
64
+ end
65
+ it "should return all public collections" do
66
+ @user_collections.count.should == 12
67
+ end
57
68
  it "should not return non public collections" do
58
69
  @user_collections.index{|d| d.id == @collection2.id}.should be_nil
59
70
  @user_collections.index{|d| d.id == @collection3.id}.should be_nil
metadata CHANGED
@@ -1,119 +1,85 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hydra-collections
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0
4
+ version: 2.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Carolyn Cole
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-04-02 00:00:00.000000000 Z
11
+ date: 2014-05-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: blacklight
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: hydra-head
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: 7.0.1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: 7.0.1
41
- - !ruby/object:Gem::Dependency
42
- name: active-fedora
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - '>='
46
- - !ruby/object:Gem::Version
47
- version: 6.7.0
48
- type: :runtime
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - '>='
53
- - !ruby/object:Gem::Version
54
- version: 6.7.0
55
41
  - !ruby/object:Gem::Dependency
56
42
  name: bundler
57
43
  requirement: !ruby/object:Gem::Requirement
58
44
  requirements:
59
- - - ~>
45
+ - - "~>"
60
46
  - !ruby/object:Gem::Version
61
47
  version: '1.3'
62
48
  type: :development
63
49
  prerelease: false
64
50
  version_requirements: !ruby/object:Gem::Requirement
65
51
  requirements:
66
- - - ~>
52
+ - - "~>"
67
53
  - !ruby/object:Gem::Version
68
54
  version: '1.3'
69
55
  - !ruby/object:Gem::Dependency
70
56
  name: rake
71
57
  requirement: !ruby/object:Gem::Requirement
72
58
  requirements:
73
- - - '>='
59
+ - - ">="
74
60
  - !ruby/object:Gem::Version
75
61
  version: '0'
76
62
  type: :development
77
63
  prerelease: false
78
64
  version_requirements: !ruby/object:Gem::Requirement
79
65
  requirements:
80
- - - '>='
66
+ - - ">="
81
67
  - !ruby/object:Gem::Version
82
68
  version: '0'
83
69
  - !ruby/object:Gem::Dependency
84
70
  name: rspec-rails
85
71
  requirement: !ruby/object:Gem::Requirement
86
72
  requirements:
87
- - - '>='
73
+ - - ">="
88
74
  - !ruby/object:Gem::Version
89
75
  version: '0'
90
76
  type: :development
91
77
  prerelease: false
92
78
  version_requirements: !ruby/object:Gem::Requirement
93
79
  requirements:
94
- - - '>='
80
+ - - ">="
95
81
  - !ruby/object:Gem::Version
96
82
  version: '0'
97
- - !ruby/object:Gem::Dependency
98
- name: sass-rails
99
- requirement: !ruby/object:Gem::Requirement
100
- requirements:
101
- - - <
102
- - !ruby/object:Gem::Version
103
- version: '5'
104
- - - '>='
105
- - !ruby/object:Gem::Version
106
- version: '3.2'
107
- type: :development
108
- prerelease: false
109
- version_requirements: !ruby/object:Gem::Requirement
110
- requirements:
111
- - - <
112
- - !ruby/object:Gem::Version
113
- version: '5'
114
- - - '>='
115
- - !ruby/object:Gem::Version
116
- version: '3.2'
117
83
  description: A rails engine for managing Hydra Collections
118
84
  email:
119
85
  - cam156@psu.edu
@@ -121,11 +87,11 @@ executables: []
121
87
  extensions: []
122
88
  extra_rdoc_files: []
123
89
  files:
124
- - .gitignore
125
- - .gitmodules
126
- - .ruby-gemset
127
- - .ruby-version
128
- - .travis.yml
90
+ - ".gitignore"
91
+ - ".gitmodules"
92
+ - ".ruby-gemset"
93
+ - ".ruby-version"
94
+ - ".travis.yml"
129
95
  - CONTRIBUTING.md
130
96
  - Changelog.md
131
97
  - Gemfile
@@ -213,17 +179,17 @@ require_paths:
213
179
  - lib
214
180
  required_ruby_version: !ruby/object:Gem::Requirement
215
181
  requirements:
216
- - - '>='
182
+ - - ">="
217
183
  - !ruby/object:Gem::Version
218
184
  version: '0'
219
185
  required_rubygems_version: !ruby/object:Gem::Requirement
220
186
  requirements:
221
- - - '>='
187
+ - - ">="
222
188
  - !ruby/object:Gem::Version
223
189
  version: '0'
224
190
  requirements: []
225
191
  rubyforge_project:
226
- rubygems_version: 2.0.3
192
+ rubygems_version: 2.2.2
227
193
  signing_key:
228
194
  specification_version: 4
229
195
  summary: A rails engine for managing Hydra Collections
@@ -250,3 +216,4 @@ test_files:
250
216
  - spec/support/db/migrate/20111101221803_create_searches.rb
251
217
  - spec/support/lib/generators/test_app_generator.rb
252
218
  - spec/support/lib/tasks/rspec.rake
219
+ has_rdoc: