worthwhile 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c58026a32aa117482c5e835c44345fe584aab5
-  data.tar.gz: 4f92bd0400af9f3ba865912f05cd449296879683
+  metadata.gz: e7a0bdc8caa976082ae459f78c1eae0d5522c746
+  data.tar.gz: 15a19ca1cca304cc6e6f4db164668b8ac78556f8
 SHA512:
-  metadata.gz: 35ff3444a2217820c5c0e8809b47d6679d18ad985cf132a5ce1580ba15906aed9cec2fa5a49a9673c736e46fde8e1c2a6126ae6473a2f1c0506cfeb0d5c94b31
-  data.tar.gz: d14bf772ef5c92cf1c37b8434d17ca5d26fe9cddc3adf2fc5e33fe4906b1813ca7dbc124f8329b2d717c630c4816279d4651d09c4925e94fe55eb2125a22ad54
+  metadata.gz: 9b08b1d3e9a7ac35ed78b6cbd14d152d0f6a3326b7e911277c3c9e7d16563dc2066f79db07a66160ce7be8a8bafbec08f399e17830f7715238bbb3f3ed153e10
+  data.tar.gz: 8a446c13f86117ef8b8ddf1405c39138afa589b0d0036d56efe40c478e43567199339998b97537a8bc8a5e9a1f24967242ea02df73f0a2d65ea756f7b425f6d8

data/app/controllers/concerns/worthwhile/curation_concern_controller.rb

@@ -107,6 +107,7 @@ module Worthwhile::CurationConcernController
     end
 
     def after_update_response
+      #TODO visibility or lease/embargo status
       if actor.visibility_changed?
         redirect_to confirm_curation_concern_permission_path(curation_concern)
       else

data/app/views/curation_concern/permissions/confirm.html.erb

@@ -3,8 +3,16 @@
     <h4>Apply changes to contents?<h4>
   </div>
   <div class="panel-body">
-    <p>You've changed the permissions on this <%= curation_concern.human_readable_type %>, <i><%= curation_concern.title %></i>, making it visible to <b><%= visibility_badge(curation_concern.visibility) %></b>.</p>
-    <p>Would you like change all of the files within the <%= curation_concern.human_readable_type %> to <b><%= visibility_badge(curation_concern.visibility) %></b> as well?</p>
+    <% if curation_concern.under_embargo? %>
+      <p>You've applied an embargo to this <%= curation_concern.human_readable_type %>, <i><%= curation_concern %></i>, changing it's visibility to <b><%= visibility_badge(curation_concern.visibility) %></b> until <%= curation_concern.embargo_release_date.to_date.to_formatted_s(:long_ordinal) %>.</p>
+      <p>Would you like to apply the same embargo to all of the files within the  <%= curation_concern.human_readable_type %> as well?</p>
+    <% elsif curation_concern.active_lease? %>
+      <p>You've applied a lease to this <%= curation_concern.human_readable_type %>, <i><%= curation_concern %></i>, changing it's visibility to <b><%= visibility_badge(curation_concern.visibility) %></b> until <%= curation_concern.lease_expiration_date.to_date.to_formatted_s(:long_ordinal) %>.</p>
+      <p>Would you like to apply the same lease to all of the files within the  <%= curation_concern.human_readable_type %> as well?</p>
+    <% else %>
+      <p>You've changed the permissions on this <%= curation_concern.human_readable_type %>, <i><%= curation_concern %></i>, making it visible to <b><%= visibility_badge(curation_concern.visibility) %></b>.</p>
+      <p>Would you like change all of the files within the <%= curation_concern.human_readable_type %> to <b><%= visibility_badge(curation_concern.visibility) %></b> as well?</p>
+    <% end %>
   </div>
   <div class="form-actions panel-footer">
     <%= button_to "Yes please.", copy_curation_concern_permission_path(curation_concern), class: 'btn btn-primary' %>

data/app/views/leases/_list_deactivated_leases.html.erb

@@ -1,4 +1,4 @@
 <% assets_with_deactivated_leases.each do |curation_concern| %>
   <%= link_to curation_concern, edit_lease_path(curation_concern) %> <%= visibility_badge(curation_concern.visibility) %>
-  <%= render partial:"lease_history", locals:{curation_concern:curation_concern} %>
+  <%= render "lease_history", curation_concern: curation_concern %>
 <% end %>

data/app/views/leases/edit.html.erb

@@ -39,5 +39,5 @@
 <% if curation_concern.lease_history.empty? %>
   This <%= curation_concern.human_readable_type %> has never had embargoes applied to it.
 <% else %>
-  <%= render partial:"lease_history" %>
+  <%= render "lease_history" %>
 <% end %>

data/app/views/leases/index.html.erb

@@ -7,12 +7,12 @@
 </ul>
 <div class="tab-content">
   <div class="tab-pane active" id="active">
-    <%= render partial:"list_active_leases" %>
+    <%= render "list_active_leases" %>
   </div>
   <div class="tab-pane" id="expired">
-    <%= render partial:"list_expired_active_leases" %>
+    <%= render "list_expired_active_leases" %>
   </div>
   <div class="tab-pane" id="deactivated">
-    <%= render partial:"list_deactivated_leases" %>
+    <%= render "list_deactivated_leases" %>
   </div>
-</div>
+</div>

data/lib/generators/worthwhile/install_generator.rb

@@ -12,6 +12,10 @@ module Worthwhile
       say_status("warning", "GENERATING HYDRA-HEAD", :yellow)
       generate "hydra:head -f"
 
+      # TODO this should probably move to the hydra:head generator because it installs the gem
+      say_status("warning", "GENERATING RSPEC-RAILS", :yellow)
+      generate 'rspec:install'
+
       say_status("warning", "GENERATING SUFIA", :yellow)
       generate "sufia:models:install#{options[:force] ? ' -f' : ''}"
     end

data/lib/generators/worthwhile/work/USAGE

@@ -0,0 +1,19 @@
+Description:
+  This generator creates the necessary files for work that extends
+  Worthwhile's GenericWork.
+
+Example:
+  rails generate worthwhile:work ScholarlyPaper
+
+  This will create:
+    app/repository_models/scholarly_paper.rb
+    app/actors/curation_concern/scholarly_paper_actor.rb
+    app/controllers/curation_concern/scholarly_papers_controller.rb
+    app/views/curation_concern/scholarly_papers/.keep
+    spec/factories/scholarly_paper_factory.rb
+    spec/repository_models/scholarly_paper_spec.rb
+    spec/actors/curation_concern/scholarly_paper_actor_spec.rb
+    spec/controllers/curation_concern/scholarly_papers_controller_spec.rb
+
+  This will also:
+    register ScholarlyPaper as a valid curation concern

data/lib/generators/worthwhile/work/templates/README

@@ -0,0 +1,13 @@
+===============================================================================
+
+After creating your work you may wish to:
+
+  1. Add custom views:
+
+      Your newly created work's controller extends from
+      CurationConcern::GenericWorksController; This means that it will use the
+      views found in Worthwhile::Engine.root/app/views/curation_concern/base.
+
+  2. Modify the model and datastreams
+
+===============================================================================

data/lib/generators/worthwhile/work/templates/actor.rb.erb

@@ -0,0 +1,6 @@
+# Generated via
+#  `rails generate worthwhile:work <%= class_name %>`
+module CurationConcern
+  class <%= class_name %>Actor < CurationConcern::GenericWorkActor
+  end
+end

data/lib/generators/worthwhile/work/templates/actor_spec.rb.erb

@@ -0,0 +1,9 @@
+# Generated via
+#  `rails generate worthwhile:work <%= class_name %>`
+require 'rails_helper'
+
+describe CurationConcern::<%= class_name %>Actor do
+  it "should have some tests" do
+    skip "Add your tests here"
+  end
+end

data/lib/generators/worthwhile/work/templates/controller.rb.erb

@@ -0,0 +1,7 @@
+# Generated via
+#  `rails generate worthwhile:work <%= class_name %>`
+
+class CurationConcern::<%= class_name.pluralize %>Controller < ApplicationController
+  include Worthwhile::CurationConcernController
+  set_curation_concern_type <%= class_name %>
+end

data/lib/generators/worthwhile/work/templates/controller_spec.rb.erb

@@ -0,0 +1,9 @@
+# Generated via
+#  `rails generate worthwhile:work <%= class_name %>`
+require 'rails_helper'
+
+describe CurationConcern::<%= class_name.pluralize %>Controller do
+  it "should have some tests" do
+    skip "Add your tests here"
+  end
+end

data/lib/generators/worthwhile/work/templates/model.rb.erb

@@ -0,0 +1,6 @@
+# Generated via
+#  `rails generate worthwhile:work <%= class_name %>`
+class <%= class_name %> < ActiveFedora::Base
+  include ::CurationConcern::Work
+  include ::CurationConcern::WithBasicMetadata
+end

data/lib/generators/worthwhile/work/templates/model_spec.rb.erb

@@ -0,0 +1,9 @@
+# Generated via
+#  `rails generate worthwhile:work <%= class_name %>`
+require 'rails_helper'
+
+describe <%= class_name %> do
+  it "should have some tests" do
+    skip "Add your tests here"
+  end
+end

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

@@ -0,0 +1,78 @@
+# -*- encoding : utf-8 -*-
+require 'rails/generators'
+
+class Rails::Generators::NamedBase
+  private
+  def destroy(what, *args)
+    log :destroy, what
+    argument = args.map {|arg| arg.to_s }.flatten.join(" ")
+
+    in_root {
+      run_ruby_script("bin/rails destroy #{what} #{argument}", verbose: true)
+    }
+  end
+end
+
+class Worthwhile::WorkGenerator < Rails::Generators::NamedBase
+  source_root File.expand_path("../templates", __FILE__)
+
+
+  argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
+  # Why all of these antics with defining individual methods?
+  # Because I want the output of Worthwhile::WorkGenerator to include all the processed files.
+  def create_model_spec
+    return unless rspec_installed?
+    template "model_spec.rb.erb", "spec/repository_models/#{file_name}_spec.rb"
+  end
+
+  def create_model
+    template("model.rb.erb", "app/repository_models/#{file_name}.rb")
+  end
+  def create_controller_spec
+    return unless rspec_installed?
+    template("controller_spec.rb.erb", "spec/controllers/curation_concern/#{plural_file_name}_controller_spec.rb")
+  end
+
+  def create_actor_spec
+    return unless rspec_installed?
+    template("actor_spec.rb.erb", "spec/actors/curation_concern/#{file_name}_actor_spec.rb")
+  end
+
+  def create_controller
+    template("controller.rb.erb", "app/controllers/curation_concern/#{plural_file_name}_controller.rb")
+  end
+
+  def create_actor
+    template("actor.rb.erb", "app/actors/curation_concern/#{file_name}_actor.rb")
+  end
+
+  def register_work
+    inject_into_file 'config/initializers/worthwhile_config.rb', after: "Worthwhile.configure do |config|\n" do
+      data = ""
+      data << "  # Injected via `rails g worthwhile:work #{class_name}`\n"
+      data << "  config.register_curation_concern :#{file_name}\n"
+      data
+    end
+  end
+
+  def create_views
+    create_file "app/views/curation_concern/#{plural_file_name}/_#{file_name}.html.erb" do
+      data = "<%# This is a search result view %>\n"
+      data << "<%= render 'catalog/document', document: #{file_name}, document_counter: #{file_name}_counter  %>\n"
+      data
+    end
+  end
+
+  def create_readme
+    readme 'README'
+  end
+
+
+  private
+
+    def rspec_installed?
+      defined?(RSpec) && defined?(RSpec::Rails)
+    end
+
+end

data/lib/worthwhile/version.rb

@@ -1,3 +1,3 @@
 module Worthwhile
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/factories/generic_works.rb

@@ -2,6 +2,7 @@ FactoryGirl.define do
   factory :work, aliases: [:generic_work, :private_generic_work], class: GenericWork do
     ignore do
       user { FactoryGirl.create(:user) }
+      embargo_date { Date.tomorrow.to_s }
     end
 
     title ["Test title"]
@@ -21,17 +22,21 @@ FactoryGirl.define do
     end
 
     factory :embargoed_work do
-      after(:build) { |work, _| work.apply_embargo(Date.tomorrow.to_s, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC) }
+      after(:build) { |work, evaluator| work.apply_embargo(evaluator.embargo_date, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC) }
     end
 
     factory :embargoed_work_with_files do
       after(:build) { |work, _| 2.times { work.generic_files << FactoryGirl.build(:generic_file) }}
-      after(:build) { |work, _| work.apply_embargo(Date.tomorrow.to_s, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC) }
+      after(:build) { |work, evaluator| work.apply_embargo(evaluator.embargo_date, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC) }
+    end
+
+    factory :leased_work do
+      after(:build) { |work, evaluator| work.apply_lease(evaluator.embargo_date, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE) }
     end
 
     factory :leased_work_with_files do
       after(:build) { |work, _| 2.times { work.generic_files << FactoryGirl.build(:generic_file) }}
-      after(:build) { |work, _| work.apply_lease(Date.tomorrow.to_s, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE) }
+      after(:build) { |work, evaluator| work.apply_lease(evaluator.embargo_date, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE) }
     end
   end
 end

data/spec/features/embargo_spec.rb

@@ -10,6 +10,8 @@ describe 'embargo' do
       visit '/'
     end
 
+    let(:future_date) { 2.days.from_now }
+
     it "can be created, displayed and updated" do
       click_link 'New Generic Work'
       fill_in 'Title', with: 'Embargo test'
@@ -24,10 +26,10 @@ describe 'embargo' do
 
       expect(page).to have_content("This work is under embargo.")
 
-      fill_in "until", with: 2.days.from_now.to_s
+      fill_in "until", with: future_date.to_s
 
       click_button "Update Embargo"
-      expect(page).to have_content(2.days.from_now.strftime '%F')
+      expect(page).to have_content(future_date.to_date.to_formatted_s(:long_ordinal))
     end
   end
 

data/spec/features/lease_spec.rb

@@ -7,6 +7,8 @@ describe "leases" do
   end
   describe "create a new leased object" do
 
+    let(:future_date) { 2.days.from_now }
+
     it "can be created, displayed and updated" do
       visit '/'
       click_link 'New Generic Work'
@@ -22,10 +24,10 @@ describe "leases" do
 
       expect(page).to have_content("This work is under lease.")
 
-      fill_in "until", with: 2.days.from_now.to_s
+      fill_in "until", with: future_date.to_s
 
       click_button "Update Lease"
-      expect(page).to have_content(2.days.from_now.strftime '%F')
+      expect(page).to have_content(future_date.to_date.to_formatted_s(:long_ordinal))
     end
 
   end

data/spec/services/lease_service_spec.rb

@@ -1,37 +1,53 @@
 require 'spec_helper'
 
 describe Worthwhile::LeaseService do
+
+  before { GenericWork.destroy_all }
+
   let(:future_date) { 2.days.from_now }
   let(:past_date) { 2.days.ago }
 
   let!(:work_with_expired_lease1) do
-    FactoryGirl.build(:generic_work, lease_expiration_date: past_date.to_s).tap do |work|
+    build(:generic_work, lease_expiration_date: past_date.to_s).tap do |work|
       work.save(validate: false)
     end
   end
 
   let!(:work_with_expired_lease2) do
-    FactoryGirl.build(:generic_work, lease_expiration_date: past_date.to_s).tap do |work|
+    build(:generic_work, lease_expiration_date: past_date.to_s).tap do |work|
       work.save(validate: false)
     end
   end
 
-  let!(:work_with_lease_in_effect) { FactoryGirl.create(:generic_work, lease_expiration_date: future_date.to_s)}
-  let!(:work_without_lease) { FactoryGirl.create(:generic_work)}
+  let!(:work_with_lease_in_effect) { create(:generic_work, lease_expiration_date: future_date.to_s)}
+  let!(:work_without_lease) { create(:generic_work)}
 
   describe "#assets_with_expired_leases" do
-    it "returns an array of assets with expired embargoes" do
-      returned_pids = subject.assets_with_expired_leases.map {|a| a.pid}
+    it "returns an array of assets with expired lease" do
+      returned_pids = subject.assets_with_expired_leases.map(&:pid)
       expect(returned_pids).to include work_with_expired_lease1.pid,work_with_expired_lease2.pid
       expect(returned_pids).to_not include work_with_lease_in_effect.pid,work_without_lease.pid
     end
   end
 
   describe "#assets_under_lease" do
-    it "returns an array of assets with expired embargoes" do
-      returned_pids = subject.assets_under_lease.map {|a| a.pid}
+    it "returns an array of assets with active leases" do
+      returned_pids = subject.assets_under_lease.map(&:pid)
       expect(returned_pids).to include work_with_expired_lease1.pid,work_with_expired_lease2.pid,work_with_lease_in_effect.pid
       expect(returned_pids).to_not include work_without_lease.pid
     end
   end
+
+  describe "#assets_with_deactivated_leases" do
+    before do
+      work_with_expired_lease1.deactivate_lease!
+      work_with_expired_lease1.save!
+      work_with_lease_in_effect.deactivate_lease!
+      work_with_lease_in_effect.save!
+    end
+    it "returns an array of assets with deactivated leases" do
+      returned_pids = subject.assets_with_deactivated_leases.map(&:pid)
+      expect(returned_pids).to eq [work_with_expired_lease1.id, work_with_lease_in_effect.id ]
+    end
+  end
 end

data/spec/views/curation_concern/permissions/confirm.html.erb_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'curation_concern/permissions/confirm.html.erb' do
+  before do
+    allow(curation_concern).to receive(:to_param).and_return('test:123')
+    allow(view).to receive(:curation_concern).and_return(curation_concern)
+    render
+  end
+
+  context "when the work is embargoed" do
+    let(:curation_concern) { build(:embargoed_work, embargo_date: '2099-09-26'.to_date) }
+
+    it "should have a message about embargos" do
+      expect(rendered).to have_content "You've applied an embargo to this Generic Work, Test title, changing it's visibility to Private until September 26th, 2099. Would you like to apply the same embargo to all of the files within the Generic Work as well?"
+    end
+  end
+
+  context "when the work is leased" do
+    let(:curation_concern) { build(:leased_work, embargo_date: '2099-09-26'.to_date) }
+
+    it "should have a message about leases" do
+      expect(rendered).to have_content "You've applied a lease to this Generic Work, Test title, changing it's visibility to Open Access until September 26th, 2099. Would you like to apply the same lease to all of the files within the Generic Work as well?"
+    end
+  end
+
+  context "when the work is not embargoed" do
+    let(:curation_concern) { build(:work) }
+
+    it "should have a message about visibility" do
+      expect(rendered).to have_content "You've changed the permissions on this Generic Work, Test title, making it visible to Private. Would you like change all of the files within the Generic Work to Private as well?"
+    end
+  end
+end

data/worthwhile.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'hydra-head', '~> 7.2.0'
+  spec.add_dependency 'hydra-head', '~> 7.2.2'
   spec.add_dependency "breadcrumbs_on_rails", "~> 2.3.0"
   spec.add_dependency "active_attr"
   spec.add_dependency "simple_form", '~> 3.1.0.rc2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worthwhile
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 7.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 7.2.2
 - !ruby/object:Gem::Dependency
   name: breadcrumbs_on_rails
   requirement: !ruby/object:Gem::Requirement
@@ -497,6 +497,15 @@ files:
 - lib/generators/worthwhile/templates/worthwhile.js
 - lib/generators/worthwhile/templates/worthwhile_config.rb
 - lib/generators/worthwhile/templates/worthwhile_helper.rb
+- lib/generators/worthwhile/work/USAGE
+- lib/generators/worthwhile/work/templates/README
+- lib/generators/worthwhile/work/templates/actor.rb.erb
+- lib/generators/worthwhile/work/templates/actor_spec.rb.erb
+- lib/generators/worthwhile/work/templates/controller.rb.erb
+- lib/generators/worthwhile/work/templates/controller_spec.rb.erb
+- lib/generators/worthwhile/work/templates/model.rb.erb
+- lib/generators/worthwhile/work/templates/model_spec.rb.erb
+- lib/generators/worthwhile/work/work_generator.rb
 - lib/worthwhile.rb
 - lib/worthwhile/configuration.rb
 - lib/worthwhile/controller_resource.rb
@@ -564,6 +573,7 @@ files:
 - spec/views/collections/_form_representative_image.html.erb_spec.rb
 - spec/views/curation_concern/base/_attributes.html.erb_spec.rb
 - spec/views/curation_concern/base/show.html.erb_spec.rb
+- spec/views/curation_concern/permissions/confirm.html.erb_spec.rb
 - spec/views/shared/_add_content.html.erb_spec.rb
 - spec/views/shared/_my_actions.html.erb_spec.rb
 - spec/workers/visibility_copy_worker_spec.rb
@@ -668,6 +678,7 @@ test_files:
 - spec/views/collections/_form_representative_image.html.erb_spec.rb
 - spec/views/curation_concern/base/_attributes.html.erb_spec.rb
 - spec/views/curation_concern/base/show.html.erb_spec.rb
+- spec/views/curation_concern/permissions/confirm.html.erb_spec.rb
 - spec/views/shared/_add_content.html.erb_spec.rb
 - spec/views/shared/_my_actions.html.erb_spec.rb
 - spec/workers/visibility_copy_worker_spec.rb