curation_concerns 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 486de7c9666ed5692b30a092358a383d973ba26e
-  data.tar.gz: 0e6d9c42e6ac2d775beb079586d49cd29786ea1e
+  metadata.gz: 942802ebcf7c7e14d4ee9470a4a3a215af0bca4d
+  data.tar.gz: 468ff214bd88dcc7ec4d226d51974e16061fccde
 SHA512:
-  metadata.gz: 43a18393765b33bf0d05993f2a3867e572901db5f25a4f6c6a373f515fe007c857d3ad4b21bab06c161964382b52f8f2deecd36fd64ce8742cb3305da981a745
-  data.tar.gz: 9a68911a9bac50570143d18bceaf09f2b6b1e15b556c588bedd14132a12bbe6871c812014b604ebe15b071bc04659cd301c8b1493e88d215fdeeb65e1c5f97ac
+  metadata.gz: 031509db45e6bd7c1bedb70cc4be63c0cf42ef0d5516178c8462534a51c45fc0c82259ce95ab4724d0216cd7fe529f2e256dc074367096074a680b539bc810ba
+  data.tar.gz: be8bd2e85ac10c0c98b3ad0194e9f1db681028b5999ad754b97026ac15fa3fe958065115711bdd12ab57e2f77d67d4faa7ba3c9c66e3af90e8a789a34b3bb8c6

data/{CONTRIBUTING.md → .github/CONTRIBUTING.md}

@@ -61,7 +61,7 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
         class PostsController
           def index
             respond_to do |wants|
-                wants.html { render 'index' }
+              wants.html { render 'index' }
             end
           end
         end
@@ -86,12 +86,13 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
   * `git pull --rebase`
   * `git checkout <your-branch>`
   * `git rebase master`
-  * It is likely a good idea to run your tests again.
+  * It is a good idea to run your tests again.
 * If you've made more than one commit take a moment to consider whether squashing commits together would help improve their logical grouping.
   * [Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
   * `git rebase --interactive HEAD~<number-of-commits>` ([See Github help](https://help.github.com/articles/interactive-rebase))
   * To determine the number of commits on your branch: `git log master..<your-branch> --oneline | wc -l`
   * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
+
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request from your fork to the project.
 
@@ -106,9 +107,6 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 * If you are uncertain, bring other contributors into the conversation by creating a comment that includes their @username.
 * If you like the pull request, but want others to chime in, create a +1 comment and tag a user.
 
-## New Developers
-A great way to get new developers involved and to learn the process is to have them go through the Hierarchy of Promises and create a pull request to improve it.
-
 # Additional Resources
 
 * [General GitHub documentation](http://help.github.com/)

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,16 @@
+### Descriptive summary
+
+Include what version of CurationConcerns relates to this issue (0.7.x, 0.8.x, HEAD, etc.) if appropriate, and any relevant tracebacks if you're reporting a bug.
+
+### Expected behavior
+
+### Actual behavior
+
+### Steps to reproduce the behavior
+
+1. Do this
+1. Then do this...
+
+### Related work
+
+Link to related tickets or prior related work here.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,22 @@
+Fixes #issuenumber ; refs #issuenumber
+
+Present tense short summary (50 characters or less)
+
+More detailed description, if necessary. Try to be as descriptive as you can: even if you think that the PR content is obvious, it may not be obvious to others. Include tracebacks if helpful, and be sure to call out any bits of the PR that may be work-in-progress.
+
+Description can have multiple paragraphs and you can use code examples inside:
+
+``` ruby
+class PostsController
+  def index
+    respond_with Post.limit(10)
+  end
+end
+```
+
+Changes proposed in this pull request:
+* 
+* 
+* 
+
+@projecthydra/sufia-code-reviewers

data/.rubocop.yml

@@ -126,11 +126,6 @@ Style/HashSyntax:
   Exclude:
     - 'lib/generators/curation_concerns/templates/catalog_controller.rb'
 
-Style/LineEndConcatenation:
-  Exclude:
-    - 'spec/test_app_templates/lib/generators/**/*'
-    - 'curation_concerns-models/lib/generators/**/*'
-
 Style/PredicateName:
   Exclude:
     - 'app/helpers/curation_concerns/curation_concerns_helper_behavior.rb'
@@ -140,10 +135,6 @@ Style/PredicateName:
 Style/GlobalVars:
   Exclude:
     - 'spec/**/*'
-    - 'spec/jobs/event_jobs_spec.rb'
-    - 'curation_concerns-models/lib/generators/curation_concerns/models/templates/config/redis_config.rb'
-    - 'curation_concerns-models/lib/curation_concerns/models/active_record/redis.rb'
-    - 'curation_concerns-models/lib/curation_concerns/models/active_fedora/redis.rb'
 
 Style/SingleLineBlockParams:
   Enabled: false

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.10.0

data/app/presenters/curation_concerns/collection_presenter.rb

@@ -18,14 +18,14 @@ module CurationConcerns
 
     # Metadata Methods
     delegate :title, :description, :creator, :contributor, :subject, :publisher, :language,
-             :embargo_release_date, :lease_expiration_date, :rights, to: :solr_document
+             :embargo_release_date, :lease_expiration_date, :rights, :date_created, to: :solr_document
 
     def size
       number_to_human_size(@solr_document['bytes_is'])
     end
 
     def total_items
-      @solr_document['member_ids_ssim'].length
+      @solr_document.fetch('member_ids_ssim', []).length
     end
   end
 end

data/app/presenters/curation_concerns/presents_attributes.rb

@@ -10,7 +10,10 @@ module CurationConcerns
     #   you can explicitly set the URL's search field name
     # @option options [String] :label The default label for the field if no translation is found
     def attribute_to_html(field, options = {})
-      return unless respond_to?(field)
+      unless respond_to?(field)
+        Rails.logger.warn("#{self.class} attempted to render #{field}, but no method exists with that name.")
+        return
+      end
       AttributeRenderer.new(field, send(field), options).render
     end
 

data/app/views/curation_concerns/base/_attributes.html.erb

@@ -5,14 +5,9 @@
   </thead>
   <tbody>
     <%= render 'attribute_rows', presenter: presenter %>
-  <tr>
-    <th>Visibility</th>
-    <td>
-      <%= presenter.permission_badge %>
-    </td>
-  </tr>
-  <%= presenter.attribute_to_html(:embargo_release_date) %>
-  <%= presenter.attribute_to_html(:lease_expiration_date) %>
-  <%= presenter.attribute_to_html(:rights) %>
+    <%= presenter.attribute_to_html(:permission_badge, label: 'Visibility') %>
+    <%= presenter.attribute_to_html(:embargo_release_date) %>
+    <%= presenter.attribute_to_html(:lease_expiration_date) %>
+    <%= presenter.attribute_to_html(:rights) %>
   </tbody>
 </table>

data/app/views/curation_concerns/base/_show_actions.html.erb

@@ -8,7 +8,7 @@
     <% end %>
     <% if collector %>
       <%= render 'collections/add_to_collection_modal', collectible: @presenter %>
-      <%= link_to_select_collection @presenter, class: 'btn btn-primary' %>
+      <%= link_to_select_collection @presenter, class: 'btn btn-default' %>
     <% end %>
   </div>
 <% end %>

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.9.0".freeze
+  VERSION = "0.10.0".freeze
 end

data/lib/generators/curation_concerns/work/templates/form.rb.erb

@@ -5,4 +5,3 @@ module CurationConcerns
     self.model_class = ::<%= class_name %>
   end
 end
-

data/lib/generators/curation_concerns/work/templates/form_spec.rb.erb

@@ -7,4 +7,3 @@ describe CurationConcerns::<%= class_name %>Form do
     skip "Add your tests here"
   end
 end
-

data/lib/generators/curation_concerns/work/work_generator.rb

@@ -65,7 +65,7 @@ class CurationConcerns::WorkGenerator < Rails::Generators::NamedBase
   end
 
   def create_views
-    create_file "app/views/#{plural_file_name}/_#{file_name}.html.erb" do
+    create_file "app/views/curation_concerns/#{plural_file_name}/_#{file_name}.html.erb" do
       "<%# This is a search result view %>\n" \
       "<%= render 'catalog/document', document: #{file_name}, document_counter: #{file_name}_counter  %>\n"
     end

data/spec/indexers/work_indexer_spec.rb

@@ -21,4 +21,13 @@ describe CurationConcerns::WorkIndexer do
     expect(subject['generic_type_sim']).to eq ['Work']
     expect(subject.fetch('thumbnail_path_ss')).to eq "/downloads/#{file.id}?file=thumbnail"
   end
+
+  context "when thumbnail_field is configured" do
+    before do
+      service.thumbnail_field = 'thumbnail_url_ss'
+    end
+    it "uses the configured field" do
+      expect(subject.fetch('thumbnail_url_ss')).to eq "/downloads/#{file.id}?file=thumbnail"
+    end
+  end
 end

data/spec/models/generic_work_spec.rb

@@ -44,7 +44,7 @@ describe GenericWork do
   describe '#to_partial_path' do
     let(:work) { described_class.new }
     subject { work.to_partial_path }
-    it { is_expected.to eq 'generic_works/generic_work' }
+    it { is_expected.to eq 'curation_concerns/generic_works/generic_work' }
   end
 
   describe "#destroy" do

data/spec/presenters/curation_concerns/collection_presenter_spec.rb

@@ -5,7 +5,8 @@ describe CurationConcerns::CollectionPresenter do
     build(:collection,
           id: 'adc12v',
           description: ['a nice collection'],
-          title: ['A clever title'])
+          title: ['A clever title'],
+          date_created: ['some date'])
   end
   let(:work) { build(:work, title: ['unimaginitive title']) }
   let(:solr_document) { SolrDocument.new(collection.to_solr) }
@@ -39,5 +40,14 @@ describe CurationConcerns::CollectionPresenter do
       before { collection.members << work }
       it { is_expected.to eq 1 }
     end
+    context "null members" do
+      let(:presenter) { described_class.new({}, nil) }
+      it { is_expected.to eq 0 }
+    end
+  end
+
+  describe "#date_created" do
+    subject { presenter.date_created }
+    it { is_expected.to eq 'some date' }
   end
 end

data/spec/presenters/curation_concerns/work_show_presenter_spec.rb

@@ -8,7 +8,7 @@ describe CurationConcerns::WorkShowPresenter do
     { "title_tesim" => ["foo bar"],
       "human_readable_type_tesim" => ["Generic Work"],
       "has_model_ssim" => ["GenericWork"],
-      "date_created_dtsi" => date_index,
+      "date_created_tesim" => ['an unformatted date'],
       "date_modified_dtsi" => date_index,
       "date_uploaded_dtsi" => date_index }
   end
@@ -31,7 +31,12 @@ describe CurationConcerns::WorkShowPresenter do
     it { is_expected.to be_kind_of ActiveModel::Name }
   end
 
-  [:date_created, :date_modified, :date_uploaded].each do |date_field|
+  describe "#date_created" do
+    subject { presenter.date_created }
+    it { is_expected.to eq('an unformatted date') }
+  end
+
+  [:date_modified, :date_uploaded].each do |date_field|
     describe "##{date_field}" do
       subject { presenter.send date_field }
       it { is_expected.to eq date_value.to_formatted_s(:standard) }
@@ -69,4 +74,29 @@ describe CurationConcerns::WorkShowPresenter do
       end
     end
   end
+
+  describe "#attribute_to_html" do
+    let(:presenter) { described_class.new(solr_document, ability) }
+    let(:renderer) { double('renderer') }
+
+    context 'with an existing field' do
+      before do
+        allow(CurationConcerns::AttributeRenderer).to receive(:new)
+          .with(:title, "foo bar", {})
+          .and_return(renderer)
+      end
+
+      it "calls the AttributeRenderer" do
+        expect(renderer).to receive(:render)
+        presenter.attribute_to_html(:title)
+      end
+    end
+
+    context "with a field that doesn't exist" do
+      it "logs a warning" do
+        expect(Rails.logger).to receive(:warn).with('CurationConcerns::WorkShowPresenter attempted to render restrictions, but no method exists with that name.')
+        presenter.attribute_to_html(:restrictions)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: hydra-editor
   requirement: !ruby/object:Gem::Requirement
@@ -398,11 +398,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CONTRIBUTING.md"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
-- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md