sufia 7.3.1 → 7.4.0

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 298c33325819550fbfa3e889c6e41163ee7a4fe0
4
- data.tar.gz: '09982515edc5ec5d96d3f34569558194e811a686'
3
+ metadata.gz: 021661f3b93bbd570debcb9a59ee80d99ec25fbe
4
+ data.tar.gz: 5d6f072cc58068f6536d91110c1f884706424ac6
5
5
  SHA512:
6
- metadata.gz: e64c8bfe37576d3a419886aecde6e1005cd8e9f7646de0e4470618999a39b96158a9930e28e1f82e7d70330318b7929cfb2939960541ea5a7976444e16b34a27
7
- data.tar.gz: 27759ddf67bccec0a0a676f0113e39c1636eec9fb4a2a63e1d2761c6548a74a5b6863e904a3c5ef1fdb829090ea2464eb4a1b06b4763b02338c434f56b69723a
6
+ metadata.gz: 977dde46e20ed18f04b5c49742df41f1b305bacb9539b2f7b00c2489809ccdcfaada9754d5163dfffb63e33363c8c5f49edca80bca72c8fd095e0bb26528b550
7
+ data.tar.gz: 629cc054b61b16d450731260b3e764db87f63a348242dc7761987252946b0bccee118a25bc043523c136a397f88cf08e7b4c21aa385749f9fadd2e9442db561b
data/README.md CHANGED
@@ -1,19 +1,19 @@
1
- ![Logo](https://raw.githubusercontent.com/projecthydra-labs/sufia.io/gh-pages/assets/images/sufia_logo_white_bg_small.png)
1
+ ![Logo](https://raw.githubusercontent.com/samvera-labs/sufia.io/gh-pages/assets/images/sufia_logo_white_bg_small.png)
2
2
 
3
3
  Code: [![Version](https://badge.fury.io/rb/sufia.png)](http://badge.fury.io/rb/sufia)
4
- [![Build Status](https://travis-ci.org/projecthydra/sufia.png?branch=master)](https://travis-ci.org/projecthydra/sufia)
5
- [![Coverage Status](https://coveralls.io/repos/github/projecthydra/sufia/badge.svg?branch=master)](https://coveralls.io/github/projecthydra/sufia?branch=master)
6
- [![Code Climate](https://codeclimate.com/github/projecthydra/sufia/badges/gpa.svg)](https://codeclimate.com/github/projecthydra/sufia)
7
- [![Dependency Update Status](https://gemnasium.com/projecthydra/sufia.png)](https://gemnasium.com/projecthydra/sufia)
8
- [![Dependency Maintenance Status](https://dependencyci.com/github/projecthydra/sufia/badge)](https://dependencyci.com/github/projecthydra/sufia)
4
+ [![Build Status](https://travis-ci.org/samvera/sufia.png?branch=master)](https://travis-ci.org/samvera/sufia)
5
+ [![Coverage Status](https://coveralls.io/repos/github/samvera/sufia/badge.svg?branch=master)](https://coveralls.io/github/samvera/sufia?branch=master)
6
+ [![Code Climate](https://codeclimate.com/github/samvera/sufia/badges/gpa.svg)](https://codeclimate.com/github/samvera/sufia)
7
+ [![Dependency Update Status](https://gemnasium.com/samvera/sufia.png)](https://gemnasium.com/samvera/sufia)
8
+ [![Dependency Maintenance Status](https://dependencyci.com/github/samvera/sufia/badge)](https://dependencyci.com/github/samvera/sufia)
9
9
 
10
- Docs: [![Documentation Status](https://inch-ci.org/github/projecthydra/sufia.svg?branch=master)](https://inch-ci.org/github/projecthydra/sufia)
10
+ Docs: [![Documentation Status](https://inch-ci.org/github/samvera/sufia.svg?branch=master)](https://inch-ci.org/github/samvera/sufia)
11
11
  [![API Docs](http://img.shields.io/badge/API-docs-blue.svg)](http://rubydoc.info/gems/sufia)
12
12
  [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./.github/CONTRIBUTING.md)
13
13
  [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
14
14
 
15
15
  Jump in: [![Slack Status](http://slack.projecthydra.org/badge.svg)](http://slack.projecthydra.org/)
16
- [![Ready Tickets](https://badge.waffle.io/projecthydra/sufia.png?label=ready&title=Ready)](https://waffle.io/projecthydra/sufia)
16
+ [![Ready Tickets](https://badge.waffle.io/samvera/sufia.png?label=ready&title=Ready)](https://waffle.io/samvera/sufia)
17
17
 
18
18
  # Table of Contents
19
19
 
@@ -45,7 +45,7 @@ Sufia uses the full power of [Hydra](http://projecthydra.org/) and extends it to
45
45
 
46
46
  ## Feature list
47
47
 
48
- Sufia has many features. [Read more about what they are and how to turn them on](https://github.com/projecthydra/sufia/wiki/Feature-matrix). See the [Sufia Management Guide](https://github.com/projecthydra/sufia/wiki/Sufia-Management-Guide) to learn more.
48
+ Sufia has many features. [Read more about what they are and how to turn them on](https://github.com/samvera/sufia/wiki/Feature-matrix). See the [Sufia Management Guide](https://github.com/samvera/sufia/wiki/Sufia-Management-Guide) to learn more.
49
49
 
50
50
  For non-technical documentation about Sufia, see its [documentation site](http://sufia.io/).
51
51
 
@@ -56,7 +56,7 @@ If you have questions or need help, please email [the Hydra community tech list]
56
56
  # Getting started
57
57
 
58
58
  This document contains instructions specific to setting up an app with __Sufia
59
- v7.3.1__. If you are looking for instructions on installing a different
59
+ v7.4.0__. If you are looking for instructions on installing a different
60
60
  version, be sure to select the appropriate branch or tag from the drop-down
61
61
  menu above.
62
62
 
@@ -77,7 +77,7 @@ Sufia 7 requires the following software to work:
77
77
  1. [FITS](#characterization) version 0.8.x (0.8.5 is known to be good)
78
78
  1. [LibreOffice](#derivatives)
79
79
 
80
- **NOTE: The [Sufia Development Guide](https://github.com/projecthydra/sufia/wiki/Sufia-Development-Guide) has instructions for installing Solr and Fedora in a development environment.**
80
+ **NOTE: The [Sufia Development Guide](https://github.com/samvera/sufia/wiki/Sufia-Development-Guide) has instructions for installing Solr and Fedora in a development environment.**
81
81
 
82
82
  ### Characterization
83
83
 
@@ -125,7 +125,7 @@ gem install rails -v 5.0.1
125
125
  Generate a new Rails application using the template.
126
126
 
127
127
  ```
128
- rails new my_app -m https://raw.githubusercontent.com/projecthydra/sufia/master/template.rb
128
+ rails new my_app -m https://raw.githubusercontent.com/samvera/sufia/master/template.rb
129
129
  ```
130
130
 
131
131
  Generating a new Rails application using Sufia's template above takes cares of a number of steps for you, including:
@@ -178,7 +178,7 @@ rake curation_concerns:workflow:load
178
178
 
179
179
  # Managing a Sufia-based app
180
180
 
181
- The [Sufia Management Guide](https://github.com/projecthydra/sufia/wiki/Sufia-Management-Guide) provides tips for how to manage, customize, and enhance your Sufia application, including guidance specific to:
181
+ The [Sufia Management Guide](https://github.com/samvera/sufia/wiki/Sufia-Management-Guide) provides tips for how to manage, customize, and enhance your Sufia application, including guidance specific to:
182
182
 
183
183
  * Production implementations
184
184
  * Configuration of background workers
@@ -195,19 +195,19 @@ Sufia is available under [the Apache 2.0 license](LICENSE.md).
195
195
 
196
196
  We'd love to accept your contributions. Please see our guide to [contributing to Sufia](./.github/CONTRIBUTING.md).
197
197
 
198
- If you'd like to help the development effort and you're not sure where to get started, you can always grab a ticket in the "Ready" column from our [Waffle board](https://waffle.io/projecthydra/sufia). There are other ways to help, too.
198
+ If you'd like to help the development effort and you're not sure where to get started, you can always grab a ticket in the "Ready" column from our [Waffle board](https://waffle.io/samvera/sufia). There are other ways to help, too.
199
199
 
200
- * [Contribute a user story](https://github.com/projecthydra/sufia/issues/new).
201
- * Help us improve [Sufia's test coverage](https://coveralls.io/r/projecthydra/sufia) or [documentation coverage](https://inch-ci.org/github/projecthydra/sufia).
202
- * Refactor away [code smells](https://codeclimate.com/github/projecthydra/sufia).
200
+ * [Contribute a user story](https://github.com/samvera/sufia/issues/new).
201
+ * Help us improve [Sufia's test coverage](https://coveralls.io/r/samvera/sufia) or [documentation coverage](https://inch-ci.org/github/samvera/sufia).
202
+ * Refactor away [code smells](https://codeclimate.com/github/samvera/sufia).
203
203
 
204
204
  # Development
205
205
 
206
- The [Sufia Development Guide](https://github.com/projecthydra/sufia/wiki/Sufia-Development-Guide) is for people who want to modify Sufia itself, not an application that uses Sufia.
206
+ The [Sufia Development Guide](https://github.com/samvera/sufia/wiki/Sufia-Development-Guide) is for people who want to modify Sufia itself, not an application that uses Sufia.
207
207
 
208
208
  # Release process
209
209
 
210
- See the [release management process](https://github.com/projecthydra/sufia/wiki/Release-management-process).
210
+ See the [release management process](https://github.com/samvera/sufia/wiki/Release-management-process).
211
211
 
212
212
  # Acknowledgments
213
213
 
@@ -10,7 +10,7 @@ class Sufia::AvatarUploader < CarrierWave::Uploader::Base
10
10
  process resize_to_limit: [100, 100]
11
11
  end
12
12
 
13
- def extension_white_list
13
+ def extension_whitelist
14
14
  %w(jpg jpeg png gif bmp tif tiff)
15
15
  end
16
16
  end
@@ -3,20 +3,20 @@ module Sufia
3
3
  # Override the directory where uploaded files will be stored.
4
4
  # This is a sensible default for uploaders that are meant to be mounted:
5
5
  def store_dir
6
- base_path + "#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
6
+ configured_upload_path + "#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
7
7
  end
8
8
 
9
9
  def cache_dir
10
- cache_path + "#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
10
+ configured_cache_path + "#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
11
11
  end
12
12
 
13
13
  private
14
14
 
15
- def base_path
15
+ def configured_upload_path
16
16
  Sufia.config.upload_path.call
17
17
  end
18
18
 
19
- def cache_path
19
+ def configured_cache_path
20
20
  Sufia.config.cache_path.call
21
21
  end
22
22
  end
@@ -33,7 +33,7 @@ class TinymceAssetUploader < CarrierWave::Uploader::Base
33
33
 
34
34
  # Add a white list of extensions which are allowed to be uploaded.
35
35
  # For images you might use something like this:
36
- # def extension_white_list
36
+ # def extension_whitelist
37
37
  # %w(jpg jpeg gif png)
38
38
  # end
39
39
 
@@ -531,3 +531,9 @@ en:
531
531
  create: 'Add'
532
532
  create: 'Save'
533
533
  update: 'Save'
534
+ errors:
535
+ messages:
536
+ carrierwave_processing_error: "Cannot resize image."
537
+ carrierwave_integrity_error: "Not an image."
538
+ carrierwave_download_error: "Couldn't download image."
539
+ extension_whitelist_error: "You are not allowed to upload %{extension} files, allowed types: %{allowed_types}"
@@ -1,3 +1,3 @@
1
1
  module Sufia
2
- VERSION = '7.3.1'.freeze
2
+ VERSION = '7.4.0'.freeze
3
3
  end
@@ -31,8 +31,8 @@ describe Sufia::Statistics::Depositors::Summary do
31
31
  let(:start_date) { 1.day.ago.beginning_of_day }
32
32
  let(:end_date) { 0.days.ago.end_of_day }
33
33
  it "gathers user deposits during a date range" do
34
- expect(subject).to eq [{ key: user1.user_key, deposits: 1, user: user1 },
35
- { key: user2.user_key, deposits: 1, user: user2 }]
34
+ expect(subject).to match_array [{ key: user1.user_key, deposits: 1, user: user1 },
35
+ { key: user2.user_key, deposits: 1, user: user2 }]
36
36
  end
37
37
  end
38
38
  end
@@ -11,17 +11,19 @@ describe "sufia/admin/admin_sets/index.html.erb", type: :view do
11
11
  let(:solr_doc) { SolrDocument.new(admin_set.to_solr) }
12
12
  let(:admin_sets) { [solr_doc] }
13
13
  let(:presenter_class) { Sufia::AdminSetPresenter }
14
+ let(:presenter) { instance_double(presenter_class, total_items: 99) }
14
15
  let(:ability) { instance_double("Ability") }
15
16
  before do
16
17
  allow(controller).to receive(:current_ability).and_return(ability)
17
18
  allow(controller).to receive(:presenter_class).and_return(presenter_class)
19
+ allow(presenter_class).to receive(:new).and_return(presenter)
18
20
  assign(:admin_sets, admin_sets)
19
21
  end
20
22
  it "lists admin set" do
21
23
  render
22
24
  expect(rendered).to have_content('Example Admin Set')
23
25
  expect(rendered).to have_content('jdoe@example.com')
24
- expect(rendered).to have_css("td", text: /^0$/)
26
+ expect(rendered).to have_css("td", text: /^99$/)
25
27
  end
26
28
  end
27
29
  end
@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
23
23
  spec.add_dependency 'hydra-head', '>= 10.4.0'
24
24
  spec.add_dependency 'hydra-batch-edit', '~> 2.0'
25
25
  spec.add_dependency 'browse-everything', '>= 0.10.3'
26
- # Workaround for https://github.com/projecthydra-labs/hyrax/issues/546
27
- spec.add_dependency 'blacklight', '~> 6.6', '< 6.8.0'
26
+ # 6.10 drops rails 4 support. this should allow rails 5.0, but not 5.1
27
+ spec.add_dependency 'blacklight', '~> 6.6', '<6.10'
28
28
  spec.add_dependency 'blacklight-gallery', '~> 0.7'
29
29
  spec.add_dependency 'tinymce-rails', '~> 4.1'
30
30
  spec.add_dependency 'tinymce-rails-imageupload', '~> 4.0.16.beta'
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
35
35
  spec.add_dependency 'json-schema'
36
36
  spec.add_dependency 'nest', '~> 2.0'
37
37
  spec.add_dependency 'mailboxer', '~> 0.12'
38
- spec.add_dependency 'carrierwave', '~> 0.9'
38
+ spec.add_dependency 'carrierwave', '~> 1.0'
39
39
  spec.add_dependency 'oauth'
40
40
  spec.add_dependency 'oauth2', '~> 1.2'
41
41
  spec.add_dependency 'signet'
@@ -49,6 +49,8 @@ Gem::Specification.new do |spec|
49
49
  spec.add_dependency 'flipflop', '~> 2.3'
50
50
  spec.add_dependency 'jquery-datatables-rails', '~> 3.4.0'
51
51
  spec.add_dependency 'rdf-rdfxml'
52
+ # https://github.com/svenfuchs/i18n/issues/379
53
+ spec.add_dependency 'i18n', '0.8.1'
52
54
 
53
55
  spec.add_development_dependency 'engine_cart', '~> 1.0'
54
56
  spec.add_development_dependency 'mida', '~> 0.3'
@@ -1,4 +1,4 @@
1
- gem 'sufia', '7.3.1'
1
+ gem 'sufia', '7.4.0'
2
2
 
3
3
  run 'bundle install'
4
4
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sufia
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.3.1
4
+ version: 7.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Justin Coyne
@@ -12,7 +12,7 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2017-04-26 00:00:00.000000000 Z
15
+ date: 2017-09-07 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: hydra-works
@@ -93,7 +93,7 @@ dependencies:
93
93
  version: '6.6'
94
94
  - - "<"
95
95
  - !ruby/object:Gem::Version
96
- version: 6.8.0
96
+ version: '6.10'
97
97
  type: :runtime
98
98
  prerelease: false
99
99
  version_requirements: !ruby/object:Gem::Requirement
@@ -103,7 +103,7 @@ dependencies:
103
103
  version: '6.6'
104
104
  - - "<"
105
105
  - !ruby/object:Gem::Version
106
- version: 6.8.0
106
+ version: '6.10'
107
107
  - !ruby/object:Gem::Dependency
108
108
  name: blacklight-gallery
109
109
  requirement: !ruby/object:Gem::Requirement
@@ -250,14 +250,14 @@ dependencies:
250
250
  requirements:
251
251
  - - "~>"
252
252
  - !ruby/object:Gem::Version
253
- version: '0.9'
253
+ version: '1.0'
254
254
  type: :runtime
255
255
  prerelease: false
256
256
  version_requirements: !ruby/object:Gem::Requirement
257
257
  requirements:
258
258
  - - "~>"
259
259
  - !ruby/object:Gem::Version
260
- version: '0.9'
260
+ version: '1.0'
261
261
  - !ruby/object:Gem::Dependency
262
262
  name: oauth
263
263
  requirement: !ruby/object:Gem::Requirement
@@ -440,6 +440,20 @@ dependencies:
440
440
  - - ">="
441
441
  - !ruby/object:Gem::Version
442
442
  version: '0'
443
+ - !ruby/object:Gem::Dependency
444
+ name: i18n
445
+ requirement: !ruby/object:Gem::Requirement
446
+ requirements:
447
+ - - '='
448
+ - !ruby/object:Gem::Version
449
+ version: 0.8.1
450
+ type: :runtime
451
+ prerelease: false
452
+ version_requirements: !ruby/object:Gem::Requirement
453
+ requirements:
454
+ - - '='
455
+ - !ruby/object:Gem::Version
456
+ version: 0.8.1
443
457
  - !ruby/object:Gem::Dependency
444
458
  name: engine_cart
445
459
  requirement: !ruby/object:Gem::Requirement
@@ -1755,7 +1769,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1755
1769
  version: '0'
1756
1770
  requirements: []
1757
1771
  rubyforge_project:
1758
- rubygems_version: 2.6.10
1772
+ rubygems_version: 2.5.2
1759
1773
  signing_key:
1760
1774
  specification_version: 4
1761
1775
  summary: Sufia was originally extracted from ScholarSphere developed by Penn State