sufia 4.0.0.beta4 → 4.0.0.rc1

data/app/views/my/_index_partials/_list_collections.html.erb

@@ -8,7 +8,7 @@ on element ids -->
   <td width="1%">
   </td>
   <td width="37%">
-    <a href="" title="Click for more details"><i id="expand_<%= noid.gsub(":", "_") %>" class="glyphicon-plus icon-large fleft"></i></a>&nbsp;
+    <a href="" title="Click for more details"><i id="expand_<%= noid.gsub(":", "_") %>" class="glyphicon-plus large-icon fleft"></i></a>&nbsp;
     <%= link_to image_tag("/assets/folder.png", width: 36), collections.collection_path(noid) %>
     <span class=center><%= link_to document.title_or_label, collections.collection_path(noid), id: "src_copy_link#{noid}" %> <br /></span>
   </td>

data/app/views/my/_index_partials/_list_files.html.erb

@@ -13,9 +13,9 @@
   <td width="41%">
     <a href="#" title="Click for more details"><i id="expand_<%= noid %>" class="glyphicon glyphicon-plus"></i></a>&nbsp;
     <%= link_to sufia.generic_file_path(document) do %>
-      <%= render_thumbnail_tag document %>
+      <%= render_thumbnail_tag document, class:"hidden-xs file_listing_thumbnail" %>
     <% end %>
-    <span class=center>
+    <span>
       <%= link_to document.title_or_label, sufia.generic_file_path(noid), id: "src_copy_link#{noid}", class: "#{'document-title' if document.title_or_label == document.label}" %><br/>
     </span>
   </td>

data/app/views/my/_results_pagination.html.erb

@@ -1,6 +1,9 @@
 <% if @response.total_pages > 1 %>
-  <div class="pager"> 
-    <%= paginate @response, outer_window: 2, theme: 'blacklight', route_set: sufia %>
-    <div class="clearfix"></div>
-  </div><!-- /pager -->
+ <div class="row record-padding">
+  <div class="col-md-9"> 
+    <div class="pagination">
+      <%= paginate @response, outer_window: 2, theme: 'blacklight', route_set: sufia %>
+    </div>
+  </div>
+ </div>
 <% end %>

data/app/views/my/_sort_and_per_page.html.erb

@@ -7,17 +7,13 @@
     <% session[:batch_edit_state] = "on" %>
     <%= batch_edit_continue "Edit Selected" %>
     <%= batch_delete %>
-    <%= form_tag sufia.dashboard_index_path  do %>
-      <%= hidden_field_tag :type, nil, value: "Add to Collection" %>
-      <div>
-      </div>
-    <% end %>
-        <%= button_tag "Add to Collection", class: 'btn btn-primary submits-batches submits-batches-add',
-          data: { toggle: "modal", target: "#collection-list-container" } %>
+    <%= button_tag "Add to Collection", class: 'btn btn-primary submits-batches submits-batches-add',
+        data: { toggle: "modal", target: "#collection-list-container" } %>
   </div>
+
   <div class="sort-toggle">
     <% unless @response.response['numFound'] < 2 %>
-      <%= form_tag sufia.dashboard_index_path, method: :get, class: 'per_page form-inline' do %>
+      <%= form_tag sufia.dashboard_files_path, method: :get, class: 'per_page form-inline' do %>
         <%= label_tag(:sort, "<span>Sort By:</span>".html_safe) %>
         <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>			      
         &nbsp;&nbsp;&nbsp;
@@ -31,4 +27,5 @@
       <% end %>
     <% end unless sort_fields.empty? %>
   </div>
+  
 </div>

data/app/views/my/facet.html.erb

@@ -1,6 +1,3 @@
-<!-- This was copied from https://github.com/projectblacklight/blacklight/blob/master/app/views/catalog/facet.html.erb
- It implements the facets in the same manner as blacklight does for the main catalog for the individual's dashbord
--->
 <div class="facet_pagination top">
   <%= render partial: 'facet_pagination' %>
 </div>
@@ -11,10 +8,10 @@
 </div>
 <div class="modal-body">
   <div class="facet_extended_list">
-    <%= render_facet_limit(@display_facet, layout: false) %>
+  <%= render_facet_limit(@display_facet, layout: false) %>
   </div>
 </div>
-
+  
 <div class="modal-footer">
 
   <div class="facet_pagination bottom">

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

@@ -10,7 +10,7 @@
 <% @page_title = application_name + " Dashboard" %>
 
 <% if params.has_key?("q") %>
-    <div class="alert alert-info"><i class="glyphicon glyphicon-search icon-large"></i> You searched for:
+    <div class="alert alert-info"><i class="glyphicon glyphicon-search large-icon"></i> You searched for:
       <strong><%= params[:q] %></strong></div>
 <% end %>
 

data/app/views/single_use_links/new_download.html.erb

@@ -1,5 +1,5 @@
 <div class="single-use-link">
 <h1>Single Use Link</h1>
 <p>Anyone can use the following link once to download the file</p>
-<%= link_to @asset, @link, class: 'download-link' %> <%= link_to raw('<i class="icon-link icon-large"></i>'), '#', class: 'copypaste itemicon itemcode', title: 'Copy File URL', id: "copy_link_#{@asset.pid}" %>
+<%= link_to @asset, @link, class: 'download-link' %> <%= link_to raw('<i class="glyphicon glyphicon-link large-icon"></i>'), '#', class: 'copypaste itemicon itemcode', title: 'Copy File URL', id: "copy_link_#{@asset.pid}" %>
 </div>

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

@@ -1,5 +1,5 @@
 <div class="tab-pane active" id="contributions">
-  <i class="icon-trophy trophy-on"></i> <strong>Highlighted Files</strong>
+  <i class="glyphicon glyphicon-star trophy-on"></i> <strong>Highlighted Files</strong>
   <% if @trophies.count > 0 %>
     <table>
       <% @trophies.each do |t| %>
@@ -12,8 +12,8 @@
           <td>
             <%= link_to display_title(t), sufia.generic_file_path(t) %>
             <% if current_user == @user %>
-              <%= display_trophy_link current_user, t.noid, class: 'glyphicon glyphicon-trophy', data: {removerow: true} do %>
-                <i class='trophy-on icon-remove'></i>
+              <%= display_trophy_link current_user, t.noid, class: 'glyphicon glyphicon-star', data: {removerow: true} do %>
+                <i class='trophy-on glyphicon glyphicon-remove'></i>
               <% end %>
             <% end %>
           </td>

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

@@ -1,7 +1,7 @@
       <ul class="nav nav-tabs" id="myTab">
-        <li class="active"><a href="#contributions"><i class="glyphicon glyphicon-trophy"></i> Contributions</a></li>
-        <li><a href="#profile"><i class="icon-info-sign"></i> Profile</a></li>
-        <li><a href="#activity_log" ><i class="icon-rss"></i> Activity</a></li>
+        <li class="active"><a href="#contributions"><i class="glyphicon glyphicon-star"></i> Contributions</a></li>
+        <li><a href="#profile"><i class="glyphicon glyphicon-info-sign"></i> Profile</a></li>
+        <li><a href="#activity_log" ><i class="glyphicon glyphicon-calendar"></i> Activity</a></li>
       </ul>
        
       <div class="tab-content">

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

@@ -1,10 +1,10 @@
   <% if !user.facebook_handle.blank?() %>
-    <dt><i class="glyphicon glyphicon-facebook"></i> Facebook Handle</dt>
+    <dt><i class="icon-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="glyphicon glyphicon-twitter"></i> Twitter Handle</dt>
+    <dt><i class="icon-twitter"></i> Twitter Handle</dt>
     <dd><%= link_to "http://twitter.com/#{user.twitter_handle}", "http://twitter.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
   <% end %>
 
@@ -15,6 +15,6 @@
   --> 
 
   <% if !user.linkedin_handle.blank?() %>
-    <dt><i class="glyphicon glyphicon-linkedin"></i> Linked In</dt>
+    <dt><i class="icon-linkedin"></i> Linked In</dt>
     <dd><%= link_to "#{@linkedInUrl}", "#{@linkedInUrl}", {target:'_blank'} %></dd>
   <% end %>

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

@@ -1,6 +1,6 @@
 <div class="control-label">
-  <i class="icon-trophy trophy-on" ></i> Remove Highlight Designation
-  <a href="#" id="remove_trophy_help" rel="popover" data-content="If you would like to remove a highlight designation, check the box and save your profile." data-original-title="Remove Highlight Designation"><i class="glyphicon glyphicon-question-sign icon-large"></i></a>
+  <i class="glyphicon glyphicon-star trophy-on" ></i> Remove Highlight Designation
+  <a href="#" id="remove_trophy_help" rel="popover" data-content="If you would like to remove a highlight designation, check the box and save your profile." data-original-title="Remove Highlight Designation"><i class="glyphicon glyphicon-question-sign"></i></a>
 </div>
 <div class="control-group">
   <dl>

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

@@ -1,11 +1,11 @@
 <dl id="user_info" class="row">
-  <dt class="col-xs-5"><i class="glyphicon glyphicon-facebook"></i> Facebook Handle</dt>
+  <dt class="col-xs-5"><i class="icon-facebook"></i> Facebook Handle</dt>
   <dd class="col-xs-7"><%= link_to user.facebook_handle, "http://facebook.com/#{user.facebook_handle}", {target:'_blank'} %></dd>
 
-  <dt class="col-xs-5"><i class="glyphicon glyphicon-twitter"></i> Twitter Handle</dt>
+  <dt class="col-xs-5"><i class="icon-twitter"></i> Twitter Handle</dt>
   <dd class="col-xs-7"><%= link_to user.twitter_handle, "http://twitter.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
  
-  <dt class="col-xs-5"><i class="glyphicon glyphicon-google-plus"></i> Google+ Handle</dt>
+  <dt class="col-xs-5"><i class="icon-google-plus"></i> Google+ Handle</dt>
   <dd class="col-xs-7"><%= link_to user.googleplus_handle, "http://google.com/+#{user.googleplus_handle}", {target:'_blank'} %></dd>
  
   <dt class="col-xs-5"><i class="glyphicon glyphicon-envelope-alt"></i> Email</dt>
@@ -52,7 +52,7 @@
   <% end %>
 
   <% if user.telephone %>
-    <dt class="col-xs-5"><i class="glyphicon glyphicon-phone"></i> Telephone</dt>
+    <dt class="col-xs-5"><i class="glyphicon glyphicon-earphone"></i> Telephone</dt>
     <dd class="col-xs-7"><%= link_to_telephone(user) %></dd>
   <% end %>
 

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

@@ -1,8 +1,3 @@
-<% content_for :local_js do %>
-// initialize popover helpers
-$("a[rel=popover]").popover({ html: true });
-<% end %>
-
 <h1>Edit Profile</h1>
 <div class="col-xs-12 col-sm-5 well">
   <%= form_for @user, url: sufia.profile_path(@user.to_param), html: {multipart: true, class: 'form-horizontal' } do |f| %>
@@ -21,7 +16,7 @@ $("a[rel=popover]").popover({ html: true });
       <div class="col-xs-8">
         <label class="checkbox">
           <%= f.check_box :remove_avatar %> Yes
-          <a href="#" id="delete_picture_help" rel="popover" data-content="If you would like to remove your picture entirely, check the box and save your profile." data-original-title="Delete Picture"><i class="glyphicon glyphicon-question-sign icon-large"></i></a>
+          <a href="#" id="delete_picture_help" rel="popover" data-content="If you would like to remove your picture entirely, check the box and save your profile." data-original-title="Delete Picture"><i class="glyphicon glyphicon-question-sign"></i></a>
         </label>
       </div><!-- .controls -->
     </div><!-- .form-group -->
@@ -31,27 +26,27 @@ $("a[rel=popover]").popover({ html: true });
       <div class="col-xs-8">
         <label class="checkbox">
           <%= check_box_tag 'update_directory' %> Yes
-          <a href="#" id="refresh_directory_help" rel="popover" data-content="The information displayed in your profile comes from <%=t('sufia.institution_name') %>'s central directory (LDAP) and is cached by <%=t('sufia.product_name') %>.  If you have updated that information and don't see those changes in your <%=t('sufia.product_name') %> profile, check the box and save your profile." data-original-title="Refresh Directory Info"><i class="glyphicon glyphicon-question-sign icon-large"></i></a>
+          <a href="#" id="refresh_directory_help" rel="popover" data-content="The information displayed in your profile comes from <%=t('sufia.institution_name') %>'s central directory (LDAP) and is cached by <%=t('sufia.product_name') %>.  If you have updated that information and don't see those changes in your <%=t('sufia.product_name') %> profile, check the box and save your profile." data-original-title="Refresh Directory Info"><i class="glyphicon glyphicon-question-sign"></i></a>
         </label>
       </div><!-- .controls -->
     </div><!-- .form-group -->
 
     <div class="form-group">
-      <%= f.label :twitter_handle, '<i class="glyphicon glyphicon-twitter"></i> Twitter Handle'.html_safe, class: 'col-xs-4 control-label' %>
+      <%= f.label :twitter_handle, '<i class="icon-twitter"></i> Twitter Handle'.html_safe, class: 'col-xs-4 control-label' %>
       <div class="col-xs-8">
          <%= f.text_field :twitter_handle, class: "input-medium" %>
       </div><!-- .controls -->
     </div><!-- .form-group -->
 
     <div class="form-group">
-      <%= f.label :facebook_handle, '<i class="glyphicon glyphicon-facebook"></i> Facebook Handle'.html_safe, class: 'col-xs-4 control-label' %>
+      <%= f.label :facebook_handle, '<i class="icon-facebook"></i> Facebook Handle'.html_safe, class: 'col-xs-4 control-label' %>
       <div class="col-xs-8">
          <%= f.text_field :facebook_handle, class: "input-medium" %>
       </div><!-- .controls -->
     </div><!-- .form-group -->
 
     <div class="form-group">
-      <%= f.label :googleplus_handle, '<i class="glyphicon glyphicon-google-plus"></i> Google+ Handle'.html_safe, class: 'col-xs-4 control-label' %>
+      <%= f.label :googleplus_handle, '<i class="icon-google-plus"></i> Google+ Handle'.html_safe, class: 'col-xs-4 control-label' %>
       <div class="col-xs-8">
          <%= f.text_field :googleplus_handle, class: "input-medium" %>
       </div><!-- .controls -->

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

@@ -1,24 +1,19 @@
-<% content_for :local_js do %>
-
-$('#myTab a').click(function (e) {
-  e.preventDefault();
-  $(this).tab('show');
-})
-
+<%= javascript_tag do %>
+  $('#myTab a').click(function (e) {
+    e.preventDefault();
+    $(this).tab('show');
+  })
 <% end %>
-  <div class="col-xs-12">
-    <div class="pull-right">
-      <%= render 'profile_actions' %>
-    </div>
-    <span class="col-xs-3">
-      <%= render 'left_sidebar' %>
-    </span>
 
-    <!-- right col -->
-    <span class="col-xs-9">
-      <%= render 'profile_tabs' %>
-    </span>
+<div class="col-xs-12">
+  <div class="pull-right">
+    <%= render 'profile_actions' %>
   </div>
-
-
-
+  <span class="col-xs-3">
+    <%= render 'left_sidebar' %>
+  </span>
+  <!-- right col -->
+  <span class="col-xs-9">
+    <%= render 'profile_tabs' %>
+  </span>
+</div>

data/config/locales/sufia.en.yml

@@ -18,17 +18,17 @@ en:
             label_short:  "All"
             label_long:   "All of Sufia"
           my_files:
-            label_short:  "My Files" 
+            label_short:  "My Files"
             label_long:   "My Files"
           my_collections:
-            label_short:  "My Collections" 
+            label_short:  "My Collections"
             label_long:   "My Collections"
           my_highlights:
-            label_short:  "My Highlights" 
+            label_short:  "My Highlights"
             label_long:   "My Highlights"
           my_shares:
-            label_short:  "My Shares" 
-            label_long:   "My Shares"      
+            label_short:  "My Shares"
+            label_long:   "My Shares"
     upload:
       my_computer:
         tab_label: "My Computer"
@@ -44,7 +44,8 @@ en:
       tag:              "Keyword"
       date_created:     "Date Created"
       related_url:      "Related URL"
-
+    homepage:
+      featured_works:       'Featured Works'
     dashboard:
       title:                "My Dashboard"
       greeting:             "Hello, "

data/config/routes.rb

@@ -1,10 +1,10 @@
 Sufia::Engine.routes.draw do
 
   # Downloads controller route
-  resources :homepage, only: "index"
+  resources :homepage, only: 'index'
 
   # Route the home page as the root
-  root to: "homepage#index"
+  root to: 'homepage#index'
 
   get 'single_use_link/generate_download/:id' => 'single_use_links#new_download', as: :generate_download_single_use_link
   get 'single_use_link/generate_show/:id' => 'single_use_links#new_show', as: :generate_show_single_use_link
@@ -13,8 +13,8 @@ Sufia::Engine.routes.draw do
 
   match 'batch_edits/clear' => 'batch_edits#clear', as: :batch_edits_clear, via: [:get, :post]
 
-  # "Notifications" route for catalog index view
-  get "users/notifications_number" => "users#notifications_number", as: :user_notify
+  # Notifications route for catalog index view
+  get 'users/notifications_number' => 'users#notifications_number', as: :user_notify
 
   # Generic file routes
   resources :generic_files, path: :files, except: :index do
@@ -29,7 +29,7 @@ Sufia::Engine.routes.draw do
   resources :featured_work_lists, path: 'featured_works', only: :create
 
   # Downloads controller route
-  resources :downloads, only: "show"
+  resources :downloads, only: 'show'
 
   # Messages
   resources :notifications, only: [:destroy, :index], controller: :mailbox do
@@ -48,38 +48,31 @@ Sufia::Engine.routes.draw do
   end
 
   # Dashboard page
-  resources 'dashboard', only: :index do
+  resources :dashboard, only: :index do
     collection do
       get 'activity', action: :activity, as: :dashboard_activity
     end
   end
 
   # Routes for user's files, collections, highlights and shares
-  namespace :dashboard do
-    resources :files, only: :index, controller: "/my/files" do
-      collection do
-        get 'page/:page', action: :index
-        get 'facet/:id', action: :facet, as: :dashboard_facet
-      end
-    end
-    resources :collections, only: :index, controller: "/my/collections" do
-      collection do
-        get 'page/:page', action: :index
-        get 'facet/:id', action: :facet, as: :dashboard_facet
-      end
-    end
-    resources :highlights, only: :index, controller: "/my/highlights" do
-      collection do
-        get 'page/:page', action: :index
-        get 'facet/:id', action: :facet, as: :dashboard_facet
-      end
-    end
-    resources :shares, only: :index, controller: "/my/shares" do
-      collection do
-        get 'page/:page', action: :index
-        get 'facet/:id', action: :facet, as: :dashboard_facet
-      end
-    end
+  # Preserves existing behavior by maintaining paths to /dashboard
+  # Routes actions to the various My controllers
+  scope :dashboard do
+    get '/files',             controller: 'my/files', action: :index, as: 'dashboard_files'
+    get '/files/page/:page',  controller: 'my/files', action: :index
+    get '/files/facet/:id',   controller: 'my/files', action: :facet, as: 'dashboard_files_facet'
+    
+    get '/collections',             controller: 'my/collections', action: :index, as: 'dashboard_collections'
+    get '/collections/page/:page',  controller: 'my/collections', action: :index
+    get '/collections/facet/:id',   controller: 'my/collections', action: :facet, as: 'dashboard_collections_facet'
+    
+    get '/highlights',            controller: 'my/highlights', action: :index, as: 'dashboard_highlights'
+    get '/highlights/page/:page', controller: 'my/highlights', action: :index
+    get '/highlights/facet/:id',  controller: 'my/highlights', action: :facet, as: 'dashboard_highlights_facet'
+    
+    get '/shares',            controller: 'my/shares', action: :index, as: 'dashboard_shares'
+    get '/shares/page/:page', controller: 'my/shares', action: :index
+    get '/shares/facet/:id',  controller: 'my/shares', action: :facet, as: 'dashboard_shares_facet'
   end
 
   # advanced routes for advanced search
@@ -108,7 +101,7 @@ Sufia::Engine.routes.draw do
   if defined?(Sufia::ResqueAdmin)
     namespace :admin do
       constraints Sufia::ResqueAdmin do
-        mount Resque::Server, at: "queues"
+        mount Resque::Server, at: 'queues'
       end
     end
   end

data/lib/generators/sufia/sufia_generator.rb

@@ -38,7 +38,7 @@ This generator makes the following changes to your application:
         "  \n# Adds Sufia behaviors into the application controller \n" +
         "  include Sufia::Controller\n"
       end
-      gsub_file file_path, "layout 'blacklight'", "layout :search_layout"
+      gsub_file file_path, "layout 'blacklight'", "layout 'sufia-one-column'"
     else
       puts "     \e[31mFailure\e[0m  Could not find #{file_path}.  To add Sufia behaviors to your Controllers, you must include the Sufia::Controller module in the Controller class definition."
     end

data/lib/generators/sufia/upgrade400_generator.rb

@@ -0,0 +1,87 @@
+# -*- encoding : utf-8 -*-
+require 'rails/generators'
+require 'rails/generators/migration'
+
+class Sufia::Upgrade400Generator < Rails::Generators::Base
+  include Rails::Generators::Migration
+
+  source_root File.expand_path('../templates', __FILE__)
+
+  argument :model_name, type: :string , default: "user"
+  desc """
+This generator for upgrading sufia from 3.7.2 to 4.0 makes the following changes to your application:
+ 1. Updates the root route
+ 2. Adds Sufia's abilities into the Ability class
+ 3. Adds Sufia behavior to the catalog controller
+ 4. Creates a Sufia helper
+ 5. Removes Blacklight stylesheet
+ 6. Creates TinyMCE config for editable content feature
+ 7. Adds blacklight-marc dependency if SolrDocument depends on it
+ 8. Runs sufia-models upgrade generator
+       """
+
+  def banner
+    say_status("warning", "UPGRADING SUFIA", :yellow)
+  end
+
+  # The engine routes have to come after the devise routes so that /users/sign_in will work
+  def update_root_route
+    # Nuke old Sufia-related routes
+    gsub_file 'config/routes.rb', 'root :to => "catalog#index"', "root to: 'homepage#index'"
+  end
+
+  def insert_abilities
+    insert_into_file 'app/models/ability.rb', after: /Hydra::Ability/ do
+      "\n  include Sufia::Ability\n"
+    end
+  end
+
+  # Add Sufia behaviors to the catalog controller
+  def inject_sufia_controller_behavior
+    controller_name = "CatalogController"
+    file_path = "app/controllers/catalog_controller.rb"
+    if File.exists?(file_path)
+      insert_into_file file_path, after: 'include Hydra::Controller::ControllerBehavior' do
+        "\n  # Adds Sufia behaviors to the catalog controller\n" +
+        "  include Sufia::Catalog\n"
+      end
+    else
+      puts "     \e[31mFailure\e[0m  Could not find #{file_path}.  To add Sufia behaviors to your Controllers, you must include the Sufia::Catalog module in the CatalogController class definition."
+    end
+  end
+
+  def copy_helper
+    copy_file 'sufia_helper.rb', 'app/helpers/sufia_helper.rb'
+  end
+
+  def remove_blacklight_scss
+    remove_file 'app/assets/stylesheets/blacklight.css.scss'
+  end
+
+  def tinymce_config
+    copy_file "config/tinymce.yml", "config/tinymce.yml"
+  end
+
+  def blacklight_marc
+    file_path = 'app/models/solr_document.rb'
+    return unless File.exists?(file_path) &&
+      file_contains?('app/models/solr_document.rb', 'Blacklight::Solr::Document::Marc') &&
+      !file_contains?('Gemfile', 'blacklight-marc')
+    insert_into_file 'Gemfile', after: /gem 'sufia'.*$/ do
+      "\ngem 'blacklight-marc'"
+    end
+    Bundler.with_clean_env do
+      run 'bundle install'
+    end
+  end
+
+  def upgrade_sufia_models
+    generate "sufia:models:upgrade400"
+  end
+
+  private
+
+  def file_contains?(path, string)
+    File.readlines(path).grep(/#{string}/).any?
+  end
+end