enju_biblio 0.1.0.pre55 → 0.1.0.pre56

data/app/controllers/items_controller.rb

@@ -1,17 +1,16 @@
 # -*- encoding: utf-8 -*-
 class ItemsController < ApplicationController
   load_and_authorize_resource
-  before_filter :get_agent, :get_manifestation, :get_shelf, :except => [:create, :update, :destroy]
+  before_filter :get_agent, :get_manifestation, :get_shelf, except: [:create, :update, :destroy]
   if defined?(EnjuInventory)
     before_filter :get_inventory_file
   end
-  before_filter :get_library, :get_item, :except => [:create, :update, :destroy]
-  before_filter :prepare_options, :only => [:new, :edit]
-  before_filter :get_version, :only => [:show]
+  before_filter :get_library, :get_item, except: [:create, :update, :destroy]
+  before_filter :prepare_options, only: [:new, :edit]
+  before_filter :get_version, only: [:show]
   #before_filter :store_location
-  after_filter :solr_commit, :only => [:create, :update, :destroy]
-  after_filter :convert_charset, :only => :index
-  cache_sweeper :item_sweeper, :only => [:create, :update, :destroy]
+  after_filter :solr_commit, only: [:create, :update, :destroy]
+  after_filter :convert_charset, only: :index
 
   # GET /items
   # GET /items.json
@@ -21,7 +20,7 @@ class ItemsController < ApplicationController
     @count = {}
     if user_signed_in?
       if current_user.has_role?('Librarian')
-        if params[:format] == 'csv'
+        if params[:format] == 'txt'
           per_page = 65534
         elsif params[:mode] == 'barcode'
           per_page = 40
@@ -112,7 +111,7 @@ class ItemsController < ApplicationController
 
     if defined?(EnjuBarcode)
       if params[:mode] == 'barcode'
-        render :action => 'barcode', :layout => false
+        render action: 'barcode', layout: false
         return
       end
     end
@@ -121,8 +120,8 @@ class ItemsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @items }
-      format.csv  { render :layout => false }
+      format.json { render json: @items }
+      format.txt  { render layout: false }
       format.atom
     end
   end
@@ -135,7 +134,7 @@ class ItemsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @item }
+      format.json { render json: @item }
     end
   end
 
@@ -157,22 +156,22 @@ class ItemsController < ApplicationController
     @item.manifestation_id = @manifestation.id
     if defined?(EnjuCirculation)
       @circulation_statuses = CirculationStatus.where(
-        :name => [
+        name: [
           'In Process',
           'Available For Pickup',
           'Available On Shelf',
           'Claimed Returned Or Never Borrowed',
           'Not Available']
       ).order(:position)
-      @item.circulation_status = CirculationStatus.where(:name => 'In Process').first
+      @item.circulation_status = CirculationStatus.where(name: 'In Process').first
       @item.checkout_type = @manifestation.carrier_type.checkout_types.first
       @item.item_has_use_restriction = ItemHasUseRestriction.new
-      @item.item_has_use_restriction.use_restriction = UseRestriction.where(:name => 'Not For Loan').first
+      @item.item_has_use_restriction.use_restriction = UseRestriction.where(name: 'Not For Loan').first
     end
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @item }
+      format.json { render json: @item }
     end
   end
 
@@ -182,7 +181,7 @@ class ItemsController < ApplicationController
     if defined?(EnjuCirculation)
       unless @item.use_restriction
         @item.build_item_has_use_restriction
-        @item.item_has_use_restriction.use_restriction = UseRestriction.where(:name => 'Not For Loan').first
+        @item.item_has_use_restriction.use_restriction = UseRestriction.where(name: 'Not For Loan').first
       end
     end
   end
@@ -204,12 +203,12 @@ class ItemsController < ApplicationController
             end
           end
         end
-        format.html { redirect_to(@item, :notice => t('controller.successfully_created', :model => t('activerecord.models.item'))) }
-        format.json { render :json => @item, :status => :created, :location => @item }
+        format.html { redirect_to(@item, notice: t('controller.successfully_created', model: t('activerecord.models.item'))) }
+        format.json { render json: @item, status: :created, location: @item }
       else
         prepare_options
-        format.html { render :action => "new" }
-        format.json { render :json => @item.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @item.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -219,12 +218,12 @@ class ItemsController < ApplicationController
   def update
     respond_to do |format|
       if @item.update_attributes(params[:item])
-        format.html { redirect_to @item, :notice => t('controller.successfully_updated', :model => t('activerecord.models.item')) }
+        format.html { redirect_to @item, notice: t('controller.successfully_updated', model: t('activerecord.models.item')) }
         format.json { head :no_content }
       else
         prepare_options
-        format.html { render :action => "edit" }
-        format.json { render :json => @item.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @item.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -236,9 +235,9 @@ class ItemsController < ApplicationController
     @item.destroy
 
     respond_to do |format|
-      flash[:notice] = t('controller.successfully_deleted', :model => t('activerecord.models.item'))
+      flash[:notice] = t('controller.successfully_deleted', model: t('activerecord.models.item'))
       if @item.manifestation
-        format.html { redirect_to manifestation_items_url(manifestation) }
+        format.html { redirect_to items_url(manifestation_id: manifestation.id) }
         format.json { head :no_content }
       else
         format.html { redirect_to items_url }

data/app/controllers/languages_controller.rb

@@ -7,7 +7,7 @@ class LanguagesController < InheritedResources::Base
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @languages }
+      format.json { render json: @languages }
     end
   end
 

data/app/controllers/licenses_controller.rb

@@ -1,6 +1,5 @@
 class LicensesController < InheritedResources::Base
   respond_to :html, :json
-  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update

data/app/controllers/manifestation_relationship_types_controller.rb

@@ -1,6 +1,5 @@
 class ManifestationRelationshipTypesController < InheritedResources::Base
   respond_to :html, :json
-  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update

data/app/controllers/manifestation_relationships_controller.rb

@@ -1,8 +1,8 @@
 class ManifestationRelationshipsController < InheritedResources::Base
   respond_to :html, :json
-  has_scope :page, :default => 1
+  has_scope :page, default: 1
   load_and_authorize_resource
-  before_filter :prepare_options, :except => [:index, :destroy]
+  before_filter :prepare_options, except: [:index, :destroy]
 
   def new
     @manifestation_relationship = ManifestationRelationship.new(params[:manifestation_relationship])

data/app/controllers/manifestations_controller.rb

@@ -1,20 +1,19 @@
 # -*- encoding: utf-8 -*-
 class ManifestationsController < ApplicationController
-  load_and_authorize_resource :except => :index
-  authorize_resource :only => :index
-  before_filter :authenticate_user!, :only => :edit
-  before_filter :get_agent, :get_manifestation, :except => [:create, :update, :destroy]
-  before_filter :get_expression, :only => :new
+  load_and_authorize_resource except: :index
+  authorize_resource only: :index
+  before_filter :authenticate_user!, only: :edit
+  before_filter :get_agent, :get_manifestation, except: [:create, :update, :destroy]
+  before_filter :get_expression, only: :new
   if defined?(EnjuSubject)
-    before_filter :get_subject, :except => [:create, :update, :destroy]
+    before_filter :get_subject, except: [:create, :update, :destroy]
   end
-  before_filter :get_series_statement, :only => [:index, :new, :edit]
-  before_filter :get_item, :get_libraries, :only => :index
-  before_filter :prepare_options, :only => [:new, :edit]
-  before_filter :get_version, :only => [:show]
-  after_filter :solr_commit, :only => :destroy
-  after_filter :convert_charset, :only => :index
-  cache_sweeper :manifestation_sweeper, :only => [:create, :update, :destroy]
+  before_filter :get_series_statement, only: [:index, :new, :edit]
+  before_filter :get_item, :get_libraries, only: :index
+  before_filter :prepare_options, only: [:new, :edit]
+  before_filter :get_version, only: [:show]
+  after_filter :solr_commit, only: :destroy
+  after_filter :convert_charset, only: :index
   include EnjuOai::OaiController if defined?(EnjuOai)
   include EnjuSearchLog if defined?(EnjuSearchLog)
 
@@ -54,10 +53,10 @@ class ManifestationsController < ApplicationController
               @manifestation = Manifestation.find_by_oai_identifier(params[:identifier])
             rescue ActiveRecord::RecordNotFound
               @oai[:errors] << "idDoesNotExist"
-              render :formats => :oai, :layout => false
+              render :formats => :oai, layout: false
               return
             end
-            render :template => 'manifestations/show', :formats => :oai, :layout => false
+            render template: 'manifestations/show', :formats => :oai, layout: false
             return
           end
         end
@@ -68,7 +67,7 @@ class ManifestationsController < ApplicationController
       manifestations, sort, @count = {}, {}, {}
       query = ""
 
-      if params[:format] == 'csv'
+      if params[:format] == 'txt'
         per_page = 65534
       end
 
@@ -78,7 +77,7 @@ class ManifestationsController < ApplicationController
           query = sru.cql.to_sunspot
           sort = sru.sort_by
         else
-          render :template => 'manifestations/explain', :layout => false
+          render template: 'manifestations/explain', layout: false
           return
         end
       else
@@ -225,7 +224,7 @@ class ManifestationsController < ApplicationController
             #bookmark_ids = Bookmark.where(:manifestation_id => flash[:manifestation_ids]).limit(1000).pluck(:id)
             bookmark_ids = Bookmark.where(:manifestation_id => @manifestation_ids).limit(1000).pluck(:id)
             @tags = Tag.bookmarked(bookmark_ids)
-            render :partial => 'manifestations/tag_cloud'
+            render partial: 'manifestations/tag_cloud'
             return
           end
         end
@@ -320,28 +319,28 @@ class ManifestationsController < ApplicationController
       format.html
       format.mobile
       format.xml  { render :xml => @manifestations }
-      format.sru  { render :layout => false }
-      format.rss  { render :layout => false }
-      format.csv  { render :layout => false }
-      format.rdf  { render :layout => false }
+      format.sru  { render layout: false }
+      format.rss  { render layout: false }
+      format.txt  { render layout: false }
+      format.rdf  { render layout: false }
       format.atom
       format.mods
-      format.json { render :json => @manifestations }
+      format.json { render json: @manifestations }
       format.js
       if defined?(EnjuOai)
         format.oai {
           case params[:verb]
           when 'Identify'
-            render :template => 'manifestations/identify'
+            render template: 'manifestations/identify'
           when 'ListMetadataFormats'
-            render :template => 'manifestations/list_metadata_formats'
+            render template: 'manifestations/list_metadata_formats'
           when 'ListSets'
             @series_statements = SeriesStatement.select([:id, :original_title])
-            render :template => 'manifestations/list_sets'
+            render template: 'manifestations/list_sets'
           when 'ListIdentifiers'
-            render :template => 'manifestations/list_identifiers'
+            render template: 'manifestations/list_identifiers'
           when 'ListRecords'
-            render :template => 'manifestations/list_records'
+            render template: 'manifestations/list_records'
           end
         }
       end
@@ -402,27 +401,27 @@ class ManifestationsController < ApplicationController
       format.xml  {
         case params[:mode]
         when 'related'
-          render :template => 'manifestations/related'
+          render template: 'manifestations/related'
         else
           render :xml => @manifestation
         end
       }
       format.rdf
       format.mods
-      format.json { render :json => @manifestation }
-      #format.atom { render :template => 'manifestations/oai_ore' }
+      format.json { render json: @manifestation }
+      #format.atom { render template: 'manifestations/oai_ore' }
       #format.js
       format.download {
         if @manifestation.attachment.path
           if Setting.uploaded_file.storage == :s3
-            send_data @manifestation.attachment.data, :filename => File.basename(@manifestation.attachment_file_name), :type => 'application/octet-stream'
+            send_data @manifestation.attachment.data, filename: File.basename(@manifestation.attachment_file_name), type: 'application/octet-stream'
           else
             if File.exist?(file) and File.file?(file)
-              send_file file, :filename => File.basename(@manifestation.attachment_file_name), :type => 'application/octet-stream'
+              send_file file, filename: File.basename(@manifestation.attachment_file_name), type: 'application/octet-stream'
             end
           end
         else
-          render :template => 'page/404', :status => 404
+          render template: 'page/404', status: 404
         end
       }
       if defined?(EnjuOai)
@@ -436,17 +435,17 @@ class ManifestationsController < ApplicationController
   def new
     @manifestation = Manifestation.new
     @manifestation.language = Language.where(:iso_639_1 => @locale).first
-    parent = Manifestation.where(:id => params[:parent_id]).first if params[:parent_id].present?
-    if parent
-      @manifestation.parent_id = parent.id
-      @manifestation.original_title = parent.original_title
-      @manifestation.title_transcription = parent.title_transcription
-      @manifestation.periodical = true if parent.periodical
+    @parent = Manifestation.where(:id => params[:parent_id]).first if params[:parent_id].present?
+    if @parent
+      @manifestation.parent_id = @parent.id
+      @manifestation.original_title = @parent.original_title
+      @manifestation.title_transcription = @parent.title_transcription
+      @manifestation.periodical = true if @parent.periodical
     end
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @manifestation }
+      format.json { render json: @manifestation }
     end
   end
 
@@ -460,7 +459,7 @@ class ManifestationsController < ApplicationController
     if defined?(EnjuBookmark)
       if params[:mode] == 'tag_edit'
         @bookmark = current_user.bookmarks.where(:manifestation_id => @manifestation.id).first if @manifestation rescue nil
-        render :partial => 'manifestations/tag_edit', :locals => {:manifestation => @manifestation}
+        render partial: 'manifestations/tag_edit', locals: {manifestation: @manifestation}
       end
       store_location unless params[:mode] == 'tag_edit'
     end
@@ -484,12 +483,12 @@ class ManifestationsController < ApplicationController
         end
         Sunspot.commit
 
-        format.html { redirect_to @manifestation, :notice => t('controller.successfully_created', :model => t('activerecord.models.manifestation')) }
-        format.json { render :json => @manifestation, :status => :created, :location => @manifestation }
+        format.html { redirect_to @manifestation, notice: t('controller.successfully_created', model: t('activerecord.models.manifestation')) }
+        format.json { render json: @manifestation, status: :created, location: @manifestation }
       else
         prepare_options
-        format.html { render :action => "new" }
-        format.json { render :json => @manifestation.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @manifestation.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -500,12 +499,12 @@ class ManifestationsController < ApplicationController
     respond_to do |format|
       if @manifestation.update_attributes(params[:manifestation])
         Sunspot.commit
-        format.html { redirect_to @manifestation, :notice => t('controller.successfully_updated', :model => t('activerecord.models.manifestation')) }
+        format.html { redirect_to @manifestation, notice: t('controller.successfully_updated', model: t('activerecord.models.manifestation')) }
         format.json { head :no_content }
       else
         prepare_options
-        format.html { render :action => "edit" }
-        format.json { render :json => @manifestation.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @manifestation.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -513,10 +512,16 @@ class ManifestationsController < ApplicationController
   # DELETE /manifestations/1
   # DELETE /manifestations/1.json
   def destroy
+    # workaround
+    @manifestation.identifiers.destroy_all
+    @manifestation.creators.destroy_all
+    @manifestation.publishers.destroy_all
+    @manifestation.bookmarks.destroy_all if defined?(EnjuBookmark)
+    @manifestation.reload
     @manifestation.destroy
 
     respond_to do |format|
-      format.html { redirect_to manifestations_url, :notice => t('controller.successfully_deleted', :model => t('activerecord.models.manifestation')) }
+      format.html { redirect_to manifestations_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.manifestation')) }
       format.json { head :no_content }
     end
   end
@@ -645,31 +650,31 @@ class ManifestationsController < ApplicationController
   def render_mode(mode)
     case mode
     when 'holding'
-      render :partial => 'manifestations/show_holding', :locals => {:manifestation => @manifestation}
+      render partial: 'manifestations/show_holding', locals: {manifestation: @manifestation}
     when 'barcode'
       if defined?(EnjuBarcode)
         barcode = Barby::QrCode.new(@manifestation.id)
-        send_data(barcode.to_svg, :disposition => 'inline', :type => 'image/svg+xml')
+        send_data(barcode.to_svg, :disposition => 'inline', type: 'image/svg+xml')
       end
     when 'tag_edit'
       if defined?(EnjuBookmark)
-        render :partial => 'manifestations/tag_edit', :locals => {:manifestation => @manifestation}
+        render partial: 'manifestations/tag_edit', locals: {manifestation: @manifestation}
       end
     when 'tag_list'
       if defined?(EnjuBookmark)
-        render :partial => 'manifestations/tag_list', :locals => {:manifestation => @manifestation}
+        render partial: 'manifestations/tag_list', locals: {manifestation: @manifestation}
       end
     when 'show_index'
-      render :partial => 'manifestations/show_index', :locals => {:manifestation => @manifestation}
+      render partial: 'manifestations/show_index', locals: {manifestation: @manifestation}
     when 'show_creators'
-      render :partial => 'manifestations/show_creators', :locals => {:manifestation => @manifestation}
+      render partial: 'manifestations/show_creators', locals: {manifestation: @manifestation}
     when 'show_all_creators'
-      render :partial => 'manifestations/show_creators', :locals => {:manifestation => @manifestation}
+      render partial: 'manifestations/show_creators', locals: {manifestation: @manifestation}
     when 'pickup'
-      render :partial => 'manifestations/pickup', :locals => {:manifestation => @manifestation}
+      render partial: 'manifestations/pickup', locals: {manifestation: @manifestation}
     when 'calil_list'
       if defined?(EnjuCalil)
-        render :partial => 'manifestations/calil_list', :locals => {:manifestation => @manifestation}
+        render partial: 'manifestations/calil_list', locals: {manifestation: @manifestation}
       end
     else
       false

data/app/controllers/medium_of_performances_controller.rb

@@ -1,6 +1,5 @@
 class MediumOfPerformancesController < InheritedResources::Base
   respond_to :html, :json
-  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update

data/app/controllers/owns_controller.rb

@@ -1,8 +1,7 @@
 class OwnsController < ApplicationController
   load_and_authorize_resource
   before_filter :get_agent, :get_item
-  after_filter :solr_commit, :only => [:create, :update, :destroy]
-  cache_sweeper :page_sweeper, :only => [:create, :update, :destroy]
+  after_filter :solr_commit, only: [:create, :update, :destroy]
 
   # GET /owns
   # GET /owns.json
@@ -17,7 +16,7 @@ class OwnsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @owns }
+      format.json { render json: @owns }
     end
   end
 
@@ -26,7 +25,7 @@ class OwnsController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @own }
+      format.json { render json: @own }
     end
   end
 
@@ -56,11 +55,11 @@ class OwnsController < ApplicationController
 
     respond_to do |format|
       if @own.save
-        format.html { redirect_to @own, :notice => t('controller.successfully_created', :model => t('activerecord.models.own')) }
-        format.json { render :json => @own, :status => :created, :location => @own }
+        format.html { redirect_to @own, notice: t('controller.successfully_created', model: t('activerecord.models.own')) }
+        format.json { render json: @own, status: :created, location: @own }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @own.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @own.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -70,17 +69,17 @@ class OwnsController < ApplicationController
   def update
     if @item and params[:move]
       move_position(@own, params[:move], false)
-      redirect_to item_owns_url(@item)
+      redirect_to owns_url(item_id: @own.item_id)
       return
     end
 
     respond_to do |format|
       if @own.update_attributes(params[:own])
-        format.html { redirect_to @own, :notice => t('controller.successfully_updated', :model => t('activerecord.models.own')) }
+        format.html { redirect_to @own, notice: t('controller.successfully_updated', model: t('activerecord.models.own')) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @own.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @own.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -92,7 +91,7 @@ class OwnsController < ApplicationController
 
     respond_to do |format|
       format.html {
-        flash[:notice] = t('controller.successfully_deleted', :model => t('activerecord.models.own'))
+        flash[:notice] = t('controller.successfully_deleted', model: t('activerecord.models.own'))
         case
         when @agent
           redirect_to agent_owns_url(@agent)

data/app/controllers/picture_files_controller.rb

@@ -1,7 +1,6 @@
 class PictureFilesController < ApplicationController
   load_and_authorize_resource
-  before_filter :get_attachable, :only => [:index, :new]
-  cache_sweeper :page_sweeper, :only => [:create, :update, :destroy]
+  before_filter :get_attachable, only: [:index, :new]
 
   # GET /picture_files
   # GET /picture_files.json
@@ -14,7 +13,7 @@ class PictureFilesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @picture_files }
+      format.json { render json: @picture_files }
     end
   end
 
@@ -40,7 +39,7 @@ class PictureFilesController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @picture_file }
+      format.json { render json: @picture_file }
       format.mobile {
         if params[:format] == 'download'
           render_image(file)
@@ -65,7 +64,7 @@ class PictureFilesController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @picture_file }
+      format.json { render json: @picture_file }
     end
   end
 
@@ -80,11 +79,11 @@ class PictureFilesController < ApplicationController
 
     respond_to do |format|
       if @picture_file.save
-        format.html { redirect_to @picture_file, :notice => t('controller.successfully_created', :model => t('activerecord.models.picture_file')) }
-        format.json { render :json => @picture_file, :status => :created, :location => @picture_file }
+        format.html { redirect_to @picture_file, notice: t('controller.successfully_created', model: t('activerecord.models.picture_file')) }
+        format.json { render json: @picture_file, status: :created, location: @picture_file }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @picture_file.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @picture_file.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -108,11 +107,11 @@ class PictureFilesController < ApplicationController
 
     respond_to do |format|
       if @picture_file.update_attributes(params[:picture_file])
-        format.html { redirect_to @picture_file, :notice => t('controller.successfully_updated', :model => t('activerecord.models.picture_file')) }
+        format.html { redirect_to @picture_file, notice: t('controller.successfully_updated', model: t('activerecord.models.picture_file')) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @picture_file.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @picture_file.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -167,10 +166,10 @@ class PictureFilesController < ApplicationController
 
     if @picture_file.picture.path
       if Setting.uploaded_file.storage == :s3
-        send_data file, :filename => File.basename(@picture_file.picture_file_name), :type => @picture_file.picture_content_type, :disposition => disposition
+        send_data file, filename: File.basename(@picture_file.picture_file_name), type: @picture_file.picture_content_type, :disposition => disposition
       else
         if File.exist?(file) and File.file?(file)
-          send_file file, :filename => File.basename(@picture_file.picture_file_name), :type => @picture_file.picture_content_type, :disposition => disposition
+          send_file file, filename: File.basename(@picture_file.picture_file_name), type: @picture_file.picture_content_type, :disposition => disposition
         end
       end
     end

data/app/controllers/produce_types_controller.rb

@@ -1,6 +1,5 @@
 class ProduceTypesController < InheritedResources::Base
   respond_to :html, :json
-  has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update