curation_concerns 0.12.0.pre7 → 0.12.0.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c391f4cafeaf126bf03b0d5bfb00cc73a064ee9e
-  data.tar.gz: 288a18be58a7d6f529e469688a01870e1838aae3
+  metadata.gz: 6e81fd9998236bbf1d83f58c8260bd58792a2761
+  data.tar.gz: e5687797edb64acd557ecb35efe1cc98b0697434
 SHA512:
-  metadata.gz: a1bbdb3943a11c78edc5cdebcacdb0adbc616d76d7df2fc334228ee0436ce03d0951999a71f1db340081281948b36c89fbca97ad1a95b36cec72b58f810c43b8
-  data.tar.gz: 803b3f489174894eee8a183c68f92d0410bdeb9c754cc89cfcb9f1fc4c20abc09b04f49168db98003c67bcf684680601ce1e22fd0f7342e01b560aa0e060c197
+  metadata.gz: d7612adacda225e98429b99365ff1893b4941140f94acf23a94d79583e4bc93e0403fb358712d36ff6a43356859773772c4f410d63cb807fab86fc804bde3502
+  data.tar.gz: 21c5c4454f410f260015a7457cc05babc47617452f776fede66c7697ca6d881c99f113b6414669eb9c38f5941d720d323ab7936b26611bef3042db38f961dd05

data/app/views/collections/_search_form.html.erb

@@ -1,7 +1,5 @@
-<div class="col-md-3 pull-right">
-  <%= form_for @presenter, method: :get, class: "well form-search" do |f| %>
-
-      <label class="sr-only">Search Collection <%= @presenter.title %></label>
+  <%= form_for presenter, method: :get, class: "well form-search" do |f| %>
+      <label class="sr-only">Search Collection <%= presenter.title %></label>
       <div class="input-group">
         <%= text_field_tag :cq, params[:cq], class: "collection-query form-control", placeholder: "Search Collection", size: '30', type: "search", id: "collection_search" %>
         <div class="input-group-btn">
@@ -11,4 +9,3 @@
       <%= hidden_field_tag :sort, params[:sort], id: 'collection_sort' %>
       <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:cq, :sort, :qt, :page)) %>
   <% end %>
-</div>

data/app/views/collections/show.html.erb

@@ -16,7 +16,7 @@
     <%= render 'attributes', presenter: @presenter %>
   <% end %>
 
-  <%= render 'search_form' %>
+  <%= render 'search_form', presenter: @presenter %>
   <%= render 'sort_and_per_page', collection: @presenter %>
 
   <% if has_collection_search_parameters? %>
@@ -28,4 +28,3 @@
 
   <%= render partial: 'paginate' %>
 </div>
-

data/config/locales/curation_concerns.en.yml

@@ -21,21 +21,6 @@ en:
           placeholder: "Type keywords in here"
     bread_crumb:
       works_list: "the works browser"
-    messages:
-      success:
-        single: "has been saved."
-        multiple:
-          link: "These files"
-          tag: "have been saved."
-        title:  "Files uploaded successfully"
-        subject: "Batch upload complete"
-      failure:
-        single: "could not be updated. You do not have sufficient privileges to edit it."
-        multiple:
-          link: "These files"
-          tag: "could not be updated. You do not have sufficient privileges to edit them."
-        title:  "Files failed"
-        subject: "Batch upload permission denied"
     api:
       accepted:
         default: "Your request has been accepted for processing, but processing is not complete. See job for more info."

data/lib/curation_concerns/engine.rb

@@ -1,6 +1,5 @@
 # Load blacklight which will give curation_concerns views a higher preference than those in blacklight
 require 'blacklight'
-require 'curation_concerns/models'
 require 'hydra-editor'
 require 'jquery-ui-rails'
 require 'qa'

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.12.0.pre7".freeze
+  VERSION = "0.12.0.pre8".freeze
 end

data/lib/curation_concerns.rb

@@ -1,7 +1,6 @@
 require 'curation_concerns/version'
 require 'curation_concerns/engine'
 require 'curation_concerns/configuration'
-require 'curation_concerns/models'
 require 'curation_concerns/collections'
 require 'blacklight_advanced_search'
 require 'kaminari_route_prefix'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre7
+  version: 0.12.0.pre8
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -973,8 +973,6 @@ files:
 - lib/curation_concerns/configuration.rb
 - lib/curation_concerns/controller_resource.rb
 - lib/curation_concerns/engine.rb
-- lib/curation_concerns/messages.rb
-- lib/curation_concerns/models.rb
 - lib/curation_concerns/name.rb
 - lib/curation_concerns/null_logger.rb
 - lib/curation_concerns/rails/routes.rb
@@ -1118,7 +1116,6 @@ files:
 - spec/lib/curation_concerns/callbacks/registry_spec.rb
 - spec/lib/curation_concerns/callbacks_spec.rb
 - spec/lib/curation_concerns/collections/search_service_spec.rb
-- spec/lib/curation_concerns/messages_spec.rb
 - spec/lib/curation_concerns/name_spec.rb
 - spec/lib/curation_concerns/null_logger_spec.rb
 - spec/lib/curation_concerns/readable_permissions_spec.rb
@@ -1319,7 +1316,6 @@ test_files:
 - spec/lib/curation_concerns/callbacks/registry_spec.rb
 - spec/lib/curation_concerns/callbacks_spec.rb
 - spec/lib/curation_concerns/collections/search_service_spec.rb
-- spec/lib/curation_concerns/messages_spec.rb
 - spec/lib/curation_concerns/name_spec.rb
 - spec/lib/curation_concerns/null_logger_spec.rb
 - spec/lib/curation_concerns/readable_permissions_spec.rb

data/lib/curation_concerns/messages.rb

@@ -1,68 +0,0 @@
-module CurationConcerns
-  module Messages
-    extend ActiveSupport::Concern
-
-    # Borrowed from AbstractController so we can render html content tags
-    attr_accessor :output_buffer
-    include ActionView::Helpers::TagHelper
-    include ActionView::Helpers::UrlHelper
-
-    def success_subject
-      I18n.t('curation_concerns.messages.success.subject')
-    end
-
-    def failure_subject
-      I18n.t('curation_concerns.messages.failure.subject')
-    end
-
-    def single_success(id, file)
-      content_tag :span, id: 'ss-' + id do
-        [link_to_file(file), I18n.t('curation_concerns.messages.success.single')].join(' ').html_safe
-      end
-    end
-
-    def multiple_success(id, files)
-      content_tag :span, id: 'ss-' + id do
-        [success_link(files), I18n.t('curation_concerns.messages.success.multiple.tag')].join(' ').html_safe
-      end
-    end
-
-    def single_failure(id, file)
-      content_tag :span, id: 'ss-' + id do
-        [link_to_file(file), I18n.t('curation_concerns.messages.failure.single')].join(' ').html_safe
-      end
-    end
-
-    def multiple_failure(id, files)
-      content_tag :span, id: 'ss-' + id do
-        [failure_link(files), I18n.t('curation_concerns.messages.failure.multiple.tag')].join(' ').html_safe
-      end
-    end
-
-    # Double-quotes are replaced with single ones so this list can be included in a data block. Ex:
-    #   <a href="#" data-content="<a href='#'>embedded link</a>" data-toggle="popover">Click me</a>
-    def file_list(files)
-      files.map { |fs| link_to_file(fs) }.join(', ').tr("\"", "'")
-    end
-
-    def link_to_file(file)
-      link_to(file.to_s, Rails.application.class.routes.url_helpers.curation_concerns_file_set_path(file))
-    end
-
-    private
-
-      def success_link(files)
-        link_to I18n.t('curation_concerns.messages.success.multiple.link'), '#',
-                data: { toggle: 'popover',
-                        content: file_list(files).html_safe,
-                        title: I18n.t('curation_concerns.messages.success.title') }
-      end
-
-      def failure_link(files)
-        link_to I18n.t('curation_concerns.messages.failure.multiple.link'), '#',
-                data: { toggle: 'popover',
-                        content: file_list(files).html_safe,
-                        title: I18n.t('curation_concerns.messages.failure.title') }
-      end
-  end
-end

data/lib/curation_concerns/models.rb

@@ -1,42 +0,0 @@
-require 'hydra/head'
-
-module CurationConcerns
-  extend ActiveSupport::Autoload
-
-  module Models
-    module Utils
-      extend ActiveSupport::Concern
-
-      def retry_unless(number_of_tries, condition, &block)
-        self.class.retry_unless(number_of_tries, condition, &block)
-      end
-
-      module ClassMethods
-        def retry_unless(number_of_tries, condition, &_block)
-          fail ArgumentError, 'First argument must be an enumerator' unless number_of_tries.is_a? Enumerator
-          fail ArgumentError, 'Second argument must be a lambda' unless condition.respond_to? :call
-          fail ArgumentError, 'Must pass a block of code to retry' unless block_given?
-          number_of_tries.each do
-            result = yield
-            return result unless condition.call
-          end
-          fail 'retry_unless could not complete successfully. Try upping the # of tries?'
-        end
-      end
-    end
-  end
-
-  autoload :Permissions
-  autoload :Messages
-  autoload :NullLogger
-  eager_autoload do
-    autoload :Configuration
-    autoload :Name
-  end
-
-  attr_writer :queue
-
-  def self.queue
-    @queue ||= config.queue.new('curation_concerns')
-  end
-end

data/spec/lib/curation_concerns/messages_spec.rb

@@ -1,69 +0,0 @@
-require 'spec_helper'
-
-describe CurationConcerns::Messages do
-  let(:message) do
-    TestClass.new
-  end
-
-  before do
-    class TestClass
-      include CurationConcerns::Messages
-    end
-  end
-
-  after do
-    Object.send(:remove_const, :TestClass)
-  end
-
-  let(:upload_set_id) { '1' }
-  let(:single) { double(to_param: '1', to_s: 'File 1') }
-  let(:multiple) { [double(to_param: '1', to_s: 'File 1'), double(to_param: '2', to_s: 'File 2'), double(to_param: '3', to_s: 'File 3')] }
-  let(:file_list) { "<a href='/concern/file_sets/1'>File 1</a>, <a href='/concern/file_sets/2'>File 2</a>, <a href='/concern/file_sets/3'>File 3</a>" }
-
-  describe 'message subjects' do
-    it 'provides a subject for a success message' do
-      expect(message.success_subject).to eq('Batch upload complete')
-    end
-    it 'provides a subject for a failure message' do
-      expect(message.failure_subject).to eq('Batch upload permission denied')
-    end
-  end
-
-  describe '#single_success' do
-    it 'renders a success message for a single file' do
-      node = Capybara::Node::Simple.new(message.single_success(upload_set_id, single))
-      expect(node).to have_selector("span[id=\"ss-1\"]", text: 'File 1 has been saved.')
-      expect(node).to have_selector("a[href=\"/concern/file_sets/1\"]")
-    end
-  end
-
-  describe '#multiple_success' do
-    it 'renders a success message for multiple files' do
-      node = Capybara::Node::Simple.new(message.multiple_success(upload_set_id, multiple))
-      expect(node).to have_selector("span[id=\"ss-1\"]", text: 'These files have been saved.')
-      expect(node).to have_selector("a[data-content=\"#{file_list}\"][data-toggle=\"popover\"][data-title=\"Files uploaded successfully\"]")
-    end
-  end
-
-  describe '#single_failure' do
-    it 'renders a failure message for a single file' do
-      node = Capybara::Node::Simple.new(message.single_failure(upload_set_id, single))
-      expect(node).to have_selector("span[id=\"ss-1\"]", text: 'File 1 could not be updated. You do not have sufficient privileges to edit it.')
-      expect(node).to have_selector("a[href=\"/concern/file_sets/1\"]")
-    end
-  end
-
-  describe '#multiple_failure' do
-    it 'renders a failure message for multiple files' do
-      node = Capybara::Node::Simple.new(message.multiple_failure(upload_set_id, multiple))
-      expect(node).to have_selector("span[id=\"ss-1\"]", text: 'These files could not be updated. You do not have sufficient privileges to edit them.')
-      expect(node).to have_selector("a[data-content=\"#{file_list}\"][data-toggle=\"popover\"][data-title=\"Files failed\"]")
-    end
-  end
-
-  describe '#file_list' do
-    it 'replaces double-quotes with single quotes' do
-      expect(message.file_list(multiple)).to eq(file_list)
-    end
-  end
-end