worthwhile 0.0.1 → 0.0.2

data/spec/views/collections/_form_representative_image.html.erb_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'collections/_form_representative_image.html.erb' do
+  let(:file) { build(:generic_file, title: ['birds.jpg']) }
+  let(:work) { build(:generic_work, generic_files: [ file ]) }
+  let(:collection) { build(:collection, members: [ work ]) }
+  let(:form) { ActionView::Helpers::FormBuilder.new(:collection, collection, view, {}) }
+
+  before do
+    allow(collection).to receive(:persisted?).and_return(true)
+    allow(view).to receive(:curation_concern).and_return(collection)
+    allow(view).to receive(:f).and_return(form)
+  end
+
+  it "should have a list of the generic files images" do
+    render
+    expect(rendered).to have_selector "select#collection_representative option[value='#{file.id}']",
+      text: 'birds.jpg'
+  end
+end

data/spec/views/curation_concern/base/_attributes.html.erb_spec.rb

@@ -11,11 +11,11 @@ describe 'curation_concern/base/_attributes.html.erb' do
                                   subject: [subject]) }
 
   before do
-    view.stub(:dom_class) { '' }
-    view.stub(:permission_badge_for) { '' }
+    allow(view).to receive(:dom_class) { '' }
+    allow(view).to receive(:permission_badge_for) { '' }
 
     render partial: 'attributes', locals: { curation_concern: curation_concern }
-  end 
+  end
 
   it 'has links to search for other objects with the same metadata' do
     expect(rendered).to have_link(creator, href: catalog_index_path(search_field: 'creator', q: creator))

data/spec/views/curation_concern/base/show.html.erb_spec.rb

@@ -5,21 +5,25 @@ describe 'curation_concern/base/show.html.erb' do
   let!(:curation_concern) { FactoryGirl.create(:private_generic_work) }
 
   context "for editors" do
-    it 'has links to edit and add to collections' do
+    before do
       allow(view).to receive(:can?).and_return(true)
+    end
+
+    it 'has links to edit and add to collections' do
       render file: 'curation_concern/base/show', locals: { curation_concern: curation_concern }
-      expect(view.content_for(:second_row)).to have_link("Edit This Generic Work", href: edit_polymorphic_path([:curation_concern, curation_concern]))
-      expect(view.content_for(:second_row)).to have_link("Add to a Collection", href: add_member_form_collections_path(collectible_id:curation_concern.pid))
+      expect(rendered).to have_link("Edit This Generic Work", href: edit_polymorphic_path([:curation_concern, curation_concern]))
+      expect(rendered).to have_selector "a[data-toggle='modal'][data-target='##{curation_concern.to_param}-modal']", text: "Add to a Collection"
+      expect(rendered).to have_selector("div.modal##{curation_concern.to_param}-modal form[action='#{collections.collections_path}'] input[value='Add to collection']")
     end
   end
+
   context "for non-editors" do
-    it 'does not have links to edit' do
-      render file: 'curation_concern/base/show', locals: { curation_concern: curation_concern }
-      expect(view.content_for(:second_row)).not_to have_content("Edit this Generic Work")
-    end
-    it 'has link to add to a collection' do
+    it 'does not have links to edit, but has add to collection' do
       render file: 'curation_concern/base/show', locals: { curation_concern: curation_concern }
-      expect(view.content_for(:second_row)).to have_link("Add to a Collection", href: add_member_form_collections_path(collectible_id:curation_concern.pid))
+      expect(rendered).not_to have_content("Edit this Generic Work")
+
+      expect(rendered).to have_selector "a[data-toggle='modal'][data-target='##{curation_concern.to_param}-modal']", text: "Add to a Collection"
+      expect(rendered).to have_selector("div.modal##{curation_concern.to_param}-modal form[action='#{collections.collections_path}'] input[value='Add to collection']")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worthwhile
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -299,7 +299,6 @@ files:
 - app/assets/javascripts/worthwhile/proxy_submission.js
 - app/assets/javascripts/worthwhile/select_works.js.coffee
 - app/assets/javascripts/worthwhile/worthwhile.js
-- app/assets/stylesheets/worthwhile.css.scss
 - app/assets/stylesheets/worthwhile/_global-variables.css.scss
 - app/assets/stylesheets/worthwhile/_modules.css.scss
 - app/assets/stylesheets/worthwhile/_positioning.css.scss
@@ -407,6 +406,7 @@ files:
 - app/views/collections/_form.html.erb
 - app/views/collections/_form_for_select_collection.html.erb
 - app/views/collections/_form_permission.html.erb
+- app/views/collections/_form_representative_image.html.erb
 - app/views/collections/_form_required_information.html.erb
 - app/views/collections/_identifier_and_action.html.erb
 - app/views/collections/_media_display.html.erb
@@ -424,7 +424,6 @@ files:
 - app/views/curate/collections/_add_to_collection_modal.html.erb
 - app/views/curate/collections/_button_remove_from_collection.html.erb
 - app/views/curate/collections/_form_to_add_member.html.erb
-- app/views/curate/collections/add_member_form.html.erb
 - app/views/curation_concern/base/_attributes.html.erb
 - app/views/curation_concern/base/_collections.html.erb
 - app/views/curation_concern/base/_form.html.erb
@@ -432,6 +431,7 @@ files:
 - app/views/curation_concern/base/_form_content_license.html.erb
 - app/views/curation_concern/base/_form_contributor_agreement.html.erb
 - app/views/curation_concern/base/_form_descriptive_fields.erb
+- app/views/curation_concern/base/_form_editors.html.erb
 - app/views/curation_concern/base/_form_files_and_links.html.erb
 - app/views/curation_concern/base/_form_permission.html.erb
 - app/views/curation_concern/base/_form_permission_embargo.html.erb
@@ -467,12 +467,9 @@ files:
 - app/views/embargoes/edit.html.erb
 - app/views/embargoes/index.html.erb
 - app/views/layouts/boilerplate.html.erb
-- app/views/layouts/common_objects.html.erb
 - app/views/layouts/curate_nd.html.erb
 - app/views/layouts/curate_nd/1_column.html.erb
-- app/views/layouts/curate_nd/2_column.html.erb
 - app/views/layouts/curate_nd/catalog.html.erb
-- app/views/layouts/curate_nd/dashboard.html.erb
 - app/views/leases/_lease_history.html.erb
 - app/views/leases/_list_active_leases.html.erb
 - app/views/leases/_list_deactivated_leases.html.erb
@@ -540,6 +537,7 @@ files:
 - spec/helpers/render_constraints_helper_spec.rb
 - spec/helpers/thumbnail_helper_spec.rb
 - spec/helpers/url_helper_spec.rb
+- spec/helpers/worthwhile/collections_helper_spec.rb
 - spec/matchers.rb
 - spec/matchers/metadata_field_matchers.rb
 - spec/models/collection_spec.rb
@@ -563,6 +561,7 @@ files:
 - spec/support/shared/shared_examples_is_embargoable.rb
 - spec/support/shared/shared_examples_with_access_rights.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- 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/shared/_add_content.html.erb_spec.rb
@@ -642,6 +641,7 @@ test_files:
 - spec/helpers/render_constraints_helper_spec.rb
 - spec/helpers/thumbnail_helper_spec.rb
 - spec/helpers/url_helper_spec.rb
+- spec/helpers/worthwhile/collections_helper_spec.rb
 - spec/matchers.rb
 - spec/matchers/metadata_field_matchers.rb
 - spec/models/collection_spec.rb
@@ -665,6 +665,7 @@ test_files:
 - spec/support/shared/shared_examples_is_embargoable.rb
 - spec/support/shared/shared_examples_with_access_rights.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- 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/shared/_add_content.html.erb_spec.rb

data/app/assets/stylesheets/worthwhile.css.scss

@@ -1,23 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require jquery-ui-lightness
- *=# require bootstrap-datepicker3
- *= require_self
- */
-
-@import 'worthwhile/global-variables';
-@import 'bootstrap';
-@import 'blacklight/blacklight';
-@import 'worthwhile/positioning';
-@import 'worthwhile/modules';
-@import 'token-input-facebook';
-@import 'worthwhile/theme';
-@import 'worthwhile/typography';

data/app/views/curate/collections/add_member_form.html.erb

@@ -1,6 +0,0 @@
-<% content_for :page_header do %>
-  <h1 id="add-to-title">Add <%= @collectible %> to:</h1>
-<% end %>
-<% if can? :collect, @collectible %>
-  <%= render partial: 'form_to_add_member', locals: { collectible: @collectible, select_label_id: 'add-to-title', button_class: 'btn btn-primary' } %>
-<% end %>

data/app/views/layouts/common_objects.html.erb

@@ -1,36 +0,0 @@
-<% content_for :layout_name, 'common_objects, ' %>
-<% content_for :body do %>
-
-  <header id="banner" role="banner">
-    <hgroup>
-      <div id="brand-bar-wrapper">
-        <%= render 'shared/brand_bar' %>
-      </div>
-    </hgroup>
-  </header>
-
-  <div id="main" role="main" class="container <%= yield(:page_class) if content_for?(:page_class)%>">
-    <% if content_for?(:page_header) %>
-      <div class="row">
-        <div class="col-md-12 main-header">
-          <%= yield(:page_header) %>
-        </div>
-      </div>
-    <% end %>
-    <div class="row">
-      <div class="<%= content_for?(:main_column_class) ? yield(:main_column_class) : "col-md-12" %>">
-        <%= yield %>
-      </div>
-    </div>
-    <% if content_for?(:second_row) %>
-      <div class="row">
-        <div class="col-md-12">
-          <%= yield(:second_row) %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-
-<% end %>
-
-<%= render :template => 'layouts/boilerplate' %>

data/app/views/layouts/curate_nd/2_column.html.erb

@@ -1,26 +0,0 @@
-<% content_for :layout_name, 'two_column, ' %>
-<% content_for :main do %>
-
-  <div class="row">
-    <div class="<%= content_for?(:left_column_class) ? yield(:left_column_class) : "col-md-6" %>">
-      <%= content_for?(:left_column) ? yield(:left_column) : yield %>
-    </div>
-
-    <div class="<%= content_for?(:right_column_class) ? yield(:right_column_class) : "col-md-6" %>">
-      <%= yield(:right_column) if content_for?(:right_column) %>
-    </div>
-  </div>
-
-  <% if content_for?(:second_row) %>
-
-    <div class="row">
-      <div class="col-md-12">
-        <%= yield(:second_row) %>
-      </div>
-    </div>
-
-  <% end %>
-
-<% end %>
-
-<%= render template: "layouts/#{theme}" %>

data/app/views/layouts/curate_nd/dashboard.html.erb

@@ -1,22 +0,0 @@
-<% content_for :layout_name, 'dashboard, ' %>
-<% content_for :main do %>
-
-  <div class="row">
-
-  <% if content_for?(:sidebar) %>
-    <div class="col-md-3">
-      <%= yield(:sidebar) %>
-    </div>
-
-    <div class="col-md-9">
-  <% else %>
-    <div class="col-md-12">
-  <% end %>
-      <%= yield %>
-    </div>
-
-  </div>
-
-<% end %>
-
-<%= render template: "layouts/#{theme}" %>