Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/334 json ld viewer #450

Open
wants to merge 2,066 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2066 commits
Select commit Hold shift + click to select a range
cc82316
Added labels for chemical composition
anusharanganathan Jun 7, 2022
93a7287
Add form for chemical composition
anusharanganathan Jun 7, 2022
28f348f
Merge branch 'i551-complex-chemical-composition' into i552-complex-st…
anusharanganathan Jun 7, 2022
cafc42a
Add structural feature to locale files
anusharanganathan Jun 7, 2022
fefc6e0
Add edit field for structural feature
anusharanganathan Jun 7, 2022
e59406c
Merge pull request #466 from nims-dpfc/i551-complex-chemical-composition
nabeta Jun 7, 2022
a4f3a62
Merge pull request #467 from nims-dpfc/i552-complex-structural-feature
nabeta Jun 7, 2022
75f0cc0
Bump jmespath from 1.4.0 to 1.6.1 in /hyrax
dependabot[bot] Jun 7, 2022
27323af
fix Collection abilities
nabeta Jun 10, 2022
a4a415a
Merge pull request #470 from nims-dpfc/i555-fix-collection-ability
nabeta Jun 20, 2022
5d1149a
remove depositor from featured work template
nabeta Jun 22, 2022
34823d4
remove keyword section
nabeta Jun 23, 2022
ff7eff1
Merge pull request #472 from nims-dpfc/feature/i558-featured-work-dep…
asahiko Jun 23, 2022
41153a7
Bump rails-html-sanitizer from 1.4.2 to 1.4.3 in /hyrax
dependabot[bot] Jul 6, 2022
f71d249
Fixed order of authors in meta tags
anusharanganathan Jul 7, 2022
990bd74
Merge branch 'develop' into feature/334_json_ld_viewer
anusharanganathan Jul 7, 2022
87dddcf
Removing test to check order of citation authors
anusharanganathan Jul 7, 2022
3684637
Fixes for file display as in issue #545
anusharanganathan Jul 7, 2022
bf1ffd5
New files for text and markdown view
anusharanganathan Jul 7, 2022
13baadc
Upgraded image magick and added a few more files
anusharanganathan Jul 7, 2022
696ae94
Displaying text within a pre tag
anusharanganathan Jul 7, 2022
55a6ea8
Merge pull request #469 from nims-dpfc/dependabot/bundler/hyrax/jmesp…
nabeta Jul 7, 2022
31c1943
Bump rack from 2.2.3 to 2.2.4 in /hyrax
dependabot[bot] Jul 7, 2022
5578084
Merge pull request #473 from nims-dpfc/dependabot/bundler/hyrax/rails…
nabeta Jul 7, 2022
b8249d5
Fixed markdown display
anusharanganathan Jul 7, 2022
66e7cbd
Merge pull request #476 from nims-dpfc/dependabot/bundler/hyrax/rack-…
nabeta Jul 7, 2022
43bf2ff
Merge pull request #474 from nims-dpfc/feature/557_citation_author_or…
nabeta Jul 7, 2022
0252677
update Rails to 5.2.8.1
nabeta Jul 15, 2022
3dd4f62
Added tests for txt and markdown export
anusharanganathan Jul 18, 2022
fcab7f4
fixed rspec fixture
anusharanganathan Jul 18, 2022
9e6bcc4
update blacklight
nabeta Jul 18, 2022
727629f
Marked failing mrkdown test as pending
anusharanganathan Jul 19, 2022
b999efa
Merge pull request #448 from nims-dpfc/feature/521_recreate_thumbnails
nabeta Jul 19, 2022
e982b7f
Bump tzinfo from 1.2.9 to 1.2.10 in /hyrax
dependabot[bot] Jul 22, 2022
b188fa9
Merge pull request #479 from nims-dpfc/dependabot/bundler/hyrax/tzinf…
asahiko Jul 25, 2022
94f1607
ignore URI::InvalidURIError in exception_notification
nabeta Jul 26, 2022
2607ab0
remove duplicates
nabeta Jul 26, 2022
96ff69e
add PidController
nabeta Jul 26, 2022
b7d0a33
Merge pull request #480 from nims-dpfc/i571-ignore-invalidurlerror
asahiko Jul 29, 2022
a615b0d
Merge pull request #478 from nims-dpfc/i569-rails-5.2.8.1
anusharanganathan Aug 2, 2022
6cffd7e
Add HAXPES to characterization methods
asahiko Aug 9, 2022
a1cd0c1
Merge pull request #482 from nims-dpfc/add-haxpes
nabeta Aug 9, 2022
bd4005a
Use email to login, change abilities and disable CAS
anusharanganathan Aug 15, 2022
3d4b6b0
Removed test for nims_other in ability
anusharanganathan Aug 15, 2022
ae821b2
Removed tests specifically testing nims_other
anusharanganathan Aug 15, 2022
83c8044
Further removed tests specifically testing nims_other
anusharanganathan Aug 15, 2022
06cbd7d
Merge pull request #481 from nims-dpfc/i572-redirect-registration-number
anusharanganathan Aug 24, 2022
fb9ffbb
Merge pull request #475 from nims-dpfc/feature/image_magick_upgrade
nabeta Aug 26, 2022
9426f1a
use CircleCI custom images
nabeta Sep 6, 2022
148f55c
use cimg/ruby:2.7.4-browsers
nabeta Sep 10, 2022
11e5baf
add libxslt1-dev to CI envirionment
nabeta Sep 10, 2022
962395b
add libsqlite3-dev to CI environment
nabeta Sep 10, 2022
415d9a8
remove CAS container
nabeta Sep 10, 2022
6be09cc
run "apt install" before "bundle install"
nabeta Sep 10, 2022
3f169f0
remove email user from the definition file
nabeta Sep 10, 2022
4899fca
add missing license URLs of current MDR works
nabeta Sep 10, 2022
5d4458e
Merge branch 'i549_auth_user_model' into remove-cas-container
nabeta Sep 10, 2022
7c555d7
add ComplexSoftware
nabeta Sep 10, 2022
3f90cea
fix indexing
nabeta Sep 10, 2022
9ff51c7
fix model definition
nabeta Sep 10, 2022
1d893ab
fix form
nabeta Sep 10, 2022
5a39f0d
fix spec file
nabeta Sep 10, 2022
15607f2
update spec files
nabeta Sep 11, 2022
222e992
fix spec files
nabeta Sep 11, 2022
496db5e
fix spec file
nabeta Sep 12, 2022
998cad6
add a form template file
nabeta Sep 12, 2022
cf142d0
add a relation between Dataset and ComplexCrystallographicStructure
nabeta Sep 12, 2022
5b34d8a
fix property name
nabeta Sep 12, 2022
f0ad272
add ComplexFeature
nabeta Sep 12, 2022
41454db
update form
nabeta Sep 12, 2022
a9df3a4
Merge branch 'i577-complex-crystallographic-structure' of github.com:…
nabeta Sep 12, 2022
096f740
fix method name
nabeta Sep 12, 2022
3f3e213
add missing comma
nabeta Sep 12, 2022
40a744e
fix typo
nabeta Sep 12, 2022
2a83e30
fix spec file
nabeta Sep 12, 2022
825a413
Revert "fix spec file"
nabeta Sep 12, 2022
758055f
fix spec file
nabeta Sep 12, 2022
c59a82c
update spec files
nabeta Sep 12, 2022
6cfa2b4
update spec files
nabeta Sep 12, 2022
f1f6715
update spec files
nabeta Sep 12, 2022
1268a02
update spec file
nabeta Sep 12, 2022
a01a8b2
add form template file
nabeta Sep 12, 2022
995f4fe
add spec file
nabeta Sep 12, 2022
1232223
fix form
nabeta Sep 12, 2022
f988bc8
remove chemical_composition, crystallographic_structure
nabeta Sep 12, 2022
4a8c6cd
remove chemical_composition, crystallographic_structure
nabeta Sep 12, 2022
d282112
Support extended terms and inactive licences
anusharanganathan Sep 13, 2022
12ecaf7
Fixed file based authority service terms and rights statement url update
anusharanganathan Sep 13, 2022
2898c54
Merge pull request #485 from nims-dpfc/use-cimg
nabeta Sep 13, 2022
fb56b11
Removed trailing spaces in failing test
anusharanganathan Sep 13, 2022
a972b58
Changed rights statement chosen in cucumber create step
anusharanganathan Sep 13, 2022
d555c34
Merge pull request #487 from nims-dpfc/remove-cas-container
nabeta Sep 13, 2022
2d7e204
remove duplicate CC BY 3.0 (DE)
asahiko Sep 16, 2022
8d415e2
Merge pull request #486 from nims-dpfc/i574-license-url
nabeta Sep 16, 2022
5515874
Merge branch 'develop' into feature/574_different_license_urls
nabeta Sep 16, 2022
1fbe55c
update labels
nabeta Sep 26, 2022
881644a
activate some CC licenses
nabeta Sep 27, 2022
b0b937e
Merge branch 'feature/574_different_license_urls' of github.com:nims-…
nabeta Sep 27, 2022
7b1f0c2
fix spec file
nabeta Sep 27, 2022
8c8952e
Merge branch 'develop' into i578-complex-feature
nabeta Sep 27, 2022
77e4118
Merge branch 'develop' into i576-complex-software
nabeta Sep 27, 2022
da82350
Merge branch 'develop' into i577-complex-crystallographic-structure
nabeta Sep 27, 2022
0c7d148
Merge branch 'develop' into i549_auth_user_model
nabeta Sep 27, 2022
fdf2e3c
Merge pull request #483 from nims-dpfc/i549_auth_user_model
nabeta Oct 4, 2022
088f64b
Merge branch 'develop' into i527-add-cifs-utils
nabeta Oct 11, 2022
72612f8
Merge pull request #456 from nims-dpfc/i527-add-cifs-utils
nabeta Oct 11, 2022
1eee80f
Seems to be recommened got mounting cifs
anusharanganathan Oct 11, 2022
875123f
Merge pull request #491 from nims-dpfc/feature/574_different_license_…
nabeta Oct 11, 2022
ffa77ad
add CC BY-NC 2.1 JP to rights_statements
nabeta Oct 16, 2022
ccc7e8e
Fix term for CC BY-NC 2.1 JP
asahiko Oct 17, 2022
26004ce
Merge pull request #496 from nims-dpfc/add-cc-by-nc-jp
nabeta Oct 17, 2022
bb898d4
Add destroy button for software
anusharanganathan Oct 21, 2022
3851d38
Add label for facet field
anusharanganathan Oct 21, 2022
de70c5f
Removed repeating blocks in the rendered html
anusharanganathan Oct 21, 2022
b652ead
Add label for facet
anusharanganathan Oct 21, 2022
d7f681b
Removed repeating code
anusharanganathan Oct 21, 2022
b8dd072
Add labels for form and facet fields
anusharanganathan Oct 21, 2022
5d16297
Merge remote-tracking branch 'origin/i576-complex-software' into develop
nabeta Oct 22, 2022
529ea01
add a delete link to ComplexSoftware form
nabeta Oct 22, 2022
7a2deb4
add complex_software to Actors
nabeta Oct 22, 2022
16e9c9a
Merge branch 'i576-complex-software' of https://github.com/nims-dpfc/…
nabeta Oct 22, 2022
31f969c
update predicate class names
nabeta Oct 22, 2022
54169d1
add complex_feature to Actors
nabeta Oct 22, 2022
4cccfbc
Merge branch 'develop' into azure
nabeta Oct 22, 2022
0ea128a
Installing clamav to scan files for virus
anusharanganathan Mar 27, 2022
50a3d02
fix spec file
nabeta Oct 22, 2022
6d1c27a
add ClamAV Docker image to CI
nabeta Mar 28, 2022
4ec704f
fix spec file
nabeta Oct 22, 2022
4eb613c
specify GPL version explicitly
nabeta Oct 23, 2022
04d6b60
remove act-fluent-logger-rails gem
nabeta Sep 16, 2022
b458e18
remove fluentd container
nabeta Sep 16, 2022
e41fb1e
fix Gemfile.lock
nabeta Oct 23, 2022
581ce6c
remove CAS container
nabeta Sep 10, 2022
d312c60
remove devise_cas_authenticatable gem
nabeta Sep 16, 2022
96d007e
Merge pull request #488 from nims-dpfc/i576-complex-software
nabeta Oct 24, 2022
f311bda
Merge branch 'develop' of https://github.com/antleaf/nims-hyrax into …
nabeta Oct 24, 2022
d3a7267
Merge branch 'develop' into i578-complex-feature
nabeta Oct 24, 2022
71baa29
Merge pull request #490 from nims-dpfc/i578-complex-feature
nabeta Oct 24, 2022
b758876
Authenticate using Microsoft omniauth
anusharanganathan Mar 30, 2022
5e79391
fix setting user attributes
nabeta Oct 20, 2022
68abe18
fix retrieving system user
nabeta Oct 12, 2022
51bb204
add AZURE_OAUTH_JWKS_URL to verify JWT
nabeta Oct 25, 2022
8e4a5a0
add AZURE_OAUTH_JWKS_URL environment variable
nabeta Oct 20, 2022
cf53e7d
fix OAuth scope
nabeta Oct 25, 2022
827262f
Add gems to gemfile for omniauth
anusharanganathan Mar 30, 2022
2e13c48
remove duplicate devise modules
nabeta Oct 25, 2022
4acbc2f
disable ClamAV temporarily
nabeta Oct 25, 2022
9b9a185
remove CAS configurations
nabeta Sep 16, 2022
c8f0f71
Merge branch 'develop' into aad-b2c-auth
nabeta Oct 25, 2022
07e87ca
Merge branch 'develop' into azure
nabeta Oct 25, 2022
a00d875
Merge branch 'azure' into aad-b2c-auth
nabeta Oct 25, 2022
e48ea6a
remove clamav-client
nabeta Oct 25, 2022
3ce5e61
fix creating system user
nabeta Oct 25, 2022
3775afb
Specify GPL version in URL
asahiko Oct 26, 2022
75b5c1c
Merge pull request #497 from nims-dpfc/rights-gpl-version
asahiko Oct 26, 2022
5bc42cb
Merge branch 'develop' into i577-complex-crystallographic-structure
nabeta Oct 26, 2022
156bf68
move software form to method tab
nabeta Oct 26, 2022
9a20a14
update template file
nabeta Oct 26, 2022
ca0fd7d
Merge pull request #499 from nims-dpfc/software-method-form
asahiko Oct 26, 2022
e5bb5ca
add delete button
nabeta Oct 26, 2022
5ef4e0f
display description over category
nabeta Oct 26, 2022
fae001b
update form order
nabeta Oct 26, 2022
8caaa33
Merge pull request #500 from nims-dpfc/update-description-order
asahiko Oct 26, 2022
171aa48
Merge branch 'develop' into i577-complex-crystallographic-structure
nabeta Nov 2, 2022
e06e506
restore CrystallographicStructure form temporarily
nabeta Nov 2, 2022
b8c646f
Merge pull request #501 from nims-dpfc/restore-crystallographic-struc…
asahiko Nov 2, 2022
65cd1de
Merge pull request #492 from nims-dpfc/feature/mount_smb_share
nabeta Nov 8, 2022
40f92ee
install postgresql-client package
nabeta Nov 21, 2022
fac3e34
Upgraded OAI gem to work with rails 5
anusharanganathan Nov 22, 2022
ce35de3
Merge pull request #498 from nims-dpfc/aad-b2c-auth
nabeta Nov 22, 2022
73418e1
Merge pull request #503 from nims-dpfc/feature/504_oai_upgrade
nabeta Nov 23, 2022
5eecd7b
Bump nokogiri from 1.13.7 to 1.13.9 in /hyrax
dependabot[bot] Nov 23, 2022
56ac194
Merge pull request #502 from nims-dpfc/add-psql
asahiko Nov 23, 2022
d3823bd
Merge pull request #504 from nims-dpfc/dependabot/bundler/hyrax/nokog…
nabeta Nov 23, 2022
d32a530
reduce max login attempts to 10
nabeta Nov 28, 2022
476a31d
add elastic-apm gem
nabeta Nov 28, 2022
70ce176
Merge pull request #505 from nims-dpfc/i565-account-lockout
asahiko Nov 28, 2022
84244e0
Merge pull request #506 from nims-dpfc/i559-elastic-apm
asahiko Dec 5, 2022
05cb97f
Bump nokogiri from 1.13.9 to 1.13.10 in /hyrax
dependabot[bot] Dec 8, 2022
c26b7b7
Merge pull request #507 from nims-dpfc/dependabot/bundler/hyrax/nokog…
asahiko Dec 8, 2022
90758ea
Bump loofah from 2.18.0 to 2.19.1 in /hyrax
dependabot[bot] Dec 13, 2022
0420794
Bump rails-html-sanitizer from 1.4.3 to 1.4.4 in /hyrax
dependabot[bot] Dec 14, 2022
6405d5b
Merge pull request #508 from nims-dpfc/dependabot/bundler/hyrax/loofa…
nabeta Dec 16, 2022
433d828
Merge pull request #509 from nims-dpfc/dependabot/bundler/hyrax/rails…
nabeta Dec 16, 2022
1d7a5fb
add SMTP-AUTH setting
nabeta Jan 18, 2023
462c55d
Bump rack from 2.2.4 to 2.2.6.2 in /hyrax
dependabot[bot] Jan 19, 2023
540bc47
remove CAS container and settings
nabeta Jan 19, 2023
f2f7c9e
remove CAS settings from env files
nabeta Jan 19, 2023
2150935
remove devise_cas_authenticatable gem
nabeta Jan 19, 2023
65003dc
remove CAS settings from Devise
nabeta Jan 19, 2023
46e1173
Merge pull request #511 from nims-dpfc/dependabot/bundler/hyrax/rack-…
nabeta Jan 19, 2023
4016762
Bump globalid from 1.0.0 to 1.0.1 in /hyrax
dependabot[bot] Jan 19, 2023
43a1a15
fix can_create_any_work? ability for a non-login user
nabeta Jan 19, 2023
d096cc8
Merge pull request #513 from nims-dpfc/dependabot/bundler/hyrax/globa…
nabeta Jan 19, 2023
b2db197
remove fluentd container and setting files
nabeta Jan 19, 2023
0b58a5a
Merge branch 'develop' into i590-remove-fluentd
nabeta Jan 19, 2023
9845372
fix spec file
nabeta Jan 19, 2023
6b2d6f9
enable devise validatable module
nabeta Jan 19, 2023
efbd8f3
Merge pull request #510 from nims-dpfc/smtp-auth
asahiko Jan 20, 2023
1b8ddfc
Merge pull request #515 from nims-dpfc/i590-remove-fluentd
asahiko Jan 20, 2023
e7fe681
Merge branch 'develop' into azure
nabeta Jan 21, 2023
b5857f2
Merge branch 'develop' into azure
nabeta Jan 21, 2023
0fa327e
update hyrax gem to 2.9.6
nabeta Jan 21, 2023
fd7fb7a
update capybara gem
nabeta Jan 21, 2023
9e194a0
Bump net-ldap from 0.16.1 to 0.17.1 in /hyrax
dependabot[bot] Jan 24, 2023
2536bfb
Merge pull request #518 from nims-dpfc/dependabot/bundler/hyrax/net-l…
nabeta Jan 25, 2023
d5a43d4
pin mail gem to 2.7.0.1
nabeta Jan 30, 2023
6fca547
Merge pull request #512 from nims-dpfc/i589-remove-cas
nabeta Jan 30, 2023
71abd64
Merge pull request #514 from nims-dpfc/fix-create-any-work-ability
nabeta Jan 30, 2023
c6c9faa
Merge branch 'develop' into i596-hyrax-296
nabeta Jan 30, 2023
ffbbff6
Merge branch 'develop' into azure
nabeta Jan 30, 2023
8a5af50
fix mapping between jpcoar:relatedIdentifier and first_published_url
nabeta Jan 30, 2023
bd1e26c
Merge pull request #516 from nims-dpfc/i596-hyrax-296
nabeta Jan 30, 2023
4f13f38
Merge branch 'develop' into feature/334_json_ld_viewer
nabeta Jan 30, 2023
091f95d
Fixed error in OAI config
anusharanganathan Jan 31, 2023
bb3bd85
Merge pull request #519 from nims-dpfc/i592-jpcoar-related-identifier…
asahiko Jan 31, 2023
6596b71
Merge branch 'develop' into azure
nabeta Jan 31, 2023
ca73eae
Merge branch 'azure' of github.com:nims-dpfc/nims-hyrax into azure
nabeta Jan 31, 2023
c071749
Merge branch 'develop' into azure
nabeta Jan 31, 2023
e3e39e1
Merge pull request #521 from nims-dpfc/azure
nabeta Feb 4, 2023
1312c6a
Merge branch 'develop' into feature/334_json_ld_viewer
nabeta Feb 5, 2023
aeac6df
Merge branch 'develop' into i577-complex-crystallographic-structure
nabeta Feb 5, 2023
c69bd44
restrict the version of faraday_middleware
nabeta Feb 6, 2023
02893f6
Expanded the excludefilter and added tests
anusharanganathan Feb 14, 2023
29de305
Merge pull request #522 from nims-dpfc/i596-restrict-faraday-middleware
nabeta Feb 14, 2023
8fb039f
Fixing spec
anusharanganathan Feb 14, 2023
41c9fee
The error message on page is different
anusharanganathan Feb 14, 2023
f63fa80
Merge pull request #520 from nims-dpfc/bug_fix/i582_oai_pmh_not_filte…
nabeta Feb 27, 2023
09b1e1f
Bump rack from 2.2.6.2 to 2.2.6.3 in /hyrax
dependabot[bot] Mar 9, 2023
0120e71
Overright Ebucore in rdf-vocab with Copy older version
anusharanganathan Mar 13, 2023
67fc597
Fixed complex records to save correct.
kapill65chhpatel Mar 14, 2023
5918746
Merge pull request #525 from nims-dpfc/dependabot/bundler/hyrax/rack-…
nabeta Mar 15, 2023
6f3c836
Bump rack from 2.2.6.3 to 2.2.6.4 in /hyrax
dependabot[bot] Mar 16, 2023
95f4fd2
Merge pull request #529 from nims-dpfc/dependabot/bundler/hyrax/rack-…
nabeta Mar 17, 2023
209a5f8
Merge branch 'develop' into i577-complex-crystallographic-structure
anusharanganathan Apr 9, 2023
795de5c
Fixed missing repeat option
anusharanganathan Apr 10, 2023
78cf68e
Rake task to migrate nested metadata
anusharanganathan Apr 10, 2023
d2ab190
Merge pull request #527 from nims-dpfc/bug/fix-work-params
nabeta Apr 10, 2023
cb32975
Merge pull request #526 from nims-dpfc/feature/i593_support_older_ebu…
nabeta Apr 10, 2023
905f918
update organization names and URLs
nabeta Apr 11, 2023
c6e53b4
Merge pull request #531 from nims-dpfc/i600-organization-name
asahiko Apr 12, 2023
2bb3c0a
Bump nokogiri from 1.14.0 to 1.14.3 in /hyrax
dependabot[bot] Apr 12, 2023
61b36a7
added cucumber tests for issue 368
kapill65chhpatel Apr 18, 2023
0124e01
some changes
kapill65chhpatel Apr 18, 2023
bd005ef
Merge pull request #532 from nims-dpfc/dependabot/bundler/hyrax/nokog…
nabeta Apr 22, 2023
9d95256
Merge pull request #489 from nims-dpfc/i577-complex-crystallographic-…
nabeta Apr 24, 2023
201a39c
Merge pull request #533 from nims-dpfc/add-cucumber-tests-for-issue-368
nabeta Apr 24, 2023
a24dde2
Merge branch 'develop' into feature/334_json_ld_viewer
nabeta Apr 25, 2023
23dd10a
View files grouped by type
anusharanganathan May 23, 2023
91f3712
Display file preview for readme, metadata and json files, grouped in …
anusharanganathan May 23, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
56 changes: 56 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
version: 2.1
orbs:
ruby: circleci/[email protected]

jobs:
build:
docker:
- image: cimg/ruby:2.7.4-browsers
- image: cimg/postgres:12.11
environment:
POSTGRES_USER: postgres
POSTGRES_DB: hyrax_test
- image: cimg/redis:6.2
- image: clamav/clamav:stable
steps:
- checkout
- restore_cache:
keys:
- rails-demo-{{ checksum "hyrax/Gemfile.lock" }}
- rails-demo-
- run:
name: apt install
command: |
sudo apt update
sudo apt install -y openjdk-11-jre-headless libmediainfo-dev libxslt1-dev libsqlite3-dev
- run:
name: bundle install
command: |
cd hyrax
bundle install --jobs 4 --retry 3
- run:
name: download fits
command: |
export FITS_ROOT=~/nims-hyrax/
mkdir -p ${FITS_ROOT}
wget -q https://projects.iq.harvard.edu/files/fits/files/fits-1.3.0.zip -O ${FITS_ROOT}/fits-1.3.0.zip
unzip -q ${FITS_ROOT}/fits-1.3.0.zip -d ${FITS_ROOT}/fits-1.3.0
chmod a+x ${FITS_ROOT}/fits-1.3.0/fits.sh
rm ${FITS_ROOT}/fits-1.3.0.zip
- run:
name: prepare database
command: |
cd hyrax
bundle exec rake db:test:prepare
- run:
name: run tests
command: |
cd hyrax
export FITS_PATH=~/nims-hyrax/fits-1.3.0/fits.sh
TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
if test -f "lib/tasks/test_servers.rake"; then echo 'Running full tests' && bundle exec rake test:servers:start && bundle exec rspec && bundle exec cucumber && bundle exec rake test:servers:stop; else echo "Running limited tests"; bundle exec rspec --exclude-pattern "**/features/*_spec.rb"; fi
- store_test_results:
path: /tmp/test-results
- store_artifacts:
path: /tmp/test-results
destination: test-results
124 changes: 124 additions & 0 deletions .env.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
# Solr setting
SOLR_URL_SCHEME=http
SOLR_HOST=solr
SOLR_PORT=8983
SOLR_CORE=hyrax_production
SOLR_TEST_PORT=8985

# Database setting
POSTGRES_HOST_APP=appdb
POSTGRES_HOST_FCREPO=fcrepodb
POSTGRES_PORT=5432
POSTGRES_USER=postgres
POSTGRES_PASSWORD=password
POSTGRES_DB_APP=hyrax_production
POSTGRES_DB_TEST=hyrax_test
POSTGRES_DB_FCREPO=fcrepo

# Redis setting
REDIS_HOST=redis
REDIS_PORT=6379

# Fedora setting
FEDORA_URL_SCHEME=http
FEDORA_HOST=fcrepo
FEDORA_PORT=8080
# FCREPO_ENDPOINT=hyrax_production # Optional - default is production
# FCREPO_PATH is Optional - default is /fcrepo/rest
# FCREPO_PATH=/rest
FCREPO_VERSION=4.7.5
FEDORA_TEST_PORT=8986

# RAILS setting
LANG=C.UTF-8
PORT=3000
RAILS_ENV=production
RAILS_LOG_TO_STDOUT=true
RAILS_SERVE_STATIC_FILES=true
RAILS_MAX_THREADS=5
# The secrect key should be a very long random key.
# You can use "$ bundle exec rails secret" to generate one.
SECRET_KEY_BASE_PRODUCTION=
DEVISE_SECRET_KEY=

# Google analytics setting for the application
GOOGLE_ANALYTICS_ID=
GA_APP_NAME=
GA_APP_VERSION=
GA_PRIVATE_KEY_PATH=
GA_PRIVATE_KEY_SECRET=
GA_CLIENT_EMAIL=

# Hyrax application setting
# NB: in macOS Catalina (10.15) the /srv/ path is not available to Docker
HOST_APP_DATA_PATH=/srv/ngdr/data/
DERIVATIVES_PATH=/shared/derivatives/
FITS_PATH=/fits/fits-1.3.0/fits.sh
# fits_version should appear exactly like this, including fits-
FITS_VERSION=fits-1.3.0
UPLOADS_PATH=/shared/uploads/
CACHE_PATH=/shared/cache/
BRAND_PATH=/data/public/branding
DEFAULT_DATE_FORMAT=%d/%m/%Y
[email protected]
ERROR_NOTIFICATION_RECIPIENT_EMAIL=error-notification@example.org
ERROR_NOTIFICATION_SUBJECT_PREFIX=mdr-development
[email protected]
CONTACT_FORM_SUBJECT_PREFIX='Hyrax Contact form:'
CONTACT_EMAIL=
FROM_EMAIL=
SMTP_PASS=
GEONAMES=
IIIF_SEARCH_ENDPOINT=
CONFIG_IIIF_IMAGE_ENDPOINT=
# If the rails server is configured to serve requests in https, set this to true
IIIF_TO_SERVE_SSL_URLS=false

# Browse Everything credentials
GOOGLE_DRIVE_CLIENT_ID=
GOOGLE_DRIVE_CLIENT_SECRET=
BOX_CLIENT_ID=
BOX_CLIENT_SECRET=

# Choose one of the following authentication methods.
# (database_authenticatable is pre-configured and useful for a development environment)
MDR_DEVISE_AUTH_MODULE=database_authenticatable
# MDR_DEVISE_AUTH_MODULE=ldap_authenticatable
# MDR_DEVISE_AUTH_MODULE=cas_authenticatable

LDAP_HOST=
LDAP_PORT=443
LDAP_ATTRIBUTE=uid
LDAP_BASE=
LDAP_ADMIN_USER=
LDAP_ADMIN_PASSWORD=
LDAP_SSL=false

SMTP_HOST=
SMTP_PORT=

# Host used for generating URLs
MDR_HOST=

# OAI config used in config/initializers/oai_config.rb
OAI_REPOSTIORY_NAME='NIMS MDR'
OAI_REPOSITORY_URL=http://localhost:3000/catalog/oai
OAI_RECORD_PREFIX=nims_mdr
OAI_ADMIN_EMAIL=***REMOVED***

# User Authorisation LDAP (runs after database / LDAP authentication)
USER_AUTHORISATION_LDAP_HOST=
USER_AUTHORISATION_LDAP_PORT=389
USER_AUTHORISATION_LDAP_ATTRIBUTE=uid
USER_AUTHORISATION_LDAP_BASE=

WIKIBASE_BASE_URL=https://wikibase.example.jp
WIKIBASE_SPARQL_QUERY_SYNONYM=/query/example?query=some_sparql_query

AZURE_APP_ID=
AZURE_APP_SECRET=
AZURE_SCOPES=openid offline_access
AZURE_OAUTH_SITE_URL=
AZURE_OAUTH_AUTHORIZE_ENDPOINT=
AZURE_OAUTH_TOKEN_ENDPOINT=
AZURE_OAUTH_JWKS_URL=
124 changes: 124 additions & 0 deletions .env.template.development
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
IN_DOCKER=true

# Solr setting
SOLR_URL_SCHEME=http
SOLR_HOST=solr
SOLR_PORT=8983
SOLR_CORE=hyrax_production
SOLR_TEST_PORT=8983

# Database setting
POSTGRES_HOST_APP=appdb
POSTGRES_HOST_FCREPO=fcrepodb
POSTGRES_PORT=5432
POSTGRES_USER=postgres
POSTGRES_PASSWORD=password
POSTGRES_DB_APP=hyrax_production
POSTGRES_DB_TEST=hyrax_test
POSTGRES_DB_FCREPO=fcrepo

# Redis setting
REDIS_HOST=redis
REDIS_PORT=6379

# Fedora setting
FEDORA_URL_SCHEME=http
FEDORA_HOST=fcrepo
FEDORA_PORT=8080
# FCREPO_ENDPOINT=hyrax_production # Optional - default is production
# FCREPO_PATH is Optional - default is /fcrepo/rest
FCREPO_PATH=/fcrepo/rest
FCREPO_VERSION=4.7.5
FCREPO_DEVELOPMENT_PORT=8080
FEDORA_TEST_PORT=8080

# RAILS setting
LANG=C.UTF-8
PORT=3000
RAILS_LOG_TO_STDOUT=true
RAILS_SERVE_STATIC_FILES=true
RAILS_MAX_THREADS=5
# The secrect key should be a very long random key.
# You can use "$ bundle exec rails secret" to generate one.
SECRET_KEY_BASE_PRODUCTION=
DEVISE_SECRET_KEY=

# Google analytics setting for the application
GOOGLE_ANALYTICS_ID=
GA_APP_NAME=
GA_APP_VERSION=
GA_PRIVATE_KEY_PATH=
GA_PRIVATE_KEY_SECRET=
GA_CLIENT_EMAIL=

# Hyrax application setting
# NB: in macOS Catalina (10.15) the /srv/ path is not available to Docker
HOST_APP_DATA_PATH=./data/
DERIVATIVES_PATH=/shared/derivatives/
FITS_PATH=/fits/fits-1.3.0/fits.sh
# fits_version should appear exactly like this, including fits-
FITS_VERSION=fits-1.3.0
UPLOADS_PATH=/shared/uploads/
CACHE_PATH=/shared/cache/
BRAND_PATH=/data/public/branding
DEFAULT_DATE_FORMAT=%d/%m/%Y
[email protected]
ERROR_NOTIFICATION_RECIPIENT_EMAIL=error-notification@example.org
ERROR_NOTIFICATION_SUBJECT_PREFIX=mdr-development
[email protected]
CONTACT_FORM_SUBJECT_PREFIX='Hyrax Contact form:'
CONTACT_EMAIL=
FROM_EMAIL=
SMTP_PASS=
GEONAMES=
IIIF_SEARCH_ENDPOINT=
CONFIG_IIIF_IMAGE_ENDPOINT=
# If the rails server is configured to serve requests in https, set this to true
IIIF_TO_SERVE_SSL_URLS=false

# Browse Everything credentials
GOOGLE_DRIVE_CLIENT_ID=
GOOGLE_DRIVE_CLIENT_SECRET=
BOX_CLIENT_ID=
BOX_CLIENT_SECRET=

# Choose one of the following authentication methods.
# (database_authenticatable is pre-configured and useful for a development environment)
MDR_DEVISE_AUTH_MODULE=database_authenticatable
# MDR_DEVISE_AUTH_MODULE=ldap_authenticatable
# MDR_DEVISE_AUTH_MODULE=cas_authenticatable

LDAP_HOST=***REMOVED***
LDAP_PORT=443
LDAP_ATTRIBUTE=uid
LDAP_BASE=***REMOVED***
LDAP_ADMIN_USER=***REMOVED***
LDAP_ADMIN_PASSWORD=***REMOVED***
LDAP_SSL=false

SMTP_HOST=
SMTP_PORT=

MDR_HOST=

# OAI config used in config/initializers/oai_config.rb
OAI_REPOSTIORY_NAME='NIMS MDR'
OAI_REPOSITORY_URL=http://localhost:3000/catalog/oai
OAI_RECORD_PREFIX=nims_mdr
OAI_ADMIN_EMAIL=***REMOVED***

# User Authorisation LDAP (runs after database / LDAP authentication)
USER_AUTHORISATION_LDAP_HOST=
USER_AUTHORISATION_LDAP_PORT=389
USER_AUTHORISATION_LDAP_ATTRIBUTE=uid
USER_AUTHORISATION_LDAP_BASE=

WIKIBASE_BASE_URL=https://wikibase.example.jp
WIKIBASE_SPARQL_QUERY_SYNONYM=/query/example?query=some_sparql_query

AZURE_APP_ID=
AZURE_APP_SECRET=
AZURE_SCOPES='openid profile email offline_access user.read mailboxsettings.read calendars.readwrite'
AZURE_OAUTH_SITE_URL=
AZURE_OAUTH_AUTHORIZE_ENDPOINT=
AZURE_OAUTH_TOKEN_ENDPOINT=
Loading