enju_biblio 0.1.3 → 0.2.0.beta.1

data/app/controllers/import_requests_controller.rb

@@ -1,5 +1,6 @@
 class ImportRequestsController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_import_request, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /import_requests
   # GET /import_requests.json
@@ -52,17 +53,17 @@ class ImportRequestsController < ApplicationController
             redirect_to new_import_request_url, notice: t('import_request.record_not_found')
           end
         }
-        format.mobile {
-          if @import_request.manifestation
-            redirect_to @import_request.manifestation, notice: t('controller.successfully_created', model: t('activerecord.models.import_request'))
-          else
-            redirect_to new_import_request_url, notice: t('import_request.record_not_found')
-          end
-        }
+        #format.html.phone {
+        #  if @import_request.manifestation
+        #    redirect_to @import_request.manifestation, notice: t('controller.successfully_created', model: t('activerecord.models.import_request'))
+        #  else
+        #    redirect_to new_import_request_url, notice: t('import_request.record_not_found')
+        #  end
+        #}
         format.json { render json: @import_request, status: :created, location: @import_request }
       else
         format.html { render action: "new" }
-        format.mobile { render action: "new" }
+        #format.html.phone { render action: "new" }
         format.json { render json: @import_request.errors, status: :unprocessable_entity }
       end
     end
@@ -99,6 +100,15 @@ class ImportRequestsController < ApplicationController
   end
 
   private
+  def set_import_request
+    @import_request = ImportRequest.find(params[:id])
+    authorize @import_request
+  end
+
+  def check_policy
+    authorize ImportRequest
+  end
+
   def import_request_params
     params.require(:import_request).permit(:isbn, :manifestation_id, :user_id)
   end

data/app/controllers/items_controller.rb

@@ -1,16 +1,14 @@
-# -*- encoding: utf-8 -*-
 class ItemsController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_agent, :get_manifestation, :get_shelf, except: [:create, :update, :destroy]
+  before_action :set_item, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_agent, :get_manifestation, :get_shelf, except: [:create, :update, :destroy]
   if defined?(EnjuInventory)
-    before_filter :get_inventory_file
+    before_action :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 :store_location
-  after_filter :solr_commit, only: [:create, :update, :destroy]
-  after_filter :convert_charset, only: :index
+  before_action :get_library, :get_item, except: [:create, :update, :destroy]
+  before_action :prepare_options, only: [:new, :edit]
+  before_action :get_version, only: [:show]
+  after_action :convert_charset, only: :index
 
   # GET /items
   # GET /items.json
@@ -156,6 +154,11 @@ class ItemsController < ApplicationController
       redirect_to manifestations_url
       return
     end
+    if @manifestation.series_master?
+      flash[:notice] = t('item.specify_manifestation')
+      redirect_to manifestations_url(parent_id: @manifestation.id)
+      return
+    end
     @item = Item.new
     @item.shelf = @library.shelves.first
     @item.manifestation = @manifestation
@@ -253,6 +256,15 @@ class ItemsController < ApplicationController
   end
 
   private
+  def set_item
+    @item = Item.find(params[:id])
+    authorize @item
+  end
+
+  def check_policy
+    authorize Item
+  end
+
   def item_params
     params.require(:item).permit(
       :call_number, :item_identifier, :circulation_status_id,
@@ -267,10 +279,10 @@ class ItemsController < ApplicationController
 
   def prepare_options
     @libraries = Library.real << Library.web
-    if @item.new_record?
-      @library = Library.real.includes(:shelves).order(:position).first
-    else
+    if @item
       @library = @item.shelf.library
+    else
+      @library = Library.real.includes(:shelves).order(:position).first
     end
     @shelves = @library.try(:shelves)
     @bookstores = Bookstore.all

data/app/controllers/languages_controller.rb

@@ -1,5 +1,7 @@
 class LanguagesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_language, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /languages
   # GET /languages.json
   def index
@@ -82,6 +84,15 @@ class LanguagesController < ApplicationController
   end
 
   private
+  def set_language
+    @language = Language.find(params[:id])
+    authorize @language
+  end
+
+  def check_policy
+    authorize Language
+  end
+
   def language_params
     params.require(:language).permit(
       :name, :native_name, :display_name, :iso_639_1, :iso_639_2, :iso_639_3,

data/app/controllers/licenses_controller.rb

@@ -1,9 +1,11 @@
 class LicensesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_license, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /licenses
   # GET /licenses.json
   def index
-    @licenses = License.all
+    @licenses = License.order(:position)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -82,6 +84,15 @@ class LicensesController < ApplicationController
   end
 
   private
+  def set_license
+    @license = License.find(params[:id])
+    authorize @license
+  end
+
+  def check_policy
+    authorize License
+  end
+
   def license_params
     params.require(:license).permit(:name, :display_name, :note)
   end

data/app/controllers/manifestation_relationship_types_controller.rb

@@ -1,5 +1,7 @@
 class ManifestationRelationshipTypesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_manifestation_relationship_type, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /manifestation_relationship_types
   # GET /manifestation_relationship_types.json
   def index
@@ -82,6 +84,15 @@ class ManifestationRelationshipTypesController < ApplicationController
   end
 
   private
+  def set_manifestation_relationship_type
+    @manifestation_relationship_type = ManifestationRelationshipType.find(params[:id])
+    authorize @manifestation_relationship_type
+  end
+
+  def check_policy
+    authorize ManifestationRelationshipType
+  end
+
   def manifestation_relationship_type_params
     params.require(:manifestation_relationship_type).permit(
       :name, :display_name, :note

data/app/controllers/manifestation_relationships_controller.rb

@@ -1,8 +1,8 @@
 class ManifestationRelationshipsController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_manifestation
-  before_filter :prepare_options, only: [:new, :edit]
-  after_filter :solr_commit, only: [:create, :update, :destroy]
+  before_action :set_manifestation_relationship, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_manifestation
+  before_action :prepare_options, only: [:new, :edit]
 
   # GET /manifestation_relationships
   # GET /manifestation_relationships.json
@@ -102,6 +102,15 @@ class ManifestationRelationshipsController < ApplicationController
   end
 
   private
+  def set_manifestation_relationship
+    @manifestation_relationship = ManifestationRelationship.find(params[:id])
+    authorize @manifestation_relationship
+  end
+
+  def check_policy
+    authorize ManifestationRelationship
+  end
+
   def manifestation_relationship_params
     params.require(:manifestation_relationship).permit(
       :parent_id, :child_id, :manifestation_relationship_type_id

data/app/controllers/manifestations_controller.rb

@@ -1,19 +1,17 @@
-# -*- 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
+  before_action :set_manifestation, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :authenticate_user!, only: :edit
+  before_action :get_agent, :get_manifestation, except: [:create, :update, :destroy]
+  before_action :get_expression, only: :new
   if defined?(EnjuSubject)
-    before_filter :get_subject, except: [:create, :update, :destroy]
+    before_action :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
+  before_action :get_series_statement, only: [:index, :new, :edit]
+  before_action :get_item, :get_libraries, only: :index
+  before_action :prepare_options, only: [:new, :edit]
+  before_action :get_version, only: [:show]
+  after_action :convert_charset, only: :index
 
   # GET /manifestations
   # GET /manifestations.json
@@ -151,7 +149,7 @@ class ManifestationsController < ApplicationController
       @reservable_facet = all_result.facet(:reservable).rows if defined?(EnjuCirculation)
       max_number_of_results = @library_group.settings[:max_number_of_results].to_i
       if max_number_of_results == 0
-        @max_number_of_results = count[:query_result]
+        @max_number_of_results = @count[:query_result]
       else
         @max_number_of_results = max_number_of_results
       end
@@ -205,7 +203,7 @@ class ManifestationsController < ApplicationController
         per_page = Manifestation.default_per_page
       end
       if params[:format] == 'sru'
-        search.query.start_record(params[:startRecord] || 1, params[:maximumRecords] || 200)
+        #search.query.start_record(params[:startRecord] || 1, params[:maximumRecords] || 200)
       else
         pub_dates = parse_pub_date(params)
         pub_date_range = {}
@@ -270,11 +268,9 @@ class ManifestationsController < ApplicationController
       end
     end
 
-    store_location # before_filter ではファセット検索のURLを記憶してしまう
-
     respond_to do |format|
       format.html
-      format.mobile
+      format.html.phone
       format.xml  { render xml: @manifestations }
       format.sru  { render layout: false }
       format.rss  { render layout: false }
@@ -297,7 +293,7 @@ class ManifestationsController < ApplicationController
     case params[:mode]
     when 'send_email'
       if user_signed_in?
-        Notifier.manifestation_info(current_user.id, @manifestation.id).deliver
+        Notifier.manifestation_info(current_user.id, @manifestation.id).deliver_later
         flash[:notice] = t('page.sent_email')
         redirect_to @manifestation
         return
@@ -309,7 +305,6 @@ class ManifestationsController < ApplicationController
     return if render_mode(params[:mode])
 
     flash.keep(:search_query)
-    store_location
 
     if @manifestation.series_master?
       flash.keep(:notice) if flash[:notice]
@@ -337,7 +332,7 @@ class ManifestationsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.mobile
+      format.html.phone
       format.xml  {
         case params[:mode]
         when 'related'
@@ -375,9 +370,15 @@ class ManifestationsController < ApplicationController
     @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.serial = true if @parent.serial
+      [ :original_title, :title_transcription,
+        :serial, :title_alternative, :statement_of_responsibility, :publication_place,
+        :height, :width, :depth, :price, :access_address, :language, :frequency, :required_role,
+      ].each do |attribute|
+        @manifestation.send("#{attribute}=", @parent.send(attribute))
+      end
+      [ :creators, :contributors, :publishers, :classifications, :subjects ].each do |attribute|
+        @manifestation.send(attribute).build(@parent.send(attribute).collect(&:attributes))
+      end
     end
 
     respond_to do |format|
@@ -398,14 +399,16 @@ class ManifestationsController < ApplicationController
         @bookmark = current_user.bookmarks.where(manifestation_id: @manifestation.id).first if @manifestation rescue nil
         render partial: 'manifestations/tag_edit', locals: {manifestation: @manifestation}
       end
-      store_location unless params[:mode] == 'tag_edit'
     end
   end
 
   # POST /manifestations
   # POST /manifestations.json
   def create
-    @manifestation = Manifestation.new(manifestation_params)
+    creators_params = manifestation_params[:creators_attributes]
+    @manifestation = Manifestation.new(manifestation_params.delete_if{|k, v|
+      k == 'creators_attributes'
+    })
     parent = Manifestation.where(id: @manifestation.parent_id).first
     unless @manifestation.original_title?
       @manifestation.original_title = @manifestation.attachment_file_name
@@ -413,8 +416,11 @@ class ManifestationsController < ApplicationController
 
     respond_to do |format|
       if @manifestation.save
+        Manifestation.transaction do
+          @manifestation.creators = Agent.new_agents(creators_params)
+          parent.derived_manifestations << @manifestation if parent
+        end
         if parent
-          parent.derived_manifestations << @manifestation
           parent.index
           @manifestation.index
         end
@@ -433,9 +439,16 @@ class ManifestationsController < ApplicationController
   # PUT /manifestations/1
   # PUT /manifestations/1.json
   def update
+    creators_params = manifestation_params[:creators_attributes]
+    Manifestation.transaction do
+      @manifestation.update_attributes(manifestation_params.delete_if{|k, v|
+        k == 'creators_attributes'
+      })
+      @manifestation.creators = Agent.new_agents(creators_params)
+    end
+
     respond_to do |format|
-      if @manifestation.update_attributes(manifestation_params)
-        Sunspot.commit
+      if @manifestation.valid?
         format.html { redirect_to @manifestation, notice: t('controller.successfully_updated', model: t('activerecord.models.manifestation')) }
         format.json { head :no_content }
       else
@@ -465,6 +478,15 @@ class ManifestationsController < ApplicationController
   end
 
   private
+  def set_manifestation
+    @manifestation = Manifestation.find(params[:id])
+    authorize @manifestation
+  end
+
+  def check_policy
+    authorize Manifestation
+  end
+
   def manifestation_params
     params.require(:manifestation).permit(
       :original_title, :title_alternative, :title_transcription,
@@ -490,7 +512,7 @@ class ManifestationsController < ApplicationController
         :other_designation, :language_id,
         :country_id, :agent_type_id, :note, :required_role_id, :email, :url,
         :full_name_alternative_transcription, :title,
-        :agent_identifier,
+        :agent_identifier, :agent_id,
         :_destroy
       ]},
       {:contributors_attributes => [
@@ -646,6 +668,9 @@ class ManifestationsController < ApplicationController
 
   def set_search_result_order(sort_by, order)
     sort = {}
+    if sort_by.try(:"include?", ":")
+      sort_by, order = sort_by.split(/:/)
+    end
     # TODO: ページ数や大きさでの並べ替え
     case sort_by
     when 'title'
@@ -654,6 +679,9 @@ class ManifestationsController < ApplicationController
     when 'pub_date'
       sort[:sort_by] = 'date_of_publication'
       sort[:order] = 'desc'
+    when 'score'
+      sort[:sort_by] = 'score'
+      sort[:order] = 'desc'
     else
       # デフォルトの並び方
       sort[:sort_by] = 'created_at'

data/app/controllers/medium_of_performances_controller.rb

@@ -1,9 +1,11 @@
 class MediumOfPerformancesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_medium_of_performance, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /medium_of_performances
   # GET /medium_of_performances.json
   def index
-    @medium_of_performances = MediumOfPerformance.all
+    @medium_of_performances = MediumOfPerformance.order(:position)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -82,6 +84,15 @@ class MediumOfPerformancesController < ApplicationController
   end
 
   private
+  def set_medium_of_performance
+    @medium_of_performance = MediumOfPerformance.find(params[:id])
+    authorize @medium_of_performance
+  end
+
+  def check_policy
+    authorize MediumOfPerformance
+  end
+
   def medium_of_performance_params
     params.require(:medium_of_performance).permit(:name, :display_name, :note)
   end

data/app/controllers/owns_controller.rb

@@ -1,7 +1,7 @@
 class OwnsController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_agent, :get_item
-  after_filter :solr_commit, only: [:create, :update, :destroy]
+  before_action :set_own, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_agent, :get_item
 
   # GET /owns
   # GET /owns.json
@@ -106,6 +106,15 @@ class OwnsController < ApplicationController
   end
 
   private
+  def set_own
+    @own = Own.find(params[:id])
+    authorize @own
+  end
+
+  def check_policy
+    authorize Own
+  end
+
   def own_params
     params.require(:own).permit(:agent_id, :item_id)
   end

data/app/controllers/picture_files_controller.rb

@@ -1,6 +1,7 @@
 class PictureFilesController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_attachable, only: [:index, :new]
+  before_action :set_picture_file, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_attachable, only: [:index, :new]
 
   # GET /picture_files
   # GET /picture_files.json
@@ -40,7 +41,7 @@ class PictureFilesController < ApplicationController
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @picture_file }
-      format.mobile {
+      format.html.phone {
         if params[:format] == 'download'
           render_image(file)
         end
@@ -157,6 +158,15 @@ class PictureFilesController < ApplicationController
   end
 
   private
+  def set_picture_file
+    @picture_file = PictureFile.find(params[:id])
+    authorize @picture_file
+  end
+
+  def check_policy
+    authorize PictureFile
+  end
+
   def picture_file_params
     params.require(:picture_file).permit(
       :picture, :picture_attachable_id, :picture_attachable_type

data/app/controllers/produce_types_controller.rb

@@ -1,9 +1,11 @@
 class ProduceTypesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_produce_type, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /produce_types
   # GET /produce_types.json
   def index
-    @produce_types = ProduceType.all
+    @produce_types = ProduceType.order(:position)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -82,6 +84,15 @@ class ProduceTypesController < ApplicationController
   end
 
   private
+  def set_produce_type
+    @produce_type = ProduceType.find(params[:id])
+    authorize @produce_type
+  end
+
+  def check_policy
+    authorize ProduceType
+  end
+
   def produce_type_params
     params.require(:produce_type).permit(:name, :display_name, :note, :position)
   end

data/app/controllers/produces_controller.rb

@@ -1,8 +1,8 @@
 class ProducesController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_agent, :get_manifestation
-  before_filter :prepare_options, only: [:new, :edit]
-  after_filter :solr_commit, only: [:create, :update, :destroy]
+  before_action :set_produce, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_agent, :get_manifestation
+  before_action :prepare_options, only: [:new, :edit]
 
   # GET /produces
   # GET /produces.json
@@ -115,6 +115,15 @@ class ProducesController < ApplicationController
   end
 
   private
+  def set_produce
+    @produce = Produce.find(params[:id])
+    authorize @produce
+  end
+
+  def check_policy
+    authorize Produce
+  end
+
   def produce_params
     params.require(:produce).permit(
       :agent_id, :manifestation_id, :produce_type_id, :position

data/app/controllers/realize_types_controller.rb

@@ -1,9 +1,11 @@
 class RealizeTypesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_realize_type, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /realize_types
   # GET /realize_types.json
   def index
-    @realize_types = RealizeType.all
+    @realize_types = RealizeType.order(:position)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -82,6 +84,15 @@ class RealizeTypesController < ApplicationController
   end
 
   private
+  def set_realize_type
+    @realize_type = RealizeType.find(params[:id])
+    authorize @realize_type
+  end
+
+  def check_policy
+    authorize RealizeType
+  end
+
   def realize_type_params
     params.require(:realize_type).permit(
       :name, :display_name, :note, :position

data/app/controllers/realizes_controller.rb

@@ -1,8 +1,8 @@
 class RealizesController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_agent, :get_expression
-  before_filter :prepare_options, only: [:new, :edit]
-  after_filter :solr_commit, only: [:create, :update, :destroy]
+  before_action :set_realize, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_agent, :get_expression
+  before_action :prepare_options, only: [:new, :edit]
 
   # GET /realizes
   # GET /realizes.json
@@ -111,6 +111,15 @@ class RealizesController < ApplicationController
   end
 
   private
+  def set_realize
+    @realize = Realize.find(params[:id])
+    authorize @realize
+  end
+
+  def check_policy
+    authorize Realize
+  end
+
   def realize_params
     params.require(:realize).permit(
       :agent_id, :expression_id, :realize_type_id, :position

data/app/controllers/resource_export_files_controller.rb

@@ -1,5 +1,6 @@
 class ResourceExportFilesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_resource_export_file, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /resource_export_files
   # GET /resource_export_files.json
@@ -60,7 +61,7 @@ class ResourceExportFilesController < ApplicationController
     respond_to do |format|
       if @resource_export_file.save
         if @resource_export_file.mode == 'export'
-          Resque.enqueue(ResourceExportFileQueue, @resource_export_file.id)
+          ResourceExportFileJob.perform_later(@resource_export_file)
         end
         format.html { redirect_to @resource_export_file, notice: t('export.successfully_created', model: t('activerecord.models.resource_export_file')) }
         format.json { render json: @resource_export_file, status: :created, location: @resource_export_file }
@@ -77,7 +78,7 @@ class ResourceExportFilesController < ApplicationController
     respond_to do |format|
       if @resource_export_file.update_attributes(resource_export_file_params)
         if @resource_export_file.mode == 'export'
-          ResourceExportFileQueue.perform(@resource_export_file.id)
+          ResourceExportFileJob.perform_later(@resource_export_file)
         end
         format.html { redirect_to @resource_export_file, notice: t('controller.successfully_updated', model: t('activerecord.models.resource_export_file')) }
         format.json { head :no_content }
@@ -100,6 +101,15 @@ class ResourceExportFilesController < ApplicationController
   end
 
   private
+  def set_resource_export_file
+    @resource_export_file = ResourceExportFile.find(params[:id])
+    authorize @resource_export_file
+  end
+
+  def check_policy
+    authorize ResourceExportFile
+  end
+
   def resource_export_file_params
     params.require(:resource_export_file).permit(:mode)
   end