sufia 6.0.0.beta1 → 6.0.0.rc1

data/app/assets/javascripts/sufia/multiForm.js

@@ -1,67 +0,0 @@
-(function( $ ){
-
-  $.fn.multiForm = function( options ) {
-
-    // Create some defaults, extending them with any options that were provided
-    var settings = $.extend( { }, options);
-
-    function addField() {
-      count = $(this).closest('.form-group').find('input').size();
-      var cloneId = this.id.replace("submit", "clone");
-      var newId = this.id.replace("submit", "elements");
-      var cloneElem = $('#'+cloneId).clone();
-      // change the add button to a remove button
-      var plusbttn = cloneElem.find('#'+this.id);
-      var sr_hidden = '<span aria-hidden="true"><i class="glyphicon glyphicon-remove"></i></span>';
-      var sr_only = '<span class="sr-only">remove this ' + this.name.replace("_", " ") + '</span>';
-      var remove_button = sr_hidden + sr_only;
-      plusbttn.html(remove_button);
-      plusbttn.on('click',removeField);
-
-
-      // remove the help tag on subsequent added fields
-      cloneElem.find('.formHelp').remove();
-      cloneElem.find('.modal-div').remove();
-
-      //clear out the value for the element being appended
-      //so the new element has a blank value
-      // Note: there may be more than one input field. Example:
-      //   creator_name
-      //   creator_role
-      textFields = cloneElem.find('input[type=text]')
-      $.each(textFields, function(n, tf) {
-        newName = $(tf).attr('name').replace('[0]', '['+count+']');
-        $(tf).attr('name', newName).val('').attr("required", false)
-      })
-
-      if (settings.afterAdd) {
-        settings.afterAdd(this, cloneElem)
-      }
-
-      $('#'+newId).append(cloneElem);
-      cloneElem.find('input[type=text]').focus();
-      return false;
-    }
-
-    function removeField () {
-      // get parent and remove it
-      $(this).closest('.input-group').remove();
-      return false;
-    }
-
-    return this.each(function() {
-
-      // Tooltip plugin code here
-      /*
-       * adds additional metadata elements
-       */
-      $('.adder', this).click(addField);
-
-      $('.remover', this).click(removeField);
-
-
-    });
-
-  };
-})( jQuery );
-

data/app/helpers/records_helper.rb

@@ -1,4 +0,0 @@
-module RecordsHelper
-  include RecordsHelperBehavior # from hydra-editor
-  include Sufia::RecordsHelperBehavior
-end

data/app/helpers/sufia/records_helper_behavior.rb

@@ -1,68 +0,0 @@
-module Sufia
-  module RecordsHelperBehavior
-    def add_field(key)
-      more_or_less_button(key, 'adder', '+')
-    end
-
-    def subtract_field(key)
-     more_or_less_button(key, 'remover', '-')
-    end
-
-    def help_icon(key, content = nil, title = nil)
-      content = content || metadata_help(key)
-      title = title || get_label(key)
-      link_to '#', id: "generic_file_#{key.to_s}_help", rel: 'popover',
-              'data-content' => content,
-              'data-original-title' => title,
-              'aria-label' => get_aria_label(key) do
-        content_tag 'i', '', "aria-hidden" => true, class: "help-icon"
-      end
-    end
-
-    def help_icon_modal(modal_id)
-      link_to '#' + modal_id, id: "generic_file_#{modal_id}_help_modal", rel: 'button', 
-              data: { toggle: 'modal' }, 'aria-label' => get_aria_label(modal_id) do
-        content_tag 'i', '', "aria-hidden" => true, class: 'help-icon'
-      end
-    end
-
-    def metadata_help(key)
-      I18n.t("sufia.metadata_help.#{key}", default: key.to_s.humanize)
-    end
-
-    def get_label(key)
-      I18n.t("sufia.field_label.#{key}", default: key.to_s.humanize)
-    end
-
-    def get_aria_label(key)
-      I18n.t("sufia.aria_label.#{key}", default: default_aria_label(key.to_s.humanize))
-    end
-  
-    private
-
-    def more_or_less_button(key, html_class, symbol)
-      icon = (symbol == "-") ? "remove" : "plus"
-      content_tag 'span', class: 'input-group-btn field-controls' do
-        content_tag "button", class: "#{html_class} btn", id: "additional_#{key}_submit", name: "additional_#{key}" do
-          sr_hidden(icon) + sr_only(key.to_s)
-        end
-      end
-    end
-
-    def sr_hidden icon
-      content_tag "span", "aria-hidden" => true do 
-        content_tag "i", "", class: "glyphicon glyphicon-#{icon}" 
-      end
-    end
-
-    def sr_only text
-      content_tag "span", class: "sr-only" do 
-        "add another #{text}"
-      end
-    end
-
-    def default_aria_label text
-      I18n.t("sufia.aria_label.default", title: text)
-    end
-  end
-end

data/app/views/batch_edits/update_edit.js.erb

@@ -1,5 +0,0 @@
-<% value = "" %>
-<% @vals = [@vals] unless @vals.is_a?(Array) %>
-<% @vals.each { |val|  Rails.logger.warn"#{val.inspect}"; value = value + val+'<br />'}%>
-$("#data_<%= @key%>").html( "<%=value.html_safe%>");
-$("#status_<%= @key%>").html("Changes Saved");

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

@@ -1,18 +0,0 @@
-<%# This mimics the generic_files/descriptions partial & re-uses some of its sub-partials %>
-<div id="descriptions_display" class="tab-pane active">
-  <%= form_for collection, url: collections.collection_path, html: {multipart: true, class: 'form-horizontal'} do |f| %>
-    <%= hidden_field_tag('redirect_tab', 'descriptions') %>
-    <h2 class="non lower">Descriptions <small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
-      <div class="well">
-
-        <% (collection.terms_for_editing).each do |term| %>
-          <%= render partial: "records/edit_field", locals: { record: collection, f: f, render_req: true, key: term } %>
-        <% end %>
-   
-      </div><!-- /well -->
-    <div class="action-button">
-      <%= f.button '<i class="glyphicon glyphicon-floppy-disk"></i> Save Descriptions'.html_safe, type: 'submit', class: 'btn btn-primary',
-        onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" %>
-    </div>
-  <% end %>
-</div>

data/app/views/collections/edit_fields/_title.html.erb

@@ -1,3 +0,0 @@
-<div>
-  <%= f.text_field :title, name: "#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}]", id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", value: v, class: "form-control", required: record.required?(key)  %>
-</div>

data/app/views/generic_files/_field_form.html.erb

@@ -1,20 +0,0 @@
-<% render_req ||= true # render_req is true for single file edit, false for batch edit%>
-<div class="batch-group">
-  <% vals = f.object[key] %>
-  <% if render_req && required?(key) %>
-    <%= f.label key do %>
-      <span class="required-field">*</span><%= get_label(key) %>
-    <% end %>
-  <% else %>
-    <%= f.label key, get_label(key) %>
-  <% end %>
-  <%= help_icon(key) %>
-  <% if key == :resource_type %>
-    <%# resource_type is a multiselect box, so don't render one row for each %>
-    <%= render_edit_field_partial(key, record: f.object, f: f, render_req: render_req) %>
-  <% else %>
-    <% vals.to_ary.each_with_index do |v, index| %>
-      <%= render_edit_field_partial(key, record: f.object, f: f,  v: v, index: index, render_req: render_req) %>
-    <% end %>
-  <% end %>
- </div><!-- /.batch-group -->

data/app/views/records/_edit_field.html.erb

@@ -1,22 +0,0 @@
-<%# Overriding hydra-editor so that we can replace the call to 'render_edit_field_partial'
-  # With render_edit_field_partial_with_action because there is also a 
-  # 'render_edit_field_partial' in sufia that uses 'generic_file' as the action. %>
-<% render_req ||= true # render_req is true for single file edit, false for batch edit%>
-<div class="form-group">
-  <% vals = record[key] %>
-  <% if render_req && record.required?(key) %>
-    <% tmp = '<span class="required-field">*</span>' + get_label(key) %>
-    <%= f.label key, tmp.html_safe  %>
-  <% else %>
-    <%= f.label key, get_label(key) %>
-  <% end %>
-
-  <% if key == :resource_type %>
-    <%# resource_type is a multiselect box, so don't render one row for each %>
-    <%= render_edit_field_partial(key, record: record, f: f, render_req: render_req) %>
-  <% else %>
-    <% Array(vals).each_with_index do |v, index| %>
-      <%= render_edit_field_partial(key, record: record, f: f,  v: v, index: index, render_req: render_req) %>
-    <% end %>
-  <% end %>
-</div><!-- /.form-group -->

data/app/views/records/edit_fields/_suffix.html.erb

@@ -1,10 +0,0 @@
-        <% single ||= false %>
-        <% if index == 0  %>
-          <% unless single %>
-            <%= add_field(key) %>
-          <% end %>
-          <%= render partial: "records/rights_modal" if key == "rights" %>
-        <% else %>
-          <%= subtract_field(key) %>
-        <% end %>
-

data/app/views/records/edit_fields/_type.html.erb

@@ -1,8 +0,0 @@
-      <div class="form-group">
-        <%= f.label :resource_type, "Resource Types", for: "resource_type" %>
-        <p class="help-block">You may select multiple types to apply<p>
-        <%= f.select :resource_type, options_for_select(Sufia.config.resource_types.keys), {},
-          {multiple: true, size: 7} %>
-        <%= help_icon(:resource_type) %>
-      </div>
-

data/app/views/users/_social_media_info.html.erb

@@ -1,20 +0,0 @@
-  <% if !user.facebook_handle.blank?() %>
-    <dt><i class="fa fa-facebook"></i> Facebook Handle</dt>
-    <dd><%= link_to "http://facebook.com/#{user.facebook_handle}", "http://facebook.com/#{user.facebook_handle}", {target:'_blank'} %></dd>
-  <% end %>
-
-  <% if !user.twitter_handle.blank?() %>
-    <dt><i class="fa fa-twitter"></i> Twitter Handle</dt>
-    <dd><%= link_to "http://twitter.com/#{user.twitter_handle}", "http://twitter.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
-  <% end %>
-
-  <!-- 
-
-  <dt><i class="fa fa-google-plus"></i> Google+ Handle</dt>
-  <dd><%# link_to user.googleplus_handle, "http://google.com/+#{user.googleplus_handle}", {target:'_blank'} %></dd>
-  --> 
-
-  <% if !user.linkedin_handle.blank?() %>
-    <dt><i class="fa fa-linkedin"></i> Linked In</dt>
-    <dd><%= link_to "#{@linkedInUrl}", "#{@linkedInUrl}", {target:'_blank'} %></dd>
-  <% end %>

data/spec/helpers/records_helper_spec.rb

@@ -1,102 +0,0 @@
-require 'spec_helper'
-
-describe RecordsHelper do
-
-  describe "#add_field" do
-    let(:expected) {
-      "<span class=\"input-group-btn field-controls\"><button class=\"adder btn\" id=\"additional_test_submit\" name=\"additional_test\"><span aria-hidden=\"true\"><i class=\"glyphicon glyphicon-plus\"></i></span><span class=\"sr-only\">add another test</span></button></span>"
-    }
-
-    subject { helper.add_field(:test) }
-    it { is_expected.to eq expected }
-  end
-
-  describe "#subtract_field" do
-    let(:expected) {
-      "<span class=\"input-group-btn field-controls\"><button class=\"remover btn\" id=\"additional_test_submit\" name=\"additional_test\"><span aria-hidden=\"true\"><i class=\"glyphicon glyphicon-remove\"></i></span><span class=\"sr-only\">add another test</span></button></span>"
-    }
-
-    subject { helper.subtract_field(:test) }
-    it { is_expected.to eq expected }
-  end
-
-  it "draws help_icon" do
-    str = String.new(helper.help_icon(:tag))
-    doc = Nokogiri::HTML(str)
-    a = doc.xpath('//a').first
-    expect(a.attr('data-content')).to  eql("Words or phrases you select to describe what the file is about. These are used to search for content. <em>This is a required field</em>.")
-    expect(a.attr('data-original-title')).to  eql("Keyword")
-    expect(a.attr('id')).to  eql("generic_file_tag_help")
-    expect(a.children.first.attr('class')).to eql('help-icon')
-  end
-
-  specify "draws help_icon_modal" do
-    str = String.new(helper.help_icon_modal('myModal'))
-    doc = Nokogiri::HTML(str)
-    a = doc.xpath('//a').first
-    expect(a.attr('href')).to eq('#myModal')
-    expect(a.attr('data-toggle')).to eq('modal')
-    expect(a.attr('id')).to eq('generic_file_myModal_help_modal')
-    expect(a.children.first.attr('class')).to eq('help-icon')
-  end
-
-  describe "download links" do
-
-    let(:file) { GenericFile.new(id: "fake-1") }
-    let(:link_text) { helper.render_download_link("Download Fake") }
-    let(:icon_text) { helper.render_download_icon("Download the full-sized Fake") }
-
-    before { assign :generic_file, file }
-
-    describe "#render_download_link" do
-      it "has default text" do
-        expect(helper.render_download_link).to have_selector("#file_download")
-        expect(helper.render_download_link).to have_content("Download")
-      end
-
-      it "includes user-supplied link text" do
-        expect(link_text).to have_selector("#file_download")
-        expect(link_text).to have_content("Download Fake")
-      end
-    end
-
-    describe "#render_download_icon" do
-      it "has default text" do
-        expect(helper.render_download_icon).to have_selector("#file_download")
-        expect(helper.render_download_icon).to match("Download the document")
-      end
-
-      it "includes user-supplied icon text" do
-        expect(icon_text).to have_selector("#file_download")
-        expect(icon_text).to match("Download the full-sized Fake")
-      end
-    end
-  end
-
-  describe "#metadata_help" do
-    specify "default" do
-      expect(helper.metadata_help("foo")).to eql("Foo")
-    end
-    specify "using a key" do
-      expect(helper.metadata_help("language")).to eql("The language of the file content.")
-    end
-  end
-
-  describe "#get_label" do
-    specify "default" do
-      expect(helper.get_label("foo")).to eql("Foo")
-    end
-    specify "using a key" do
-      expect(helper.get_label("tag")).to eql("Keyword")
-    end
-  end
-
-  describe "#get_aria_label" do
-    specify "default" do
-      expect(helper.get_aria_label("foo")).to eql("Usage information for Foo")
-    end
-    specify "using a key" do
-      expect(helper.get_aria_label("tag")).to eql("Usage information for keyword")
-    end
-  end
-end

data/spec/models/generic_file/web_form_spec.rb

@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe GenericFile, :type => :model do
-  before do
-    subject.apply_depositor_metadata('jcoyne')
-  end
-
-  describe "terms_for_editing" do
-    it "should return a list" do
-      expect(subject.terms_for_editing).to eq([:resource_type, :title, :creator, :contributor, :description, :tag,
-                    :rights, :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url])
-    end
-  end
-  describe "terms_for_display" do
-    it "should return a list" do
-      expect(subject.terms_for_display).to eq([:resource_type, :title,
-        :creator, :contributor, :description, :tag, :rights, :publisher,
-        :date_created, :subject, :language, :identifier, :based_near,
-        :related_url])
-    end
-  end
-
-  describe "accessible_attributes" do
-    it "should have a list" do
-      expect(subject.accessible_attributes).to include(:part_of, :resource_type, :title, :creator, :contributor, :description,
-        :tag, :rights, :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url, :permissions_attributes)
-    end
-
-    it "should sanitize them" do
-      expect(subject.sanitize_attributes({'part_of' => 'A book', 'something_crazy' => "get's thrown out"})).to eq(
-        {'part_of' => 'A book'}
-      )
-    end
-  end
-end

data/sufia-models/app/models/concerns/sufia/generic_file/accessible_attributes.rb

@@ -1,87 +0,0 @@
-module Sufia
-  module GenericFile
-    module AccessibleAttributes
-      extend ActiveSupport::Concern
-      included do
-        class_attribute :_accessible_attributes
-        self._accessible_attributes = {}
-      end
-
-      def accessible_attributes(role = :default)
-         self.class._accessible_attributes[role] || []
-      end
-
-      # Sanitize the provided attributes using only those that are specified
-      # as accessible by attr_accessor
-      # @param [Hash] attributes the raw parameters
-      # @param [Hash] args a hash of options
-      # @option args [Symbol] :as (:default) the role to use
-      # @return A sanitized hash of parameters
-      def sanitize_attributes(attributes = {}, args = {})
-        role = args[:as] || :default
-        attributes.select { |k,v| accessible_attributes.include?(k.to_sym)}
-      end
-
-      module ClassMethods
-        # Specifies a white list of model attributes that can be set via
-        # mass-assignment.
-        #
-        # Like +attr_protected+, a role for the attributes is optional,
-        # if no role is provided then :default is used. A role can be defined by
-        # using the :as option.
-        #
-        # Mass-assignment will only set attributes in this list, to assign to
-        # the rest of # attributes you can use direct writer methods. This is
-        # meant to protect sensitive attributes from being overwritten by 
-        # malicious users # tampering with URLs or forms. 
-        #
-        #   class Customer
-        #     include ActiveModel::MassAssignmentSecurity
-        #
-        #     attr_accessor :name, :credit_rating
-        #
-        #     attr_accessible :name
-        #     attr_accessible :name, :credit_rating, as: :admin
-        #
-        #     def assign_attributes(values, options = {})
-        #       sanitize_for_mass_assignment(values, options[:as]).each do |k, v|
-        #         send("#{k}=", v)
-        #       end
-        #     end
-        #   end
-        #
-        # When using the :default role:
-        #
-        #   customer = Customer.new
-        #   customer.assign_attributes({ "name" => "David", "credit_rating" => "Excellent", last_login: 1.day.ago }, as: :default)
-        #   customer.name          # => "David"
-        #   customer.credit_rating # => nil
-        #
-        #   customer.credit_rating = "Average"
-        #   customer.credit_rating # => "Average"
-        #
-        # And using the :admin role:
-        #
-        #   customer = Customer.new
-        #   customer.assign_attributes({ "name" => "David", "credit_rating" => "Excellent", last_login: 1.day.ago }, as: :admin)
-        #   customer.name          # => "David"
-        #   customer.credit_rating # => "Excellent"
-        #
-        # Note that using <tt>Hash#except</tt> or <tt>Hash#slice</tt> in place of
-        # +attr_accessible+ to sanitize attributes provides basically the same
-        # functionality, but it makes a bit tricky to deal with nested attributes.
-        def attr_accessible(*args)
-          options = args.extract_options!
-          role = options[:as] || :default
-
-          self._accessible_attributes ||= {}
-
-          Array.wrap(role).each do |name|
-            self._accessible_attributes[name] = args.map &:to_sym
-          end
-        end
-
-      end
-    end
-  end
-end