sufia 4.0.0.beta2 → 4.0.0.beta3

data/{sufia-models/lib/sufia/models → app/models/concerns/sufia}/solr_document_behavior.rb

@@ -19,13 +19,18 @@ module Sufia
     # Offer the source (ActiveFedora-based) model to Rails for some of the
     # Rails methods (e.g. link_to).
     # @example
-    #   link_to '...', SolrDocument(:id => 'bXXXXXX5').new => <a href="/dams_object/bXXXXXX5">...</a>
+    #   link_to '...', SolrDocument(id: 'bXXXXXX5').new => <a href="/dams_object/bXXXXXX5">...</a>
     def to_model
       m = ActiveFedora::Base.load_instance_from_solr(id, self)
       return self if m.class == ActiveFedora::Base
       m
     end
 
+    # Method to return the ActiveFedora model
+    def hydra_model
+      self[Solrizer.solr_name('active_fedora_model', Solrizer::Descriptor.new(:string, :stored, :indexed))]
+    end
+
     def noid
       self[Solrizer.solr_name('noid', Sufia::GenericFile.noid_indexer)]
     end

data/app/models/contact_form.rb

@@ -1,28 +1,28 @@
 require 'mail_form'
 
 class ContactForm < MailForm::Base
-  ISSUE_TYPES = [ 
+  ISSUE_TYPES = [
       ["Depositing content", "Depositing content"],
       ["Making changes to my content", "Making changes to my content"],
-      ["Browsing and searching", "Browsing and searching"], 
+      ["Browsing and searching", "Browsing and searching"],
       ["Reporting a problem", "Reporting a problem"],
       ["General inquiry or request", "General inquiry or request"]
-    ] 
-  attribute :contact_method,  :captcha  => true
-  attribute :category,    :validate => true
-  attribute :name,        :validate => true
-  attribute :email,       :validate => /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
-  attribute :subject,     :validate => true
-  attribute :message,     :validate => true
-  # - can't use this without ActiveRecord::Base validates_inclusion_of :issue_type, :in => ISSUE_TYPES
+    ]
+  attribute :contact_method, captcha: true
+  attribute :category, validate: true
+  attribute :name, validate: true
+  attribute :email, validate: /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
+  attribute :subject, validate: true
+  attribute :message, validate: true
+  # - can't use this without ActiveRecord::Base validates_inclusion_of :issue_type, in: ISSUE_TYPES
 
   # Declare the e-mail headers. It accepts anything the mail method
   # in ActionMailer accepts.
   def headers
     {
-      :subject => "Contact Form:#{subject}",
-      :to => Sufia.config.contact_email, 
-      :from => Sufia.config.from_email
+      subject: "Contact Form:#{subject}",
+      to: Sufia.config.contact_email,
+      from: Sufia.config.from_email
     }
   end
 end

data/app/uploaders/tinymce_asset_uploader.rb

@@ -25,7 +25,7 @@ class TinymceAssetUploader < CarrierWave::Uploader::Base
   # end
 
   # Process files as they are uploaded:
-  # process :scale => [200, 300]
+  # process scale: [200, 300]
   #
   # def scale(width, height)
   #   # do something
@@ -33,7 +33,7 @@ class TinymceAssetUploader < CarrierWave::Uploader::Base
 
   # Create different versions of your uploaded files:
   # version :thumb do
-  #   process :scale => [50, 50]
+  #   process scale: [50, 50]
   # end
 
   # Add a white list of extensions which are allowed to be uploaded.

data/app/views/_controls.html.erb

@@ -11,7 +11,7 @@
       </nav><!-- /.navbar -->
     </div>
     <div class="col-xs-12 col-sm-7 col-md-6">
-      <%= render :partial => 'catalog/search_form' %>
+      <%= render partial: 'catalog/search_form' %>
     </div>
   </div> <!-- /.row -->
 </div><!-- /#masthead_controls -->

data/app/views/_flash_msg.html.erb

@@ -1,13 +1,7 @@
-<%
-flash_types_to_classes = {
-   :notice => 'alert-success',
-   :error => 'alert',
-   :alert => 'alert-error'
-}
-%>
+<% flash_types_to_classes = { notice: 'alert-success', error: 'alert-danger', alert: 'alert-warning' } %>
 <% [:notice, :error, :alert].each do |type| %>
   <% if flash[type] %>
-    <div class="alert alert-dismissable <%= flash_types_to_classes[type] rescue '' %> ui-corner-all <%= type.to_s %>">
+    <div class="alert <%= flash_types_to_classes[type] rescue '' %>">
       <a class="close" data-dismiss="alert" href="#">&times;</a>
       <% if flash[type].respond_to? :join %>
         <%= flash[type].join("<br/>").html_safe %>

data/app/views/_ga.html.erb

@@ -5,6 +5,10 @@ tracking_id = Sufia.config.google_analytics_id
 <script type="text/javascript">
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', '<%= tracking_id %>']);
+  <% if Rails.env.development? %>
+    // This allows us to look at GA data live from locahost
+    _gaq.push(['_setDomainName', 'none']);
+  <% end %>
   _gaq.push(['_trackPageview']);
 
   (function() {

data/app/views/_user_util_links.html.erb

@@ -1,19 +1,19 @@
 <% if user_signed_in? %>
     <div class="btn-group" id="user_utility_links">
-      <%= render :partial => 'users/notify_link' %>
+      <%= render partial: 'users/notify_link' %>
       <a href="<%= sufia.profile_path(current_user) %>" class="btn btn-default " id="profile_link" title="click for User Profile"><i class="glyphicon glyphicon-user">&nbsp;</i><%= current_user.name %>
       </a>
-      <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-caret-down" title="click for additional menu options"></span></a>
+      <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret" title="click for additional menu options"></span></a>
       <ul class="dropdown-menu dropdown-menu-right" role="menu">
-        <li><%= link_to raw('<i class="glyphicon glyphicon-dashboard"></i> my dashboard'), sufia.dashboard_index_path, :id => 'dashboard_nav_link' %></li>
-        <li><%= link_to raw('<i class="glyphicon glyphicon-upload"></i> upload'), sufia.new_generic_file_path, :id => 'upload_nav_link' %></li>
-        <li><%= link_to raw('<i class="glyphicon glyphicon-cog"></i> edit profile'), sufia.edit_profile_path(current_user), :id => 'upload_nav_link' %></li>
+        <li><%= link_to raw('<i class="glyphicon glyphicon-dashboard"></i> my dashboard'), sufia.dashboard_index_path, id: 'dashboard_nav_link' %></li>
+        <li><%= link_to raw('<i class="glyphicon glyphicon-upload"></i> upload'), sufia.new_generic_file_path, id: 'upload_nav_link' %></li>
+        <li><%= link_to raw('<i class="glyphicon glyphicon-cog"></i> edit profile'), sufia.edit_profile_path(current_user), id: 'upload_nav_link' %></li>
         <li class="divider"></li>
-        <li><%= link_to raw('<i class="glyphicon glyphicon-signout"></i> log out'), destroy_user_session_path, :id => 'logout_nav_link' %></li>
+        <li><%= link_to raw('<i class="glyphicon glyphicon-signout"></i> log out'), destroy_user_session_path, id: 'logout_nav_link' %></li>
       </ul>
     </div><!-- /.btn-group -->
 <% else %>
     <div class="btn-group login_button pull-right">
-    <%= link_to raw('<span class="glyphicon glyphicon-log-in"></span> Login'), new_user_session_path, :class => "btn btn-default btn-group" %>
+    <%= link_to raw('<span class="glyphicon glyphicon-log-in"></span> Login'), new_user_session_path, class: "btn btn-default btn-group" %>
     </div>
 <% end %>

data/app/views/advanced/_advanced_search_facets.html.erb

@@ -1 +1 @@
-<%= render_facet_partials facet_field_names, :partial => 'facet_limit' %>
+<%= render_facet_partials facet_field_names, partial: 'facet_limit' %>

data/app/views/advanced/_advanced_search_fields.html.erb

@@ -1,8 +1,8 @@
 <%- search_fields_for_advanced_search.each do |key, field_def| -%>
   <div class="control-group">
-      <%= label_tag key, "#{field_def.label }:", :class => 'control-label' %>
+      <%= label_tag key, "#{field_def.label }:", class: 'control-label' %>
     <div class="controls">
-      <%= text_field_tag key, label_tag_default_for(key), :class => 'input-large' %>
+      <%= text_field_tag key, label_tag_default_for(key), class: 'input-large' %>
     </div>
   </div>
 <%- end -%>

data/app/views/advanced/_advanced_search_form.html.erb

@@ -1,37 +1,37 @@
-<%= form_tag catalog_index_path, :class => 'form-horizontal', :method => :get do  %>
+<%= form_tag catalog_index_path, class: 'form-horizontal', method: :get do  %>
 
   <%= render_hash_as_hidden_fields(params_for_search(advanced_search_context)) %>
 
-  <div> 
-	      
+  <div>
+
     <div>
         <div class="control-group">
           <label class="control-label">Find items that match</label>
           <div class="controls">
-            <%= select_tag(:op, options_for_select({'all'=>'AND','any'=>'OR'}.sort,'all'), :class => "span10") %> of the fields below:
+            <%= select_tag(:op, options_for_select({ all: 'AND', any: 'OR'}.sort, 'all'), class: "span10") %> of the fields below:
           </div>
         </div>
-        
+
         <div id="advanced_search">
           <%= render 'advanced/advanced_search_fields' %>
-        </div>        
+        </div>
     </div>
   </div>
-  
+
   <% unless (search_context_str = render_search_to_s( advanced_search_context)).blank? %>
     <div>
       <p>Within search:</p>
       <%= search_context_str %>
     </div>
   <% end %>
-  
-  
+
+
   <div class="form-actions">
-    <%= label_tag(:sort, "Sort results by") %> 
+    <%= label_tag(:sort, "Sort results by") %>
     <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>
     <%= hidden_field_tag(:search_field, blacklight_config.advanced_search[:url_key]) %>
     <br />
-    <%= submit_tag 'Search', :class=>'btn btn-primary', :id=>'advanced_search' %>
-	  <%= link_to "Start over", {:controller => "advanced", :action => "index"}, :class =>"btn" %>
+    <%= submit_tag 'Search', class: 'btn btn-primary', id: 'advanced_search' %>
+	  <%= link_to "Start over", {controller: "advanced", action: "index"}, class:"btn" %>
   </div>
 <% end %>

data/app/views/batch/_metadata.html.erb

@@ -7,9 +7,9 @@
     <div class="span60">
       <% @batch.generic_files.sort! { |a,b| a.label.downcase <=> b.label.downcase }.each_with_index  do |gen_f, index| %>
         <div class="control-group">
-          <%= f.label :title, "<span class='error'>*</span> Title #{index+1}".html_safe, :class=>"control-label" %> 
+          <%= f.label :title, "<span class='error'>*</span> Title #{index + 1}".html_safe, class: "control-label" %>
           <div class="controls" id="additional_title_clone">
-            <%= f.text_field :title, :name=>"title[#{gen_f.id}][]", :value=>gen_f.label, :required=> true %>  
+            <%= f.text_field :title, name: "title[#{gen_f.id}][]", value: gen_f.label, required: true %>
             <%= help_icon(:title) %>
           </div>
         </div>
@@ -28,18 +28,18 @@
   <div class="well">
     <div class="control-group" id="resources">
       <%# See if this works: render_edit_field_partial(:type, f:f) %>
-      <%= f.label :resource_type, "Resource Types", :class=>"control-label", :for=>"resource_type" %>
+      <%= f.label :resource_type, "Resource Types", class: "control-label", for: "resource_type" %>
       <div class="controls">
           <p class="help-block">You may select multiple types to apply to all files<p>
-          <%= f.select "resource_type", Sufia::Engine::config.resource_types, {}, {:multiple=>true, :size=>7} %>
+          <%= f.select "resource_type", Sufia::Engine::config.resource_types, {}, { multiple: true, size: 7 } %>
           <%= help_icon(:resource_type) %>
       </div>
     </div>
 
     <div class="control-group">
-      <%= f.label :tag, "<span class='error'>*</span> Keyword".html_safe, :class=>"control-label" %> 
+      <%= f.label :tag, "<span class='error'>*</span> Keyword".html_safe, class: "control-label" %>
       <div class="controls" id="additional_tag_clone">
-          <%= f.text_field :tag, :name=>"generic_file[tag][]", :value=>"", :required=> true  %> 
+          <%= f.text_field :tag, name: "generic_file[tag][]", value: "", required: true  %>
           <button class="adder btn" name="additional_tag" id="additional_tag_submit">+<span class="sr-only">add another Tag</span></button>
           &nbsp;
           <%= help_icon(:tag) %>
@@ -48,9 +48,9 @@
     </div>
 
     <div class="control-group">
-      <%= f.label :creator, "<span class='error'>*</span> Creator".html_safe, :class=>"control-label" %>
+      <%= f.label :creator, "<span class='error'>*</span> Creator".html_safe, class: "control-label" %>
       <div class="controls" id="additional_creator_clone">
-        <%= f.text_field :creator, :name=>"generic_file[creator][]", :value=>"", :required=> true %>
+        <%= f.text_field :creator, name: "generic_file[creator][]", value: "", required: true %>
           <button class="adder btn" name="additional_creator" id="additional_creator_submit">+<span class="sr-only">add another Creator</span></button>
           &nbsp;
           <%= help_icon(:creator) %>
@@ -59,14 +59,14 @@
     </div>
 
     <div class="control-group">
-      <%= f.label :rights, '<span class="error">*</span> Rights'.html_safe, :class=>"control-label" %>
+      <%= f.label :rights, '<span class="error">*</span> Rights'.html_safe, class: "control-label" %>
       <div class="controls" id="additional_rights_clone">
-        <%= f.select "rights", options_for_select(Sufia::Engine::config.cc_licenses, 'http://creativecommons.org/licenses/by-nc-nd/3.0/us/'), :required => true %>
+        <%= f.select "rights", options_for_select(Sufia::Engine::config.cc_licenses, 'http://creativecommons.org/licenses/by-nc-nd/3.0/us/'), required: true %>
           <button class="adder btn" name="additional_rights" id="additional_rights_submit">+<span class="sr-only">add another Rights</span></button>
         &nbsp;
         <%= help_icon(:rights) %>
-        <%= render :partial => "generic_files/rights_modal" %>
-        
+        <%= render partial: "generic_files/rights_modal" %>
+
       </div>
       <div id="additional_rights_elements"></div>
     </div>

data/app/views/batch/_more_metadata.html.erb

@@ -1,6 +1,5 @@
     <div class="hide" id="more_descriptions">
       <% (@generic_file.terms_for_editing - [:title, :creator, :rights, :tag, :resource_type]).each do |term| %>
-        <%= render :partial => "generic_files/field_form", :locals => { :generic_file => @generic_file, :f =>f, :render_req => false, :key => term } %>
+        <%= render partial: "generic_files/field_form", locals: { generic_file: @generic_file, f: f, render_req: false, key: term } %>
       <% end %>
     </div> <!-- /more_descriptions -->
-

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

@@ -23,17 +23,17 @@ function confirmExit(){
 <br />
 <div class="alert">The information you provide for Title will be applied to the corresponding file only; however all other
   information you provide will be applied <em>to the entire batch of files</em> you have just deposited into <%= t('sufia.product_name') %>.
-  You may edit individual files from <%= link_to '<i class="icon-dashboard"></i> my dashboard'.html_safe, sufia.dashboard_index_path %> once
+  You may edit individual files from <%= link_to "<i class='icon-dashboard'></i> #{t('sufia.bread_crumb.file_list')}".html_safe, sufia.dashboard_files_path %> once
   this step is finished.
 </div>
-<%= form_for([@batch, @generic_file], :url => sufia.batch_generic_files_path, :html => {:multipart => true, :class => 'form-horizontal'}) do |f| %>
+<%= form_for([@batch, @generic_file], url: sufia.batch_generic_files_path, html: { multipart: true, class: 'form-horizontal' }) do |f| %>
 
-  <%= render :partial => 'metadata', :formats => [:html], :locals => {:f => f} %>
+  <%= render partial: 'metadata', formats: [:html], locals: {f: f} %>
 
-  <%= render :partial => 'generic_files/permission_form', :formats => [:html], :locals => { :gf => @generic_file, :batch=> @batch } %>
+  <%= render partial: 'generic_files/permission_form', formats: [:html], locals: { gf: @generic_file, batch: @batch } %>
 
   <div class="row form-actions" id="permissions_submit">
-          <%= button_tag '<i class="icon-save"></i> Save'.html_safe, :type => 'submit', :class => 'btn-primary btn-large', :onclick => "confirmation_needed = false;", :id => "upload_submit", :name => "update_permission" %>
+          <%= button_tag '<i class="icon-save"></i> Save'.html_safe, type: 'submit', class: 'btn-primary btn-large', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" %>
   </div>
 
 <% end %>

data/app/views/batch_edits/_check_all.html.erb

@@ -1,6 +1,6 @@
   <% if !@disable_select_all %> 
     <div class="dropdown" >
-      <%= check_box_tag 'check_all', 'yes', @all_checked, :disabled => ((@batch_size_on_other_page + @document_list.count) > @max_batch_size) %>
+      <%= check_box_tag 'check_all', 'yes', @all_checked, disabled: ((@batch_size_on_other_page + @document_list.count) > @max_batch_size) %>
       <a class="dropdown-toggle"  data-toggle="dropdown" href="#"><span class="icon-cog" title="click for selection options"></span></a>
       <ul class="dropdown-menu">
         <%= render partial: "#{controller_name}/batch_edits_actions" %>

data/app/views/batch_edits/_delete_selected.html.erb

@@ -1,5 +1,4 @@
-<%= form_tag(batch_edits_path, :method => :delete, :class=> "batch-select-all hidden", "data-behavior" => 'batch-select-all') do -%>  
+<%= form_tag(batch_edits_path, method: :delete, class: "batch-select-all hidden", "data-behavior" => 'batch-select-all') do -%>
     <%= hidden_field_tag('update_type', 'delete_all') %>
-  <%= submit_tag("Delete Selected", :class=>'batch-all-button btn btn-primary submits-batches', :data => { :confirm => "Deleting a file from #{t('sufia.product_name')} is permanent. Click OK to delete this file from #{t('sufia.product_name')}, or Cancel to cancel this operation"}) %>
+  <%= submit_tag("Delete Selected", class: 'batch-all-button btn btn-primary submits-batches', data: { confirm: "Deleting a file from #{t('sufia.product_name')} is permanent. Click OK to delete this file from #{t('sufia.product_name')}, or Cancel to cancel this operation" }) %>
 <% end %>
-

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

@@ -1,9 +1,9 @@
-<%= render :partial => 'generic_files/breadcrumbs', :locals => {:include_file=>false} %>
+<%= render partial: 'generic_files/breadcrumbs', locals: {include_file: false} %>
 <h2 class="non lower">Batch Edit Descriptions &nbsp;&nbsp;&nbsp;<small>Click on labels below to edit file descriptions.</small> </h2>
 <div class="scrollx scrolly fileHeight"> <!-- original values -->
-  <h3> <b>Changes will be applied to: (<%=@names.size%> files) </b></h3>
+  <h3> <b>Changes will be applied to: (<%= @names.size %> files) </b></h3>
    <%= @names.join(", ").html_safe %>
-</div> <!-- /original values --> 
+</div> <!-- /original values -->
 
 <div >
   <h3> Descriptions:</h3>
@@ -13,43 +13,43 @@
       <li id="edit_permissions_link"><a href="#permissions_display" data-toggle="tab"><i class="icon-key"></i> Permissions</a></li>
     </ul>
     <div class="tab-content">
-      <div class="well tab-pane active" id="descriptions_display"> 
+      <div class="well tab-pane active" id="descriptions_display">
         <table class="table table-striped"><!-- class="verticalheadings"> -->
         <tbody>
         <% @terms.each do |term| %>
-          <% vals =  @show_file.send(term) %>
-              <tr id='row_<%=term.to_s%>' class="expandable">
+          <% vals = @show_file.send(term) %>
+              <tr id='row_<%= term.to_s %>' class="expandable">
                 <th width="20%">
-                   <a class="accordion-toggle grey" data-toggle="collapse" data-parent="#row_<%=term.to_s%>" href="#collapse_<%=term.to_s%>">
-                      <%=get_label(term)%>&nbsp;<i class="toggle icon-chevron-right grey"></i>
+                   <a class="accordion-toggle grey" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#collapse_<%=term.to_s%>">
+                      <%= get_label(term) %>&nbsp;<i class="toggle icon-chevron-right grey"></i>
                    </a>
                 </th>
                 <td  width="50%" class="scrolly">
-      
-                    <div id="collapse_<%=term.to_s%>" class="accordion-body collapse scrolly">
-                      <%= form_for @generic_file, :url=>batch_edits_path, :method=>:put, :remote => true, :html => { :id=>"form_"+term.to_s, :class=>"ajax-form"} do |f| %>
+
+                    <div id="collapse_<%= term.to_s %>" class="accordion-body collapse scrolly">
+                      <%= form_for @generic_file, url: batch_edits_path, method: :put, remote: true, html: { id: "form_#{term.to_s}", class: "ajax-form"} do |f| %>
                           <%= hidden_field_tag('update_type', 'update') %>
                           <%= hidden_field_tag('key', term.to_s) %>
-                          <%= render :partial => "generic_files/field_form", :locals => { :generic_file => @show_file, :f =>f, :render_req => false, :key => term } %>
+                          <%= render partial: "generic_files/field_form", locals: { generic_file: @show_file, f: f, render_req: false, key: term } %>
                         <div class="row">
-                           <%= f.submit "Save changes", :class=>'btn btn-primary field-save updates-batches' , :id=>term.to_s+'_save'%>
-                           <a class="accordion-toggle btn" data-toggle="collapse" data-parent="#row_<%=term.to_s%>" href="#collapse_<%=term.to_s%>">Cancel </a>
-                           <div id="status_<%=term.to_s%>" class="status fleft"></div>
+                           <%= f.submit "Save changes", class: 'btn btn-primary field-save updates-batches' , id: "#{term.to_s}_save" %>
+                           <a class="accordion-toggle btn" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#collapse_<%= term.to_s %>">Cancel </a>
+                           <div id="status_<%= term.to_s %>" class="status fleft"></div>
                         </div>
                       <% end %>
                     </div>
-                </td>          
+                </td>
               </tr>
          <% end %>
           </tbody></table> <!-- class="verticalheadings"> -->
       </div><!-- /well -->
       <div id="permissions_display" class="tab-pane">
-        <%= form_for @generic_file, :url=>batch_edits_path, :method=>:put, :remote => true, :html => { :id=>"form_permissions", :class=>"ajax-form"} do |f| %>
+        <%= form_for @generic_file, url: batch_edits_path, method: :put, remote: true, html: { id: "form_permissions", class: "ajax-form"} do |f| %>
            <%= hidden_field_tag('update_type', 'update') %>
            <%= hidden_field_tag('key', 'permissions') %>
-           <%= render :partial => "generic_files/permission_form", :locals => { :gf => @show_file } %>
+           <%= render partial: "generic_files/permission_form", locals: { gf: @show_file } %>
          <div class="row">
-            <%= f.submit "Save changes", :class=>'btn btn-primary updates-batches', :id=>'permissions_save' %>
+            <%= f.submit "Save changes", class: 'btn btn-primary updates-batches', id: 'permissions_save' %>
             <a class="accordion-toggle btn" data-toggle="collapse" data-parent="#row_permissions" href="#collapse_permissions">Cancel </a>
             <div id="status_permissions" class="status fleft"></div>
          </div>
@@ -58,7 +58,6 @@
    </div> <!-- .tab-content -->
 
 <!-- Ajax call to clear the batch before page uload. -->
-<%= button_to "Clear Batch", { :controller => :batch_edits, :action=>:clear  }, :form_class=>'hidden' , :remote => true, :id=>'clear_batch' %> 
+<%= button_to "Clear Batch", { controller: :batch_edits, action: :clear }, form_class: 'hidden', remote: true, id: 'clear_batch' %>
 
 </div><!-- descriptions_display -->
-

data/app/views/catalog/_bookmark_control.html.erb

@@ -1,22 +1,21 @@
 <% if has_user_authentication_provider? and current_user %>
-  <%- existing_bookmark = current_user.existing_bookmark_for(document.id) -%>
   <%- 
   # Note these two forms are pretty similar but for different :methods, classes, and labels. 
   # but it was simpler to leave them separate instead of DRYing them, got confusing trying that.
   # the data-doc-id attribute is used by our JS that converts to a checkbox/label.
   -%>  
-  <% unless existing_bookmark %>  
+  <% if current_user.document_is_bookmarked? document %>  
 
-      <%= form_tag( bookmark_path( document ), :method => :put, :class => "bookmark_toggle", "data-doc-id" => document.id, :title=> document[document_show_link_field] ) do %>        
-        <%= hidden_field(:bookmark, :title, :value => document[document_show_link_field] ) %>
-        <%= submit_tag("Bookmark", :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_add") %>
+      <%= form_tag( bookmark_path( document ), method: :put, class: "bookmark_toggle", "data-doc-id" => document.id, title: document[document_show_link_field] ) do %>        
+        <%= hidden_field(:bookmark, :title, value: document[document_show_link_field] ) %>
+        <%= submit_tag("Bookmark", id: "bookmark_toggle_#{document.id.to_s.parameterize}", class: "bookmark_add") %>
       <% end %>
   
   <% else %>
   
-      <%= form_tag( bookmark_path( document ), :method => :delete, :class => "bookmark_toggle", "data-doc-id" => document.id, :title=> document[document_show_link_field]) do %>  
-        <%= hidden_field(:bookmark, :title, :value => document[document_show_link_field] ) %>
-        <%= submit_tag("Remove bookmark", :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_remove") %>
+      <%= form_tag( bookmark_path( document ), method: :delete, class: "bookmark_toggle", "data-doc-id" => document.id, title: document[document_show_link_field]) do %>  
+        <%= hidden_field(:bookmark, :title, value: document[document_show_link_field] ) %>
+        <%= submit_tag("Remove bookmark", id: "bookmark_toggle_#{document.id.to_s.parameterize}", class: "bookmark_remove") %>
       <% end %>
       
   <% end %>

data/app/views/catalog/_constraints_element.html.erb

@@ -3,8 +3,8 @@
     # label 
     # value
     # options =>
-    #   :remove => url for a remove constraint link
-    #   :classes => array of classes to add to container span
+    #   remove: url for a remove constraint link
+    #   classes: array of classes to add to container span
     options ||= {}
     options[:escape_label] = true unless options.has_key?(:escape_label)
     options[:escape_value] = true unless options.has_key?(:escape_value)