curation_concerns 0.10.0 → 0.11.0.rc1

data/spec/search_builders/curation_concerns/file_set_search_builder_spec.rb

@@ -12,7 +12,7 @@ describe CurationConcerns::FileSetSearchBuilder do
     before { subject.only_file_sets(solr_params) }
 
     it 'adds FileSet to query' do
-      expect(solr_params[:fq].first).to include('{!raw f=has_model_ssim}FileSet')
+      expect(solr_params[:fq].first).to include('{!field f=has_model_ssim}FileSet')
     end
   end
 
@@ -23,7 +23,7 @@ describe CurationConcerns::FileSetSearchBuilder do
     end
 
     it 'adds id to query' do
-      expect(solr_params[:fq].first).to include('{!raw f=id}12345')
+      expect(solr_params[:fq].first).to include('{!field f=id}12345')
     end
   end
 end

data/spec/search_builders/curation_concerns/search_builder_spec.rb

@@ -32,10 +32,23 @@ describe CurationConcerns::SearchBuilder do
   end
 
   describe '#filter_models' do
-    before { subject.filter_models(solr_params) }
+    context "with default work types" do
+      before { subject.filter_models(solr_params) }
 
-    it 'limits query to collection and generic work' do
-      expect(solr_params[:fq].first).to match(/{!raw f=has_model_ssim}GenericWork.*OR.*{!raw f=has_model_ssim}Collection/)
+      it 'limits query to collection and generic work' do
+        expect(solr_params[:fq].first).to match(/{!field f=has_model_ssim}GenericWork.*OR.*{!field f=has_model_ssim}Collection/)
+      end
+    end
+
+    context 'when work_types is overridden' do
+      before do
+        allow(subject).to receive(:work_types).and_return([FileSet])
+        subject.filter_models(solr_params)
+      end
+
+      it "doesn't have GenericWork" do
+        expect(solr_params[:fq].first).not_to match(/{!field f=has_model_ssim}GenericWork/)
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-if ENV['CI']
+if ENV['CI'] || ENV['COVERAGE']
   require 'coveralls'
   Coveralls.wear!
 end
@@ -29,7 +29,7 @@ if ENV['COVERAGE'] || $in_travis
   require 'simplecov'
 
   SimpleCov.root(File.expand_path('../..', __FILE__))
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.formatters = $in_travis ? Coveralls::SimpleCov::Formatter : SimpleCov::Formatter::HTMLFormatter
   SimpleCov.start('rails') do
     add_filter '/spec'
     add_filter '/lib/generators/curation_concerns/templates'

data/spec/test_app_templates/Gemfile.extra

@@ -1,5 +1,4 @@
 # placeholder to use for pinning against specific gem commit references
-gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'
 
 group :development do
   gem 'better_errors'

data/spec/views/curation_concerns/{file_sets/_file_set.html.erb_spec.rb → base/_member.html.erb_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'curation_concerns/file_sets/_file_set.html.erb' do
+describe 'curation_concerns/base/_member.html.erb' do
   let(:solr_document) { SolrDocument.new(id: '999',
                                          has_model_ssim: ['FileSet'],
                                          active_fedora_model_ssi: 'FileSet',
@@ -25,7 +25,7 @@ describe 'curation_concerns/file_sets/_file_set.html.erb' do
     allow(view).to receive(:can?).with(:read, kind_of(String)).and_return(true)
     allow(view).to receive(:can?).with(:edit, kind_of(String)).and_return(true)
     allow(view).to receive(:can?).with(:destroy, String).and_return(true)
-    render 'curation_concerns/file_sets/file_set.html.erb', file_set: presenter
+    render 'curation_concerns/base/member.html.erb', member: presenter
   end
 
   it 'renders the view' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0.rc1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.6'
+        version: '9.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.6'
+        version: '9.9'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0.rc1
 - !ruby/object:Gem::Dependency
   name: hydra-editor
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +152,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari_route_prefix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -405,6 +419,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -526,6 +541,7 @@ files:
 - app/search_builders/curation_concerns/filter_by_type.rb
 - app/search_builders/curation_concerns/lease_search_builder.rb
 - app/search_builders/curation_concerns/search_builder.rb
+- app/search_builders/curation_concerns/search_filters.rb
 - app/search_builders/curation_concerns/single_result.rb
 - app/search_builders/curation_concerns/single_use_link_search_builder.rb
 - app/search_builders/curation_concerns/work_search_builder.rb
@@ -583,7 +599,7 @@ files:
 - app/views/curation_concerns/base/_file_manager_thumbnail.html.erb
 - app/views/curation_concerns/base/_form.html.erb
 - app/views/curation_concerns/base/_form_additional_information.html.erb
-- app/views/curation_concerns/base/_form_descriptive_fields.erb
+- app/views/curation_concerns/base/_form_descriptive_fields.html.erb
 - app/views/curation_concerns/base/_form_files_and_links.html.erb
 - app/views/curation_concerns/base/_form_media.html.erb
 - app/views/curation_concerns/base/_form_permission.html.erb
@@ -598,6 +614,7 @@ files:
 - app/views/curation_concerns/base/_form_supplementary_fields.html.erb
 - app/views/curation_concerns/base/_form_thumbnail.html.erb
 - app/views/curation_concerns/base/_legally_binding_text.html.erb
+- app/views/curation_concerns/base/_member.html.erb
 - app/views/curation_concerns/base/_multiple_upload.html.erb
 - app/views/curation_concerns/base/_related_files.html.erb
 - app/views/curation_concerns/base/_representative_media.html.erb
@@ -614,7 +631,6 @@ files:
 - app/views/curation_concerns/classify_concerns/new.html.erb
 - app/views/curation_concerns/collections/_form_additional_information.html.erb
 - app/views/curation_concerns/file_sets/_actions.html.erb
-- app/views/curation_concerns/file_sets/_file_set.html.erb
 - app/views/curation_concerns/file_sets/_form.html.erb
 - app/views/curation_concerns/file_sets/_rights_modal.html.erb
 - app/views/curation_concerns/file_sets/_show_actions.html.erb
@@ -678,11 +694,11 @@ files:
 - lib/curation_concerns/callbacks/registry.rb
 - lib/curation_concerns/controller_resource.rb
 - lib/curation_concerns/engine.rb
-- lib/curation_concerns/form_builder.rb
 - lib/curation_concerns/rails/routes.rb
 - lib/curation_concerns/single_use_error.rb
 - lib/curation_concerns/spec_support.rb
 - lib/curation_concerns/version.rb
+- lib/generators/curation_concerns/assets_generator.rb
 - lib/generators/curation_concerns/install_generator.rb
 - lib/generators/curation_concerns/templates/catalog_controller.rb
 - lib/generators/curation_concerns/templates/config/authorities/resource_types.yml
@@ -696,6 +712,7 @@ files:
 - lib/generators/curation_concerns/work/templates/actor_spec.rb.erb
 - lib/generators/curation_concerns/work/templates/controller.rb.erb
 - lib/generators/curation_concerns/work/templates/controller_spec.rb.erb
+- lib/generators/curation_concerns/work/templates/feature_spec.rb.erb
 - lib/generators/curation_concerns/work/templates/form.rb.erb
 - lib/generators/curation_concerns/work/templates/form_spec.rb.erb
 - lib/generators/curation_concerns/work/templates/model.rb.erb
@@ -784,7 +801,6 @@ files:
 - spec/javascripts/save_manager_spec.coffee
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_helper.rb
-- spec/jobs/active_fedora_id_based_job_spec.rb
 - spec/jobs/audit_job_spec.rb
 - spec/jobs/characterize_job_spec.rb
 - spec/jobs/create_derivatives_job_spec.rb
@@ -861,11 +877,11 @@ files:
 - spec/views/collections/_sort_and_per_page.html.erb_spec.rb
 - spec/views/curation_concerns/base/_attributes.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb
+- spec/views/curation_concerns/base/_member.html.erb_spec.rb
 - spec/views/curation_concerns/base/_show_actions.html.erb_spec.rb
 - spec/views/curation_concerns/base/file_manager.html.erb_spec.rb
 - spec/views/curation_concerns/base/show.html.erb_spec.rb
 - spec/views/curation_concerns/base/show.json.jbuilder_spec.rb
-- spec/views/curation_concerns/file_sets/_file_set.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/show.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/show.json.jbuilder_spec.rb
 - spec/views/curation_concerns/permissions/confirm.html.erb_spec.rb
@@ -880,12 +896,12 @@ files:
 - tasks/release.rake
 - vendor/assets/images/ui-bg_glass_100_fdf5ce_1x400.png
 - vendor/assets/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
-- vendor/assets/javascrips/fileupload/jquery.fileupload-process.js
-- vendor/assets/javascrips/fileupload/jquery.fileupload-ui.js
-- vendor/assets/javascrips/fileupload/jquery.fileupload-validate.js
-- vendor/assets/javascrips/fileupload/jquery.fileupload.js
-- vendor/assets/javascrips/fileupload/locale.js
-- vendor/assets/javascrips/fileupload/tmpl.js
+- vendor/assets/javascripts/fileupload/jquery.fileupload-process.js
+- vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js
+- vendor/assets/javascripts/fileupload/jquery.fileupload-validate.js
+- vendor/assets/javascripts/fileupload/jquery.fileupload.js
+- vendor/assets/javascripts/fileupload/locale.js
+- vendor/assets/javascripts/fileupload/tmpl.js
 homepage: ''
 licenses:
 - APACHE2
@@ -901,9 +917,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -978,7 +994,6 @@ test_files:
 - spec/javascripts/save_manager_spec.coffee
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_helper.rb
-- spec/jobs/active_fedora_id_based_job_spec.rb
 - spec/jobs/audit_job_spec.rb
 - spec/jobs/characterize_job_spec.rb
 - spec/jobs/create_derivatives_job_spec.rb
@@ -1055,11 +1070,11 @@ test_files:
 - spec/views/collections/_sort_and_per_page.html.erb_spec.rb
 - spec/views/curation_concerns/base/_attributes.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb
+- spec/views/curation_concerns/base/_member.html.erb_spec.rb
 - spec/views/curation_concerns/base/_show_actions.html.erb_spec.rb
 - spec/views/curation_concerns/base/file_manager.html.erb_spec.rb
 - spec/views/curation_concerns/base/show.html.erb_spec.rb
 - spec/views/curation_concerns/base/show.json.jbuilder_spec.rb
-- spec/views/curation_concerns/file_sets/_file_set.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/show.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/show.json.jbuilder_spec.rb
 - spec/views/curation_concerns/permissions/confirm.html.erb_spec.rb

data/app/views/curation_concerns/file_sets/_file_set.html.erb

@@ -1,12 +0,0 @@
-<tr class="<%= dom_class(file_set) %> attributes">
-  <td class="thumbnail">
-    <%= render_thumbnail_tag file_set %>
-  </td>
-  <td class="attribute filename"><%= link_to(file_set.link_name, main_app.curation_concerns_file_set_path(file_set)) %></td>
-  <td class="attribute date_uploaded"><%= file_set.date_uploaded %></td>
-  <td class="attribute permission"><%= file_set.permission_badge %></td>
-  <td>
-    <%= render 'curation_concerns/file_sets/actions', file_set: file_set %>
-  </td>
-</tr>
-

data/lib/curation_concerns/form_builder.rb

@@ -1,16 +0,0 @@
-module CurationConcerns
-  class FormBuilder < SimpleForm::FormBuilder
-    def input_label(attribute_name, options = {})
-      options = options.dup
-      options[:input_html] = options.except(:as, :boolean_style, :collection, :label_method, :value_method, *ATTRIBUTE_COMPONENTS)
-      options = @defaults.deep_dup.deep_merge(options) if @defaults
-
-      input      = find_input(attribute_name, options)
-      wrapper    = find_wrapper(input.input_type, options)
-      components = (wrapper.components.map(&:namespace) & ATTRIBUTE_COMPONENTS) + [:input]
-      components.map { |component| SimpleForm::Wrappers::Leaf.new(component) }
-
-      input.label.html_safe
-    end
-  end
-end

data/spec/jobs/active_fedora_id_based_job_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe ActiveFedoraIdBasedJob do
-  let(:file_set) { FileSet.new }
-  let(:file_set_id) { 'abc123' }
-
-  before do
-    allow(ActiveFedora::Base).to receive(:find).with(file_set_id).and_return(file_set)
-  end
-
-  it 'finds object' do
-    job = described_class.new
-    job.id = file_set_id
-    expect(job.file_set).to eq file_set
-  end
-end