enju_biblio 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c37cbe83dd1627b914c2c413b1e182782d1838c0
-  data.tar.gz: 7a588c5262d34e03cb616c4ef3ef37a4f7c90156
+  metadata.gz: a1eb140bfb7d033553767e30d96b21f1e5676b96
+  data.tar.gz: 64e7b0582b80a5f10a62f60cb02ac85b0cf1f421
 SHA512:
-  metadata.gz: 2ac36b3277b5baec8c67c8f40acff89c03638a1db11d0da40cb5e51949b33e9be9b43d580267ab158991ce07dc46e43edb30e438cf0a84156697c375a5b50fd6
-  data.tar.gz: c846feccbf62baf34c91bb1a82d96a14cf5790101d6be1d2b37ed05255f8cbacafd5c51ec7d620c8b6c2eaddde61c2f80ba67f8a40f9d2007905fbb7b01dd91d
+  metadata.gz: 1ab614207670a2737639e68137b6759a5338b6679352f948b2dd0885e199dca4daea3d8eb99c4e1540cd0554fcf2e96f973a2930f2963178da725d7adbd9a9fa
+  data.tar.gz: 9153e48531157e6d7e6f787829fc74d127a5dda1d9edb6bbb6dd6dc8b0c452cc6038ea0d4f063541a8a7cc1778893c404a51335c9bc1638f78b08ace98b5b15c

data/app/controllers/carrier_types_controller.rb

@@ -1,7 +1,8 @@
 class CarrierTypesController < ApplicationController
-  before_action :set_carrier_type, only: [:show, :edit, :update, :destroy]
+  before_action :set_carrier_type, only: [:edit, :update, :destroy]
   before_action :check_policy, only: [:index, :new, :create]
   before_action :prepare_options, only: [:new, :edit]
+  skip_after_action :verify_authorized
 
   # GET /carrier_types
   # GET /carrier_types.json
@@ -17,11 +18,15 @@ class CarrierTypesController < ApplicationController
   # GET /carrier_types/1
   # GET /carrier_types/1.json
   def show
+    @carrier_type = CarrierType.find(params[:id])
+    unless params[:format] == 'download'
+      authorize @carrier_type
+    end
     if @carrier_type.attachment.path
       if ENV['ENJU_STORAGE'] == 's3'
         file = Faraday.get(@carrier_type.attachment.expiring_url).body.force_encoding('UTF-8')
       else
-        file = @carrier_type.attachment.path(size)
+        file = @carrier_type.attachment.path
       end
     end
 
@@ -127,7 +132,7 @@ class CarrierTypesController < ApplicationController
   end
 
   def render_image(file)
-    if @carrier_type.picture.path
+    if @carrier_type.attachment.path
       if ENV['ENJU_STORAGE'] == 's3'
         send_data file, filename: File.basename(@carrier_type.attachment_file_name), type: @carrier_type.attachment_content_type, disposition: 'inline'
       else

data/app/controllers/manifestations_controller.rb

@@ -571,14 +571,27 @@ class ManifestationsController < ApplicationController
       library_list = options[:library_adv].split.uniq.join(' OR ')
       query = "#{query} library_sm:(#{library_list})"
     end
+    shelf_list = []
+    options.keys.grep(/_shelf\Z/).each do |library_shelf|
+      library_name = library_shelf.sub(/_shelf\Z/, "")
+      options[library_shelf].each do |shelf|
+        shelf_list << "#{library_name}_#{shelf}"
+      end
+    end
+    unless shelf_list.blank?
+      query += " shelf_sm:(#{shelf_list.join(" OR ")})"
+    end
 
     #unless options[:language].blank?
     #  query = "#{query} language_sm:#{options[:language]}"
     #end
 
-    #unless options[:subject].blank?
-    #  query = "#{query} subject_sm:#{options[:subject]}"
-    #end
+    unless options[:subject].blank?
+      query = "#{query} subject_sm:#{options[:subject]}"
+    end
+    unless options[:subject_text].blank?
+      query = "#{query} subject_text:#{options[:subject_text]}"
+    end
     if options[:classification].present? and options[:classification_type].present?
       classification_type = ClassificationType.find(options[:classification_type]).name
       query = "#{query} classification_sm:#{classification_type}_#{options[:classification]}*"
@@ -841,7 +854,7 @@ class ManifestationsController < ApplicationController
   end
 
   def filtered_params
-    params.permit([:view, :format, :library, :carrier_type, :reservable, :pub_date_from, :pub_date_until, :language, :sort_by, :per_page])
+    params.permit([:view, :format, :library, :carrier_type, :reservable, :pub_date_from, :pub_date_until, :language, :sort_by, :per_page, :query])
   end
 
   helper_method :filtered_params

data/app/controllers/picture_files_controller.rb

@@ -35,7 +35,7 @@ class PictureFilesController < ApplicationController
       if ENV['ENJU_STORAGE'] == 's3'
         file = Faraday.get(@picture_file.picture.expiring_url).body.force_encoding('UTF-8')
       else
-        file = @picture_file.picture.path(size)
+        file = @picture_file.picture.path(size.to_sym)
       end
     end
 

data/app/controllers/series_statements_controller.rb

@@ -133,4 +133,10 @@ class SeriesStatementsController < ApplicationController
       :series_master
     )
   end
+
+  def filtered_params
+    params.permit([:locale, :format, :page, :per_page])
+  end
+
+  helper_method :filtered_params
 end

data/app/helpers/manifestations_helper.rb

@@ -96,7 +96,7 @@ module ManifestationsHelper
 
   def carrier_type_facet(facet)
     string = ''
-    carrier_type = CarrierType.where(name: facet.value).select([:name, :display_name]).first
+    carrier_type = CarrierType.where(name: facet.value).select([:id, :name, :display_name]).first
     if carrier_type
       string << form_icon(carrier_type)
       current = true if params[:carrier_type] == carrier_type.name

data/app/models/agent_import_file_transition.rb

@@ -17,4 +17,5 @@ end
 #  agent_import_file_id :integer
 #  created_at           :datetime
 #  updated_at           :datetime
+#  most_recent          :boolean
 #

data/app/models/carrier_type.rb

@@ -35,11 +35,15 @@ end
 #
 # Table name: carrier_types
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                      :integer          not null, primary key
+#  name                    :string           not null
+#  display_name            :text
+#  note                    :text
+#  position                :integer
+#  created_at              :datetime
+#  updated_at              :datetime
+#  attachment_file_name    :string
+#  attachment_content_type :string
+#  attachment_file_size    :integer
+#  attachment_updated_at   :datetime
 #

data/app/models/import_request_transition.rb

@@ -17,4 +17,5 @@ end
 #  import_request_id :integer
 #  created_at        :datetime
 #  updated_at        :datetime
+#  most_recent       :boolean
 #

data/app/models/manifestation.rb

@@ -541,6 +541,7 @@ class Manifestation < ActiveRecord::Base
       note
       extent
       dimensions
+      carrier_type
     )
 
     header += IdentifierType.order(:position).pluck(:name)
@@ -567,6 +568,7 @@ class Manifestation < ActiveRecord::Base
       header += %w(
         bookstore
         budget_type
+        total_checkouts
       )
     end
     header += %w(
@@ -612,6 +614,7 @@ class Manifestation < ActiveRecord::Base
         item_lines << note
         item_lines << extent
         item_lines << dimensions
+        item_lines << carrier_type.name
 
         IdentifierType.order(:position).pluck(:name).each do |identifier_type|
           if identifier_contents(identifier_type.to_sym).first
@@ -650,6 +653,7 @@ class Manifestation < ActiveRecord::Base
         when :Administrator, :Librarian
           item_lines << i.bookstore.try(:name)
           item_lines << i.budget_type.try(:name)
+          item_lines << Checkout.where(:item_id => i.id).size
         end
         item_lines << i.circulation_status.try(:name)
         item_lines << i.shelf.name
@@ -687,6 +691,7 @@ class Manifestation < ActiveRecord::Base
       line << note
       line << extent
       line << dimensions
+      line << carrier_type.name
 
       IdentifierType.order(:position).pluck(:name).each do |identifier_type|
         if identifier_contents(identifier_type.to_sym).first

data/app/models/resource_export_file_transition.rb

@@ -17,4 +17,5 @@ end
 #  resource_export_file_id :integer
 #  created_at              :datetime
 #  updated_at              :datetime
+#  most_recent             :boolean
 #

data/app/models/resource_import_file_transition.rb

@@ -17,4 +17,5 @@ end
 #  resource_import_file_id :integer
 #  created_at              :datetime
 #  updated_at              :datetime
+#  most_recent             :boolean
 #

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

@@ -22,7 +22,10 @@
         <%= move_position(carrier_type) -%>
       <%- end -%>
     </td>
-    <td><%= carrier_type.name -%></td>
+    <td>
+      <%= image_tag(carrier_type_path(carrier_type, format: :download), size: '16x16', class: 'enju_icon', alt: carrier_type.display_name.localize) %>
+      <%= carrier_type.name -%>
+    </td>
     <td>
       <%= link_to carrier_type.display_name.localize, carrier_type -%>
       <br />

data/app/views/manifestations/_show_detail_librarian.html.erb

@@ -104,6 +104,10 @@
       </table>
     <% end %>
     <%- if manifestation.items.exists? -%>
+      <div class="manifestation_total_checkouts">
+        <%= t('manifestation.total_checkouts') %>: <%= manifestation.checkouts(manifestation.created_at, Date.today).size %>
+        (<%= t('manifestation.this_year_checkouts') %>: <%= manifestation.checkouts(Date.today-1.year, Date.today).size %>)
+      </div>
       <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items %>
     <%- end -%>
     <%- if policy(Item).create? -%>

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

@@ -61,6 +61,9 @@
               t('page.sort_criteria.title_desc')].join(" : ") => 'title:desc',
           }, selected: filtered_params[:sort_by] || 'created_at:desc') -%>
           <%= hidden_field_tag 'query', @query -%>
+          <% [ :reservable, :carrier_type, :library, :language, :pub_year ].each do |p| -%>
+            <%= hidden_field_tag p, filtered_params[p] if filtered_params[p] -%>
+          <% end -%>
           <%= submit_tag t('page.show') -%><br />
         </p>
       <%- end -%>

data/config/locales/translation_en.yml

@@ -393,6 +393,8 @@ en:
     attachment_file: "Attachment file"
     add_derivation: "Add a derivation"
     new_item: "New item"
+    this_year_checkouts: "Checkouts for the past year"
+    total_checkouts: "Total checkouts"
 
   item:
     current_checkout: "Current checkout"

data/config/locales/translation_ja.yml

@@ -397,6 +397,8 @@ ja:
     attachment_file: "添付ファイル"
     add_derivation: "派生資料を追加"
     new_item: "新規作成"
+    this_year_checkouts: "過去一年間の貸出回数"
+    total_checkouts: "累計貸出回数"
 
   item:
     current_checkout: "現在の貸出"

data/lib/enju_biblio/biblio_helper.rb

@@ -1,18 +1,7 @@
 module EnjuBiblio
   module BiblioHelper
     def form_icon(carrier_type)
-      case carrier_type.name
-      when 'volume'
-        image_tag('icons/book.png', size: '16x16', class: 'enju_icon', alt: carrier_type.display_name.localize)
-      when 'audio_disc'
-        image_tag('icons/cd.png', size: '16x16', class: 'enju_icon', alt: carrier_type.display_name.localize)
-      when 'videodisc'
-        image_tag('icons/dvd.png', size: '16x16', class: 'enju_icon', alt: carrier_type.display_name.localize)
-      when 'online_resource'
-        image_tag('icons/monitor.png', size: '16x16', class: 'enju_icon', alt: carrier_type.display_name.localize)
-      else
-        image_tag('icons/help.png', size: '16x16', class: 'enju_icon', alt: t('page.unknown'))
-      end
+      image_tag(carrier_type_path(carrier_type, format: :download), size: '16x16', class: 'enju_icon', alt: carrier_type.display_name.localize)
     rescue NoMethodError
       image_tag('icons/help.png', size: '16x16', class: 'enju_icon', alt: t('page.unknown'))
     end

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/generators/enju_biblio/setup/templates/config/schedule.rb

@@ -1,4 +1,4 @@
 
-every 1.hour do
-  rake "enju_biblio:import"
-end
+#every 1.hour do
+#  rake "enju_biblio:resource_import"
+#end

data/lib/tasks/carrier_type.rb

@@ -1,26 +1,38 @@
 def update_carrier_type
-  cd = CarrierType.where(name: 'CD').first
-  cd.update_column(:name, 'cd') if cd
-  dvd = CarrierType.where(name: 'DVD').first
-  dvd.update_column(:name, 'dvd') if cd
-
-  carrier_types = YAML.load(open('db/fixtures/enju_biblio/carrier_types.yml').read)
-  carrier_types.each do |line|
-    l = line[1].select!{|k, v| %w(name display_name note).include?(k)}
-
-    case line[1]["name"]
+  CarrierType.find_each do |carrier_type|
+    case carrier_type.name
     when "volume"
-    carrier_type = CarrierType.where(name: 'print').first
-    carrier_type.update_attributes!(line[1]) if carrier_type
+      carrier_type = CarrierType.find_by(name: 'volume')
+      if carrier_type
+        unless carrier_type.attachment
+          carrier_type.attachment = File.open("#{File.dirname(__FILE__)}/../../app/assets/images/icons/book.png")
+          carrier_type.save!
+        end
+      end
     when "audio_disc"
-    carrier_type = CarrierType.where(name: 'cd').first
-    carrier_type.update_attributes!(line[1]) if carrier_type
+      carrier_type = CarrierType.find_by(name: 'audio_disc')
+      if carrier_type
+        unless carrier_type.attachment
+          carrier_type.attachment = File.open("#{File.dirname(__FILE__)}/../../app/assets/images/icons/cd.png")
+          carrier_type.save!
+        end
+      end
     when "videodisc"
-    carrier_type = CarrierType.where(name: 'dvd').first
-    carrier_type.update_attributes!(line[1]) if carrier_type
+      carrier_type = CarrierType.find_by(name: 'videodisc')
+      if carrier_type
+        unless carrier_type.attachment
+          carrier_type.attachment = File.open("#{File.dirname(__FILE__)}/../../app/assets/images/icons/dvd.png")
+          carrier_type.save!
+        end
+      end
     when "online_resource"
-    carrier_type = CarrierType.where(name: 'file').first
-    carrier_type.update_attributes!(line[1]) if carrier_type
+      carrier_type = CarrierType.find_by(name: 'online_resource')
+      if carrier_type
+        unless carrier_type.attachment
+          carrier_type.attachment = File.open("#{File.dirname(__FILE__)}/../../app/assets/images/icons/monitor.png")
+          carrier_type.save!
+        end
+      end
     end
   end
 end

data/lib/tasks/enju_biblio_tasks.rake

@@ -11,6 +11,7 @@ namespace :enju_biblio do
     Dir.glob(Rails.root.to_s + '/db/fixtures/enju_biblio/*.yml').each do |file|
       ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_biblio', File.basename(file, '.*'))
     end
+    update_carrier_type
   end
 
   desc "import manifestations and items from a TSV file"
@@ -29,6 +30,7 @@ namespace :enju_biblio do
     Rake::Task['statesman:backfill_most_recent'].invoke('ImportRequest')
     Rake::Task['statesman:backfill_most_recent'].invoke('ResourceExportFile')
     Rake::Task['statesman:backfill_most_recent'].invoke('ResourceImportFile')
+    update_carrier_type
     puts 'enju_biblio: The upgrade completed successfully.'
   end
 end

data/spec/controllers/agent_import_files_controller_spec.rb

@@ -4,37 +4,37 @@ require 'rails_helper'
 describe AgentImportFilesController do
   fixtures :all
 
-  describe "GET index" do
-    describe "When logged in as Administrator" do
+  describe 'GET index' do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "assigns all agent_import_files as @agent_import_files" do
+      it 'assigns all agent_import_files as @agent_import_files' do
         get :index
         expect(assigns(:agent_import_files)).to eq(AgentImportFile.page(1))
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "assigns all agent_import_files as @agent_import_files" do
+      it 'assigns all agent_import_files as @agent_import_files' do
         get :index
         expect(assigns(:agent_import_files)).to eq(AgentImportFile.page(1))
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "assigns empty as @agent_import_files" do
+      it 'assigns empty as @agent_import_files' do
         get :index
         expect(assigns(:agent_import_files)).to be_nil
         expect(response).to be_forbidden
       end
     end
 
-    describe "When not logged in" do
-      it "assigns empty as @agent_import_files" do
+    describe 'When not logged in' do
+      it 'assigns empty as @agent_import_files' do
         get :index
         expect(assigns(:agent_import_files)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
@@ -42,76 +42,76 @@ describe AgentImportFilesController do
     end
   end
 
-  describe "GET show" do
-    describe "When logged in as Administrator" do
+  describe 'GET show' do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "assigns the requested agent_import_file as @agent_import_file" do
-        get :show, :id => 1
+      it 'assigns the requested agent_import_file as @agent_import_file' do
+        get :show, id: 1
         expect(assigns(:agent_import_file)).to eq(AgentImportFile.find(1))
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "assigns the requested agent_import_file as @agent_import_file" do
-        get :show, :id => 1
+      it 'assigns the requested agent_import_file as @agent_import_file' do
+        get :show, id: 1
         expect(assigns(:agent_import_file)).to eq(AgentImportFile.find(1))
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "assigns the requested agent_import_file as @agent_import_file" do
-        get :show, :id => 1
+      it 'assigns the requested agent_import_file as @agent_import_file' do
+        get :show, id: 1
         expect(assigns(:agent_import_file)).to eq(AgentImportFile.find(1))
       end
     end
 
-    describe "When not logged in" do
-      it "assigns the requested agent_import_file as @agent_import_file" do
-        get :show, :id => 1
+    describe 'When not logged in' do
+      it 'assigns the requested agent_import_file as @agent_import_file' do
+        get :show, id: 1
         expect(assigns(:agent_import_file)).to eq(AgentImportFile.find(1))
         expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
 
-  describe "GET new" do
-    describe "When logged in as Administrator" do
+  describe 'GET new' do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "assigns the requested agent_import_file as @agent_import_file" do
+      it 'assigns the requested agent_import_file as @agent_import_file' do
         get :new
         expect(assigns(:agent_import_file)).to_not be_valid
         expect(response).to be_success
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "should not assign the requested agent_import_file as @agent_import_file" do
+      it 'should not assign the requested agent_import_file as @agent_import_file' do
         get :new
         expect(assigns(:agent_import_file)).to_not be_valid
         expect(response).to be_success
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "should not assign the requested agent_import_file as @agent_import_file" do
+      it 'should not assign the requested agent_import_file as @agent_import_file' do
         get :new
         expect(assigns(:agent_import_file)).to be_nil
         expect(response).to be_forbidden
       end
     end
 
-    describe "When not logged in" do
-      it "should not assign the requested agent_import_file as @agent_import_file" do
+    describe 'When not logged in' do
+      it 'should not assign the requested agent_import_file as @agent_import_file' do
         get :new
         expect(assigns(:agent_import_file)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
@@ -119,161 +119,161 @@ describe AgentImportFilesController do
     end
   end
 
-  describe "POST create" do
-    describe "When logged in as Librarian" do
+  describe 'POST create' do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "should create agent_import_file" do
-        post :create, :agent_import_file => {:agent_import => fixture_file_upload("/../../examples/agent_import_file_sample1.tsv", 'text/csv') }
+      it 'should create agent_import_file' do
+        post :create, agent_import_file: { agent_import: fixture_file_upload('/../../examples/agent_import_file_sample1.tsv', 'text/csv') }
         expect(assigns(:agent_import_file)).to be_valid
         assigns(:agent_import_file).user.username.should eq @user.username
         expect(response).to redirect_to agent_import_file_url(assigns(:agent_import_file))
       end
 
-      it "should import user" do
+      it 'should import user' do
         old_agents_count = Agent.count
-        post :create, :agent_import_file => {:agent_import => fixture_file_upload("/../../examples/agent_import_file_sample2.tsv", 'text/csv') }
+        post :create, agent_import_file: { agent_import: fixture_file_upload('/../../examples/agent_import_file_sample2.tsv', 'text/csv') }
         assigns(:agent_import_file).import_start
         Agent.count.should eq old_agents_count + 3
         expect(response).to redirect_to agent_import_file_url(assigns(:agent_import_file))
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "should be forbidden" do
-        post :create, :agent_import_file => {:agent_import => fixture_file_upload("/../..//examples/agent_import_file_sample1.tsv", 'text/csv') }
+      it 'should be forbidden' do
+        post :create, agent_import_file: { agent_import: fixture_file_upload('/../..//examples/agent_import_file_sample1.tsv', 'text/csv') }
         expect(response).to be_forbidden
       end
     end
 
-    describe "When not logged in" do
-      it "should be redirect to new session url" do
-        post :create, :agent_import_file => {:agent_import => fixture_file_upload("/../../examples/agent_import_file_sample1.tsv", 'text/csv') }
+    describe 'When not logged in' do
+      it 'should be redirect to new session url' do
+        post :create, agent_import_file: { agent_import: fixture_file_upload('/../../examples/agent_import_file_sample1.tsv', 'text/csv') }
         expect(response).to redirect_to new_user_session_url
       end
     end
   end
 
-  describe "GET edit" do
-    describe "When logged in as Administrator" do
+  describe 'GET edit' do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "assigns the requested agent_import_file as @agent_import_file" do
+      it 'assigns the requested agent_import_file as @agent_import_file' do
         agent_import_file = agent_import_files(:agent_import_file_00001)
-        get :edit, :id => agent_import_file.id
+        get :edit, id: agent_import_file.id
         expect(assigns(:agent_import_file)).to eq(agent_import_file)
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "assigns the requested agent_import_file as @agent_import_file" do
+      it 'assigns the requested agent_import_file as @agent_import_file' do
         agent_import_file = agent_import_files(:agent_import_file_00001)
-        get :edit, :id => agent_import_file.id
+        get :edit, id: agent_import_file.id
         expect(assigns(:agent_import_file)).to eq(agent_import_file)
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "assigns the requested agent_import_file as @agent_import_file" do
+      it 'assigns the requested agent_import_file as @agent_import_file' do
         agent_import_file = agent_import_files(:agent_import_file_00001)
-        get :edit, :id => agent_import_file.id
+        get :edit, id: agent_import_file.id
         expect(response).to be_forbidden
       end
     end
 
-    describe "When not logged in" do
-      it "should not assign the requested agent_import_file as @agent_import_file" do
+    describe 'When not logged in' do
+      it 'should not assign the requested agent_import_file as @agent_import_file' do
         agent_import_file = agent_import_files(:agent_import_file_00001)
-        get :edit, :id => agent_import_file.id
+        get :edit, id: agent_import_file.id
         expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
 
-  describe "PUT update" do
-    describe "When logged in as Librarian" do
+  describe 'PUT update' do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "should update agent_import_file" do
-        put :update, :id => agent_import_files(:agent_import_file_00003).id, :agent_import_file => {mode: "modify"}
+      it 'should update agent_import_file' do
+        put :update, id: agent_import_files(:agent_import_file_00003).id, agent_import_file: { mode: 'modify' }
         expect(response).to redirect_to agent_import_file_url(assigns(:agent_import_file))
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "should not update agent_import_file" do
-        put :update, :id => agent_import_files(:agent_import_file_00003).id, :agent_import_file => {mode: "modify"}
+      it 'should not update agent_import_file' do
+        put :update, id: agent_import_files(:agent_import_file_00003).id, agent_import_file: { mode: 'modify' }
         expect(response).to be_forbidden
       end
     end
 
-    describe "When not logged in" do
-      it "should not update agent_import_file" do
-        put :update, :id => agent_import_files(:agent_import_file_00003).id, :agent_import_file => {mode: "modify"}
+    describe 'When not logged in' do
+      it 'should not update agent_import_file' do
+        put :update, id: agent_import_files(:agent_import_file_00003).id, agent_import_file: { mode: 'modify' }
         expect(response).to redirect_to new_user_session_url
       end
     end
   end
 
-  describe "DELETE destroy" do
+  describe 'DELETE destroy' do
     before(:each) do
       @agent_import_file = agent_import_files(:agent_import_file_00001)
     end
 
-    describe "When logged in as Administrator" do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "destroys the requested agent_import_file" do
-        delete :destroy, :id => @agent_import_file.id
+      it 'destroys the requested agent_import_file' do
+        delete :destroy, id: @agent_import_file.id
       end
 
-      it "redirects to the agent_import_files list" do
-        delete :destroy, :id => @agent_import_file.id
+      it 'redirects to the agent_import_files list' do
+        delete :destroy, id: @agent_import_file.id
         expect(response).to redirect_to(agent_import_files_url)
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "destroys the requested agent_import_file" do
-        delete :destroy, :id => @agent_import_file.id
+      it 'destroys the requested agent_import_file' do
+        delete :destroy, id: @agent_import_file.id
       end
 
-      it "redirects to the agent_import_files list" do
-        delete :destroy, :id => @agent_import_file.id
+      it 'redirects to the agent_import_files list' do
+        delete :destroy, id: @agent_import_file.id
         expect(response).to redirect_to(agent_import_files_url)
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "destroys the requested agent_import_file" do
-        delete :destroy, :id => @agent_import_file.id
+      it 'destroys the requested agent_import_file' do
+        delete :destroy, id: @agent_import_file.id
       end
 
-      it "should be forbidden" do
-        delete :destroy, :id => @agent_import_file.id
+      it 'should be forbidden' do
+        delete :destroy, id: @agent_import_file.id
         expect(response).to be_forbidden
       end
     end
 
-    describe "When not logged in" do
-      it "destroys the requested agent_import_file" do
-        delete :destroy, :id => @agent_import_file.id
+    describe 'When not logged in' do
+      it 'destroys the requested agent_import_file' do
+        delete :destroy, id: @agent_import_file.id
       end
 
-      it "should be forbidden" do
-        delete :destroy, :id => @agent_import_file.id
+      it 'should be forbidden' do
+        delete :destroy, id: @agent_import_file.id
         expect(response).to redirect_to(new_user_session_url)
       end
     end