zizia 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cab6751bf520d34f829ac16a01910b30faaf202b30b8f8d7edd0202c9b688a0
-  data.tar.gz: a756533e194b8fd985124e0025ba9361732f54afd1aa7386aaa70ccfe588e776
+  metadata.gz: 94370ebf6412c155e295ce307d1d60f7a650d12e60ad61172c869bf3054a76b3
+  data.tar.gz: 137780153f7ccb0f0dd129ca47cdf1ba82bf867ac3c7942d9af0638320a2a306
 SHA512:
-  metadata.gz: 86e73e33ab8e20c03dda68e7cc5d9a5cf537c019a5896015f9da018b2cdc973303fe36eea24b5f7c863f37530bfd1aeb420cda92c6006923d8db90e4bce08275
-  data.tar.gz: 8437e79567466450c2645ba85c69296f0436562b05d489c3e27c186aa0f24f9d7d98894225f830601cbee02507d20c2256662b5c369f305abb30b20ed9fd5a58
+  metadata.gz: 95c8b4a8bac7fc41862b6b5291122cafab5a6aae10e7e78231cfafd94e51a4dd07e84010a73fe8796e74a4f3c5e81f99df2e49b4637798242584e898682a3b36
+  data.tar.gz: f0ff9cb82e4dda1a2dbe9f63761ffc0557c20932e2fea5d9e934f280f0094eb218fba7970778cff9437834d8aed3fcf0e014794364f0b49fb5825c95b9ae6a0c

data/.circleci/config.yml

@@ -10,6 +10,9 @@ jobs:
             bundler_version:
                 type: string
                 default: 2.0.1
+            rails_version:
+                type: string
+                default: 5.1.7
         executor:
             name: samvera/ruby_fcrepo_solr_redis
             ruby_version: << parameters.ruby_version >>
@@ -17,6 +20,7 @@ jobs:
         parallelism: 1
         environment:
           COVERALLS_PARALLEL: true
+          RAILS_VERSION: << parameters.rails_version >>
         steps:
             - checkout
 
@@ -42,4 +46,8 @@ workflows:
     ci:
         jobs:
             - build:
-                name: ruby2-5-3
+                name: ruby2-5-3_with_rails_5_1
+                rails_version: 5.1.7
+            - build:
+                name: ruby2-5-3_with_rails_5_2
+                rails_version: 5.2.3

data/.github_changelog_generator

@@ -1,2 +1,2 @@
 unreleased=true
-future-release=5.1.0
+future-release=5.5.0

data/CHANGELOG.md

@@ -1,8 +1,17 @@
 # Changelog
 
-## [5.1.0](https://github.com/curationexperts/zizia/tree/5.1.0) (2019-11-14)
+## [5.5.0](https://github.com/curationexperts/zizia/tree/5.5.0) (2019-11-21)
 
-[Full Changelog](https://github.com/curationexperts/zizia/compare/v5.3.0...5.1.0)
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v5.4.0...5.5.0)
+
+**Merged pull requests:**
+
+- Add ID as secondary sort order [\#69](https://github.com/curationexperts/zizia/pull/69) ([little9](https://github.com/little9))
+- Add rails 5.2 support [\#67](https://github.com/curationexperts/zizia/pull/67) ([bess](https://github.com/bess))
+
+## [v5.4.0](https://github.com/curationexperts/zizia/tree/v5.4.0) (2019-11-14)
+
+[Full Changelog](https://github.com/curationexperts/zizia/compare/v5.3.0...v5.4.0)
 
 **Merged pull requests:**
 

data/README.md

@@ -17,7 +17,7 @@ Object import for Hyrax.
 ## Usage
 
 In your project's `Gemfile`, add: `gem 'zizia'`, then run `bundle install`.
-1. Require 'zizia' in your `config/application.rb` file: 
+1. Require 'zizia' in your `config/application.rb` file:
 
 ```
 module MyApplication
@@ -43,7 +43,7 @@ helper Zizia::Engine.helpers
     can :manage, Zizia::CsvImportDetail if current_user.admin?
 ```
 
-5. Add links to `/csv_imports/new` and `/importer_documentation/csv` in the Hyrax dashboard. 
+5. Add links to `/csv_imports/new` and `/importer_documentation/csv` in the Hyrax dashboard.
 
 6. In your Rails application's `application.css` and `application.js` include Zizia's assets:
 
@@ -53,9 +53,9 @@ helper Zizia::Engine.helpers
 
 7. Run `rake db:migrate`
 
-The `spec/dummy` folder in this application is a complete Hyrax application with Zizia installed. 
+The `spec/dummy` folder in this application is a complete Hyrax application with Zizia installed.
 You can use that as an example for adding this to your current Hyrax application or copy that
-to create a new application with Zizia installed. 
+to create a new application with Zizia installed.
 
 8. Add a deduplication_key to your default work type's medata:
 
@@ -65,7 +65,7 @@ to create a new application with Zizia installed.
   end
 ```
 
-9. If you are using the default [Hyrax metadata profile](https://samvera.github.io/metadata_application_profile.html) aka `Hyrax::BasicMetadata`, you are ready to download a sample CSV and start importing. 
+9. If you are using the default [Hyrax metadata profile](https://samvera.github.io/metadata_application_profile.html) aka `Hyrax::BasicMetadata`, you are ready to download a sample CSV and start importing.
 
 
 If you aren't using `Hyrax::BasicMedata` you'll need to create a custom `importer` and `mapper` class. First ensure that a [work type is registered](http://www.rubydoc.info/github/samvera/hyrax/Hyrax/Configuration#register_curation_concern-instance_method)
@@ -102,7 +102,7 @@ environment variables called `IMPORT_PATH`. If `IMPORT_PATH` is not set, `HyraxR
 
 ## Testing
 
-To run Solr and Fedora for testing purposes, open a new terminal session for each and run the following commads: 
+To run Solr and Fedora for testing purposes, open a new terminal session for each and run the following commads:
 
 `solr_wrapper --config spec/dummy/config/solr_wrapper_test.yml`  
 `fcrepo_wrapper --config spec/dummy/config/fcrepo_wrapper_test.yml`
@@ -126,3 +126,15 @@ cd zizia
 bundle install
 bundle exec rake ci
 ```
+
+## Releasing
+
+To make a new release:
+1. Increase the version number in `lib/zizia/version.rb`
+1. Increase the same version number in `.github_changelog_generator`
+1. Update CHANGELOG.md by running this command:
+  ```ruby
+  github_changelog_generator --user curationexperts --project zizia --token YOUR_GITHUB_TOKEN_HERE
+  ```
+1. Commit these changes to the master branch
+1. Run `rake release`

data/app/controllers/zizia/csv_import_details_controller.rb

@@ -8,11 +8,11 @@ module Zizia
     def index
       @csv_import_details = if csv_import_detail_params[:user] && user_id
                               Zizia::CsvImportDetail
-                                .order(sort_column + ' ' + sort_direction)
+                                .order("#{sort_column} #{sort_direction}, id DESC")
                                 .where(depositor_id: user_id).page csv_import_detail_params[:page]
                             else
                               Zizia::CsvImportDetail
-                                .order(sort_column + ' ' + sort_direction).page csv_import_detail_params[:page]
+                                .order("#{sort_column} #{sort_direction}, id DESC").page csv_import_detail_params[:page]
                             end
     end
 

data/lib/zizia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zizia
-  VERSION = '5.4.0'
+  VERSION = '5.5.0'
 end

data/spec/dummy/spec/system/csv_import_details_page_spec.rb

@@ -45,7 +45,7 @@ RSpec.describe 'viewing the csv import detail page', :clean, js: true do
   it 'displays the metadata when you visit the page' do
     visit ('/csv_import_details/index')
     expect(page).to have_content('ID')
-    click_on '1'
+    click_on '13'
     expect(page).to have_content('Total Size')
     expect(page).to have_content('Deduplication Key')
   end
@@ -73,7 +73,7 @@ RSpec.describe 'viewing the csv import detail page', :clean, js: true do
   it 'displays the metadata when you visit the page' do
     visit ('/csv_import_details/index')
     expect(page).to have_content('ID')
-    click_on '1'
+    click_on '13'
     expect(page).to have_content('Total Size')
   end
 
@@ -117,6 +117,7 @@ RSpec.describe 'viewing the csv import detail page', :clean, js: true do
 
   it 'has pagination for PreIngestWorks at 10' do
     visit('/csv_import_details/index')
+    click_on 'Next'
     click_on '4'
     expect(page).to have_content 'Next'
     click_on 'Next'

data/zizia.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'active-fedora'
   gem.add_dependency 'kaminari'
-  gem.add_dependency 'rails', '~> 5.1.4'
+  gem.add_dependency 'rails', '~> 5', '< 5.3'
   gem.add_dependency 'carrierwave'
   gem.add_dependency 'rails-controller-testing'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zizia
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - Data Curation Experts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -44,14 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -1569,7 +1575,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Hyrax importers.