curation_concerns 0.14.0.pre4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f26ce391fb38ff166cbb42ab25a0672e00c4afb
-  data.tar.gz: 147ccb6fca4723a76d739f63209605c6fc60dab1
+  metadata.gz: 7127b05e9a9109e92a2781d2e82010ebfc58bd40
+  data.tar.gz: b646ef71a42e4fcd0debd50953cd189cfcbcc7ee
 SHA512:
-  metadata.gz: a6e502b77d4b2dceb8516c696bc0a79325eab35f666b642d279a329109cce3924973ccd489c214a084449130aad4f391f781c0f153f73b785c8dd94901821fb1
-  data.tar.gz: 34ecae91255788a87ff51aff846b1ecdaba2c68eb9456bec585a08315a8a6256e9ef9aa1d1424766ec79b262f5301831bb6be222791e9d63de91511103340cfa
+  metadata.gz: 67ac875f8235ed5dfc2bbe3826c8fa4bd223e40d84051774f509432c65111514f4bf3eedbd9a60b87881dba9c331c0c2aeb51eb17800c8f6ed0c82cee8993541
+  data.tar.gz: dbc29e4c2628fec8e03c5f79adf694b115c951266bc6ed809e22c398a07b619e2f945f619dd46daffb6300e917ddc13b2e295ff3beeaaed8eedb6dfe21bd106c

data/.rubocop.yml

@@ -9,25 +9,13 @@ AllCops:
     - 'script/**/*'
     - 'vendor/**/*'
     - '.internal_test_app/**/*'
-    - 'app/models/concerns/curation_concerns/file_set/export.rb'
 
 Rails:
   Enabled: true
 
-Performance/RedundantBlockCall:
-  # We can remove this exclusion when this commit is released:
-  # https://github.com/bbatsov/rubocop/commit/7df382531db4f66cd9872a4f478bd486d6ce6712
-  Exclude:
-    - 'lib/curation_concerns/null_logger.rb'
-
 Performance/RedundantMerge:
   Enabled: false
 
-Lint/AssignmentInCondition:
-  Exclude:
-    - 'app/services/curation_concerns/persist_derivatives.rb'
-    - 'app/actors/curation_concerns/file_set_actor.rb'
-
 Metrics/LineLength:
   Enabled: false
 
@@ -38,18 +26,11 @@ Metrics/CyclomaticComplexity:
   Exclude:
     - 'app/services/curation_concerns/file_set_audit_service.rb'
     - 'app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb'
-    - 'app/helpers/curation_concerns/curation_concerns_helper_behavior.rb'
-    - 'app/helpers/curation_concerns/attribute_helper.rb'
-    - 'app/actors/curation_concerns/file_set_actor.rb'
-    - 'app/actors/curation_concerns/work_actor_behavior.rb'
 
 Metrics/PerceivedComplexity:
   Exclude:
     - 'app/services/curation_concerns/file_set_audit_service.rb'
     - 'app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb'
-    - 'app/helpers/curation_concerns/curation_concerns_helper_behavior.rb'
-    - 'app/helpers/curation_concerns/attribute_helper.rb'
-    - 'app/actors/curation_concerns/file_set_actor.rb'
 
 Metrics/MethodLength:
   Enabled: false
@@ -63,10 +44,7 @@ Metrics/ClassLength:
 Metrics/ModuleLength:
   Exclude:
     - 'app/controllers/concerns/curation_concerns/curation_concern_controller.rb'
-    - 'app/controllers/concerns/curation_concerns/users_controller_behavior.rb'
-    - 'app/controllers/concerns/curation_concerns/catalog_controller.rb'
     - 'app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb'
-    - 'app/helpers/curation_concerns/curation_concerns_helper_behavior.rb'
     - 'app/models/concerns/curation_concerns/solr_document_behavior.rb'
     - 'app/controllers/concerns/curation_concerns/collections_controller_behavior.rb'
 
@@ -129,9 +107,6 @@ Style/HashSyntax:
 
 Style/PredicateName:
   Exclude:
-    - 'app/helpers/curation_concerns/curation_concerns_helper_behavior.rb'
-    - 'app/controllers/concerns/curation_concerns/controller.rb'
-    - 'app/helpers/curation_concerns/collections_helper.rb'
     - 'app/helpers/curation_concerns/collections_helper_behavior.rb'
 
 Style/GlobalVars:

data/README.md

@@ -25,8 +25,6 @@ Curation Concerns requires the following software to work:
 
 ## Installation
 
-Checkout the dependencies for [curation_concerns-models](https://github.com/projecthydra-labs/curation_concerns/tree/master/curation_concerns-models#dependencies), which is installed as part of curation_concerns.
-
 Add this line to your application's Gemfile:
 
     gem 'curation_concerns'
@@ -40,10 +38,10 @@ Then run the install generator.  You will be prompted if you want to overwrite t
     $ rails generate curation_concerns:install
     $ rake db:migrate
 
-### FITS 0.6.2
+### FITS 0.8.5
 
 To install FITS:
- * Go to http://projects.iq.harvard.edu/fits/downloads, download __fits-0.6.2.zip__, and unpack it somewhere on your machine. You can also install FITS on OSX with homebrew: `brew install fits` (you may also have to create a symlink from fits.sh -> fits in the next step).
+ * Go to http://projects.iq.harvard.edu/fits/downloads, download __fits-0.8.5.zip__, and unpack it somewhere on your machine. You can also install FITS on OSX with homebrew: `brew install fits` (you may also have to create a symlink from fits.sh -> fits in the next step).
  * Mark fits.sh as executable (chmod a+x fits.sh)
  * Run "fits.sh -h" from the command line and see a help message to ensure FITS is properly installed
  * Give your app access to FITS by:

data/app/actors/curation_concerns/base_actor.rb

@@ -50,7 +50,7 @@ module CurationConcerns
       end
 
       def apply_save_data_to_curation_concern(attributes)
-        attributes[:rights] = Array(attributes[:rights]) if attributes.key? :rights
+        attributes[:rights] = Array.wrap(attributes[:rights]) if attributes.key? :rights
         remove_blank_attributes!(attributes)
         curation_concern.attributes = attributes.symbolize_keys
         curation_concern.date_modified = CurationConcerns::TimeService.time_in_utc

data/app/forms/curation_concerns/forms/work_form.rb

@@ -56,7 +56,7 @@ module CurationConcerns
         # Overriden to cast 'rights' to an array
         def sanitize_params(form_params)
           super.tap do |params|
-            params['rights'] = Array(params['rights']) if params.key?('rights')
+            params['rights'] = Array.wrap(params['rights']) if params.key?('rights')
           end
         end
       end

data/app/models/concerns/curation_concerns/file_set/indexing.rb

@@ -3,11 +3,10 @@ module CurationConcerns
     module Indexing
       extend ActiveSupport::Concern
 
-      module ClassMethods
-        # override the default indexing service
-        def indexer
-          CurationConcerns::FileSetIndexer
-        end
+      included do
+        class_attribute :indexer
+        # the default indexing service
+        self.indexer = CurationConcerns::FileSetIndexer
       end
     end
   end

data/app/models/concerns/curation_concerns/serializers.rb

@@ -2,9 +2,9 @@ module CurationConcerns
   module Serializers
     def to_s
       if title.present?
-        Array(title).join(' | ')
+        Array.wrap(title).join(' | ')
       elsif label.present?
-        Array(label).join(' | ')
+        Array.wrap(label).join(' | ')
       else
         'No Title'
       end

data/app/models/concerns/curation_concerns/solr_document_behavior.rb

@@ -37,7 +37,7 @@ module CurationConcerns
     end
 
     def human_readable_type
-      Array(self[Solrizer.solr_name('human_readable_type', :stored_searchable)]).first
+      Array.wrap(self[Solrizer.solr_name('human_readable_type', :stored_searchable)]).first
     end
 
     def representative_id
@@ -58,24 +58,24 @@ module CurationConcerns
     end
 
     def depositor(default = '')
-      val = Array(self[Solrizer.solr_name('depositor')]).first
+      val = Array.wrap(self[Solrizer.solr_name('depositor')]).first
       val.present? ? val : default
     end
 
     def title
-      Array(self[Solrizer.solr_name('title')]).first
+      Array.wrap(self[Solrizer.solr_name('title')]).first
     end
 
     def description
-      Array(self[Solrizer.solr_name('description')]).first
+      Array.wrap(self[Solrizer.solr_name('description')]).first
     end
 
     def label
-      Array(self[Solrizer.solr_name('label')]).first
+      Array.wrap(self[Solrizer.solr_name('label')]).first
     end
 
     def file_format
-      Array(self[Solrizer.solr_name('file_format')]).first
+      Array.wrap(self[Solrizer.solr_name('file_format')]).first
     end
 
     def creator

data/app/models/concerns/curation_concerns/work_behavior.rb

@@ -17,14 +17,11 @@ module CurationConcerns::WorkBehavior
 
   included do
     property :owner, predicate: RDF::URI.new('http://opaquenamespace.org/ns/hydra/owner'), multiple: false
-    class_attribute :human_readable_short_description
+    class_attribute :human_readable_short_description, :indexer
+    self.indexer = CurationConcerns::WorkIndexer
   end
 
   module ClassMethods
-    def indexer
-      CurationConcerns::WorkIndexer
-    end
-
     # This governs which partial to draw when you render this type of object
     def _to_partial_path #:nodoc:
       @_to_partial_path ||= begin
@@ -37,7 +34,7 @@ module CurationConcerns::WorkBehavior
 
   def to_s
     if title.present?
-      Array(title).join(' | ')
+      Array.wrap(title).join(' | ')
     else
       'No Title'
     end

data/app/presenters/curation_concerns/file_set_presenter.rb

@@ -25,11 +25,11 @@ module CurationConcerns
              :depositor, :tags, :title_or_label, to: :solr_document
 
     def page_title
-      Array(solr_document['label_tesim']).first
+      Array.wrap(solr_document['label_tesim']).first
     end
 
     def link_name
-      current_ability.can?(:read, id) ? Array(solr_document['label_tesim']).first : 'File'
+      current_ability.can?(:read, id) ? Array.wrap(solr_document['label_tesim']).first : 'File'
     end
   end
 end

data/app/renderers/curation_concerns/attribute_renderer.rb

@@ -25,7 +25,7 @@ module CurationConcerns
       return markup if !values.present? && !options[:include_empty]
       markup << %(<tr><th>#{label}</th>\n<td><ul class='tabular'>)
       attributes = microdata_object_attributes(field).merge(class: "attribute #{field}")
-      Array(values).each do |value|
+      Array.wrap(values).each do |value|
         markup << "<li#{html_attributes(attributes)}>#{attribute_value_to_html(value.to_s)}</li>"
       end
       markup << %(</ul></td></tr>)

data/app/search_builders/curation_concerns/filter_by_type.rb

@@ -22,14 +22,14 @@ module CurationConcerns
       end
 
       def work_clauses
-        return [] if blacklight_params.key?(:f) && Array(blacklight_params[:f][:generic_type_sim]).include?('Collection')
+        return [] if blacklight_params.key?(:f) && Array.wrap(blacklight_params[:f][:generic_type_sim]).include?('Collection')
         work_types.map do |klass|
           ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: klass.to_class_uri)
         end
       end
 
       def collection_clauses
-        return [] if blacklight_params.key?(:f) && Array(blacklight_params[:f][:generic_type_sim]).include?('Work')
+        return [] if blacklight_params.key?(:f) && Array.wrap(blacklight_params[:f][:generic_type_sim]).include?('Work')
         [ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::Collection.to_class_uri)]
       end
   end

data/app/services/rights_service.rb

@@ -3,12 +3,14 @@ module RightsService
   self.authority = Qa::Authorities::Local.subauthority_for('rights')
 
   def self.select_options
-    authority.all.map do |element|
-      [element[:label], element[:id]]
-    end
+    active_elements.map { |e| [e[:label], e[:id]] }
   end
 
   def self.label(id)
     authority.find(id).fetch('term')
   end
+
+  def self.active_elements
+    authority.all.select { |e| authority.find(e[:id])[:active] }
+  end
 end

data/lib/curation_concerns/configuration.rb

@@ -142,7 +142,7 @@ module CurationConcerns
     # Registers the given curation concern model in the configuration
     # @param [Array<Symbol>,Symbol] curation_concern_types
     def register_curation_concern(*curation_concern_types)
-      Array(curation_concern_types).flatten.compact.each do |cc_type|
+      Array.wrap(curation_concern_types).flatten.compact.each do |cc_type|
         unless @registered_concerns.include?(cc_type)
           @registered_concerns << cc_type
         end

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.14.0.pre4".freeze
+  VERSION = "0.14.0".freeze
 end

data/lib/generators/curation_concerns/templates/config/authorities/rights.yml

@@ -1,19 +1,28 @@
 terms:
     - id: http://creativecommons.org/licenses/by/3.0/us/
       term: Attribution 3.0 United States
+      active: true
     - id: http://creativecommons.org/licenses/by-sa/3.0/us/
       term: Attribution-ShareAlike 3.0 United States
+      active: true
     - id: http://creativecommons.org/licenses/by-nc/3.0/us/
       term: Attribution-NonCommercial 3.0 United States
+      active: true
     - id: http://creativecommons.org/licenses/by-nd/3.0/us/
       term: Attribution-NoDerivs 3.0 United States
+      active: true
     - id: http://creativecommons.org/licenses/by-nc-nd/3.0/us/
       term: Attribution-NonCommercial-NoDerivs 3.0 United States
+      active: true
     - id: http://creativecommons.org/licenses/by-nc-sa/3.0/us/
       term: Attribution-NonCommercial-ShareAlike 3.0 United States
+      active: true
     - id: http://creativecommons.org/publicdomain/mark/1.0/
       term: Public Domain Mark 1.0
+      active: true
     - id: http://creativecommons.org/publicdomain/zero/1.0/
       term: CC0 1.0 Universal
+      active: true
     - id: http://www.europeana.eu/portal/rights/rr-r.html
       term: All rights reserved
+      active: true

data/spec/models/curation_concerns/work_behavior_spec.rb

@@ -12,7 +12,7 @@ describe CurationConcerns::WorkBehavior do
 
   subject { EssentialWork.new }
 
-  it 'mixs together all the goodness' do
+  it 'mixes together all the goodness' do
     [::CurationConcerns::WithFileSets, ::CurationConcerns::HumanReadableType, CurationConcerns::Noid, CurationConcerns::Serializers, Hydra::WithDepositor, Hydra::AccessControls::Embargoable, Solrizer::Common].each do |mixin|
       expect(subject.class.ancestors).to include(mixin)
     end
@@ -38,4 +38,12 @@ describe CurationConcerns::WorkBehavior do
     expect(subject.to_solr.keys).to include(:id)
     expect(subject.to_solr.keys).to include('has_model_ssim')
   end
+
+  describe 'indexer' do
+    let(:klass) { Class.new }
+    it 'is settable' do
+      EssentialWork.indexer = klass
+      expect(subject.indexer).to eq klass
+    end
+  end
 end

data/spec/models/file_set_spec.rb

@@ -27,7 +27,7 @@ describe FileSet do
   context 'when it is initialized' do
     it 'has empty arrays for all the properties' do
       subject.attributes.each do |_k, v|
-        expect(Array(v)).to eq([])
+        expect(Array.wrap(v)).to eq([])
       end
     end
   end
@@ -148,6 +148,23 @@ describe FileSet do
   describe '#indexer' do
     subject { described_class.indexer }
     it { is_expected.to eq CurationConcerns::FileSetIndexer }
+
+    describe "setting" do
+      before do
+        class AltFile < ActiveFedora::Base
+          include CurationConcerns::FileSetBehavior
+        end
+      end
+      after do
+        Object.send(:remove_const, :AltFile)
+      end
+      let(:klass) { Class.new }
+      subject { AltFile.new }
+      it 'is settable' do
+        AltFile.indexer = klass
+        expect(subject.indexer).to eq klass
+      end
+    end
   end
 
   it 'supports multi-valued fields in solr' do

data/spec/services/rights_service_spec.rb

@@ -1,17 +1,29 @@
 require 'spec_helper'
 
 describe RightsService do
-  describe "select_options" do
-    subject { described_class.select_options }
+  before do
+    # Configure QA to use fixtures
+    qa_fixtures = { local_path: File.expand_path('../../fixtures/authorities', __FILE__) }
+    stub_const("Qa::Authorities::LocalSubauthority::AUTHORITIES_CONFIG", qa_fixtures)
+  end
+
+  describe "#select_options" do
+    it "returns active terms" do
+      expect(described_class.select_options).to include(["First Active Term", "demo_id_01"], ["Second Active Term", "demo_id_02"])
+    end
 
-    it "has a select list" do
-      expect(subject.first).to eq ["Attribution 3.0 United States", "http://creativecommons.org/licenses/by/3.0/us/"]
+    it "does not return inactive terms" do
+      expect(described_class.select_options).not_to include(["Third is an Inactive Term", "demo_id_03"], ["Fourth is an Inactive Term", "demo_id_04"])
     end
   end
 
-  describe "label" do
-    subject { described_class.label("http://www.europeana.eu/portal/rights/rr-r.html") }
+  describe "#label" do
+    it "resolves for ids of active terms" do
+      expect(described_class.label('demo_id_01')).to eq("First Active Term")
+    end
 
-    it { is_expected.to eq 'All rights reserved' }
+    it "resolves for ids of inactive terms" do
+      expect(described_class.label('demo_id_03')).to eq("Third is an Inactive Term")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.14.0.pre4
+  version: 0.14.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -1211,9 +1211,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1