enju_biblio 0.1.3 → 0.2.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc416c013dbcc8ee65781251ed8bfb3541092d85
-  data.tar.gz: 7eede39a9b3a96d603a1e6c8a5b18b64a6920c47
+  metadata.gz: f22c619e2e023ba90b4d76131e0c4f42a740bb76
+  data.tar.gz: 1b27cdc13c2cd26379b8db84fde261ffdc6757cf
 SHA512:
-  metadata.gz: c29115e07c4e83f35a4d9e6c3a7212ff3e4d845b999635fc300ad56545eefcde5e9aed2ddf142d9afcc19bd442349567d09fdac4607618c6b51cafe72257bf2e
-  data.tar.gz: 79d7a9bdcc74ad9d52a0c2443c7072b550797e0f4189596190a1b234833d08afc707041d797a6240a36de5b02db5aa76406f7889eb5fd0ba9afcb3ebbe834ddf
+  metadata.gz: e3bba80e90836041a24d98b327bb5208d61ea6fdcf81e364263cbe885e809064b56dd9b4849498f38fdaa15b429e322c92cf14abd6f1be7924213506f79d0fd7
+  data.tar.gz: 4bb20c415894012ba00e271d6db98b251d9465a6a66fe1b1d7b8b685aedbf79d941277c55b13bd19835e24cebf0eec1acb8e64a1e28300c586b0d661880680d7

data/README.rdoc

@@ -1,7 +1,7 @@
 = EnjuBiblio
-{<img src="https://secure.travis-ci.org/next-l/enju_biblio.png?branch=1.1" alt="Build Status" />}[http://travis-ci.org/next-l/enju_biblio]
-{<img src="https://coveralls.io/repos/next-l/enju_biblio/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_biblio?branch=1.1]
-{<img src="https://hakiri.io/github/next-l/enju_biblio/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_biblio/1.1]
+{<img src="https://travis-ci.org/next-l/enju_biblio.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_biblio]
+{<img src="https://coveralls.io/repos/next-l/enju_biblio/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_biblio?branch=1.2]
+{<img src="https://hakiri.io/github/next-l/enju_biblio/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_biblio/1.2]
 
 This project rocks and uses MIT-LICENSE.
 

data/app/controllers/agent_import_files_controller.rb

@@ -1,5 +1,6 @@
 class AgentImportFilesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_agent_import_file, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /agent_import_files
   # GET /agent_import_files.json
@@ -58,7 +59,7 @@ class AgentImportFilesController < ApplicationController
     respond_to do |format|
       if @agent_import_file.save
         if @agent_import_file.mode == 'import'
-          Resque.enqueue(AgentImportFileQueue, @agent_import_file.id)
+          AgentImportFileJob.perform_later(@agent_import_file)
         end
         format.html { redirect_to @agent_import_file, notice: t('controller.successfully_created', model: t('activerecord.models.agent_import_file')) }
         format.json { render json: @agent_import_file, status: :created, location: @agent_import_file }
@@ -75,7 +76,7 @@ class AgentImportFilesController < ApplicationController
     respond_to do |format|
       if @agent_import_file.update_attributes(agent_import_file_params)
         if @agent_import_file.mode == 'import'
-          Resque.enqueue(AgentImportFileQueue, @agent_import_file.id)
+          AgentImportFileJob.perform_later(@agent_import_file)
         end
         format.html { redirect_to @agent_import_file, notice: t('controller.successfully_updated', model: t('activerecord.models.agent_import_file')) }
         format.json { head :no_content }
@@ -98,6 +99,15 @@ class AgentImportFilesController < ApplicationController
   end
 
   private
+  def set_agent_import_file
+    @agent_import_file = AgentImportFile.find(params[:id])
+    authorize @agent_import_file
+  end
+
+  def check_policy
+    authorize AgentImportFile
+  end
+
   def agent_import_file_params
     params.require(:agent_import_file).permit(
       :agent_import, :edit_mode, :user_encoding, :mode

data/app/controllers/agent_import_results_controller.rb

@@ -1,5 +1,7 @@
 class AgentImportResultsController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_agent_import_result, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index]
+
   # GET /agent_import_results
   # GET /agent_import_results.json
   def index
@@ -38,6 +40,15 @@ class AgentImportResultsController < ApplicationController
   end
 
   private
+  def set_agent_import_result
+    @agent_import_result = AgentImportResult.find(params[:id])
+    authorize @agent_import_result
+  end
+
+  def check_policy
+    authorize AgentImportResult
+  end
+
   def agent_import_result_params
     params.require(:agent_import_result).permit(
       :agent_import_file_id, :agent_id, :body

data/app/controllers/agent_merge_lists_controller.rb

@@ -1,5 +1,6 @@
 class AgentMergeListsController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_agent_merge_list, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /agent_merge_lists
   # GET /agent_merge_lists.json
@@ -92,6 +93,15 @@ class AgentMergeListsController < ApplicationController
   end
 
   private
+  def set_agent_merge_list
+    @agent_merge_list = AgentMergeList.find(params[:id])
+    authorize @agent_merge_list
+  end
+
+  def check_policy
+    authorize AgentMergeList
+  end
+
   def agent_merge_list_params
     params.fetch(:agent_merge_list, {}).permit(:title)
   end

data/app/controllers/agent_merges_controller.rb

@@ -1,6 +1,7 @@
 class AgentMergesController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_agent, :get_agent_merge_list
+  before_action :set_agent_merge, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_agent, :get_agent_merge_list
 
   # GET /agent_merges
   # GET /agent_merges.json
@@ -86,6 +87,15 @@ class AgentMergesController < ApplicationController
   end
 
   private
+  def set_agent_merge
+    @agent_merge = AgentMerge.find(params[:id])
+    authorize @agent_merge
+  end
+
+  def check_policy
+    authorize AgentMerge
+  end
+
   def agent_merge_params
     params.require(:agent_merge).permit(:agent_id, :agent_merge_list_id)
   end

data/app/controllers/agent_relationship_types_controller.rb

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

data/app/controllers/agent_relationships_controller.rb

@@ -1,8 +1,8 @@
 class AgentRelationshipsController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_agent
-  before_filter :prepare_options, only: [:new, :edit]
-  after_filter :solr_commit, only: [:create, :update, :destroy]
+  before_action :set_agent_relationship, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_agent
+  before_action :prepare_options, only: [:new, :edit]
 
   # GET /agent_relationships
   # GET /agent_relationships.json
@@ -102,6 +102,15 @@ class AgentRelationshipsController < ApplicationController
   end
 
   private
+  def set_agent_relationship
+    @agent_relationship = AgentRelationship.find(params[:id])
+    authorize @agent_relationship
+  end
+
+  def check_policy
+    authorize AgentRelationship
+  end
+
   def agent_relationship_params
     params.require(:agent_relationship).permit(
       :parent_id, :child_id, :agent_relationship_type_id

data/app/controllers/agent_types_controller.rb

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

data/app/controllers/agents_controller.rb

@@ -1,13 +1,10 @@
-# -*- encoding: utf-8 -*-
 class AgentsController < ApplicationController
-  load_and_authorize_resource except: :index
-  authorize_resource only: :index
-  before_filter :get_work, :get_expression, :get_manifestation, :get_item, :get_agent, except: [:update, :destroy]
-  before_filter :get_agent_merge_list, except: [:create, :update, :destroy]
-  before_filter :prepare_options, only: [:new, :edit]
-  before_filter :store_location
-  before_filter :get_version, only: [:show]
-  after_filter :solr_commit, only: [:create, :update, :destroy]
+  before_action :set_agent, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_work, :get_expression, :get_manifestation, :get_item, :get_agent, except: [:update, :destroy]
+  before_action :get_agent_merge_list, except: [:create, :update, :destroy]
+  before_action :prepare_options, only: [:new, :edit]
+  before_action :get_version, only: [:show]
 
   # GET /agents
   # GET /agents.json
@@ -82,8 +79,8 @@ class AgentsController < ApplicationController
       format.xml  { render xml: @agents }
       format.rss  { render layout: false }
       format.atom
-      format.json { render json: @agents }
-      format.mobile
+      format.json
+      format.html.phone
     end
   end
 
@@ -125,7 +122,7 @@ class AgentsController < ApplicationController
       format.html # show.html.erb
       format.json { render json: @agent }
       format.js
-      format.mobile
+      format.html.phone
     end
   end
 
@@ -201,6 +198,15 @@ class AgentsController < ApplicationController
   end
 
   private
+  def set_agent
+    @agent = Agent.find(params[:id])
+    authorize @agent
+  end
+
+  def check_policy
+    authorize Agent
+  end
+
   def agent_params
     params.require(:agent).permit(
       :last_name, :middle_name, :first_name,

data/app/controllers/carrier_types_controller.rb

@@ -1,6 +1,7 @@
 class CarrierTypesController < ApplicationController
-  load_and_authorize_resource
-  before_filter :prepare_options, only: [:new, :edit]
+  before_action :set_carrier_type, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :prepare_options, only: [:new, :edit]
 
   # GET /carrier_types
   # GET /carrier_types.json
@@ -86,6 +87,15 @@ class CarrierTypesController < ApplicationController
   end
 
   private
+  def set_carrier_type
+    @carrier_type = CarrierType.find(params[:id])
+    authorize @carrier_type
+  end
+
+  def check_policy
+    authorize CarrierType
+  end
+
   def carrier_type_params
     params.require(:carrier_type).permit(
       :name, :display_name, :note, :position,

data/app/controllers/concerns/enju_biblio/controller.rb

@@ -0,0 +1,99 @@
+module EnjuBiblio
+  module Controller
+    extend ActiveSupport::Concern
+
+    private
+
+    def get_work
+      @work = Manifestation.find(params[:work_id]) if params[:work_id]
+      authorize @work, :show? if @work
+    end
+
+    def get_expression
+      @expression = Manifestation.find(params[:expression_id]) if params[:expression_id]
+      authorize @expression, :show? if @expression
+    end
+
+    def get_manifestation
+      @manifestation = Manifestation.find(params[:manifestation_id]) if params[:manifestation_id]
+      authorize @manifestation, :show? if @manifestation
+    end
+
+    def get_item
+      @item = Item.find(params[:item_id]) if params[:item_id]
+      authorize @item, :show? if @item
+    end
+
+    def get_carrier_type
+      @carrier_type = CarrierType.find(params[:carrier_type_id]) if params[:carrier_type_id]
+    end
+
+    def get_agent
+      @agent = Agent.find(params[:agent_id]) if params[:agent_id]
+      authorize @agent if @agent
+    end
+
+    def get_series_statement
+      @series_statement = SeriesStatement.find(params[:series_statement_id]) if params[:series_statement_id]
+    end
+
+    def get_basket
+      @basket = Basket.find(params[:basket_id]) if params[:basket_id]
+    end
+
+    def get_agent_merge_list
+      @agent_merge_list = AgentMergeList.find(params[:agent_merge_list_id]) if params[:agent_merge_list_id]
+    end
+
+    def get_series_statement_merge_list
+      @series_statement_merge_list = SeriesStatementMergeList.find(params[:series_statement_merge_list_id]) if params[:series_statement_merge_list_id]
+    end
+
+    def make_internal_query(search)
+      # 内部的なクエリ
+      set_role_query(current_user, search)
+
+      unless params[:mode] == "add"
+        expression = @expression
+        agent = @agent
+        manifestation = @manifestation
+        reservable = @reservable
+        carrier_type = params[:carrier_type]
+        library = params[:library]
+        language = params[:language]
+        if defined?(EnjuSubject)
+          subject = params[:subject]
+          subject_by_term = Subject.where(term: params[:subject]).first
+          @subject_by_term = subject_by_term
+        end
+
+        search.build do
+          with(:publisher_ids).equal_to agent.id if agent
+          with(:original_manifestation_ids).equal_to manifestation.id if manifestation
+          with(:reservable).equal_to reservable unless reservable.nil?
+          unless carrier_type.blank?
+            with(:carrier_type).equal_to carrier_type
+          end
+          unless library.blank?
+            library_list = library.split.uniq
+            library_list.each do |lib|
+              with(:library).equal_to lib
+            end
+          end
+          unless language.blank?
+            language_list = language.split.uniq
+            language_list.each do |language|
+              with(:language).equal_to language
+            end
+          end
+          if defined?(EnjuSubject)
+            unless subject.blank?
+              with(:subject).equal_to subject_by_term.term
+            end
+          end
+        end
+      end
+      return search
+    end
+  end
+end

data/app/controllers/content_types_controller.rb

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

data/app/controllers/countries_controller.rb

@@ -1,5 +1,7 @@
 class CountriesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_country, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /countries
   # GET /countries.json
   def index
@@ -82,6 +84,15 @@ class CountriesController < ApplicationController
   end
 
   private
+  def set_country
+    @country = Country.find(params[:id])
+    authorize @country
+  end
+
+  def check_policy
+    authorize Country
+  end
+
   def country_params
     params.require(:country).permit(
       :name, :display_name, :alpha_2, :alpha_3, :numeric_3, :note

data/app/controllers/create_types_controller.rb

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

data/app/controllers/creates_controller.rb

@@ -1,8 +1,8 @@
 class CreatesController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_agent, :get_work
-  before_filter :prepare_options, only: [:new, :edit]
-  after_filter :solr_commit, only: [:create, :update, :destroy]
+  before_action :set_create, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_agent, :get_work
+  before_action :prepare_options, only: [:new, :edit]
 
   # GET /creates
   # GET /creates.json
@@ -111,6 +111,15 @@ class CreatesController < ApplicationController
   end
 
   private
+  def set_create
+    @create = Create.find(params[:id])
+    authorize @create
+  end
+
+  def check_policy
+    authorize Create
+  end
+
   def create_params
     params.require(:create).permit(
       :agent_id, :work_id, :create_type_id, :position

data/app/controllers/donates_controller.rb

@@ -1,5 +1,6 @@
 class DonatesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_donate, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /donates
   # GET /donates.json
@@ -78,6 +79,15 @@ class DonatesController < ApplicationController
   end
 
   private
+  def set_donate
+    @donate = Donate.find(params[:id])
+    authorize @donate
+  end
+
+  def check_policy
+    authorize Donate
+  end
+
   def donate_params
     params.require(:donate).permit(:agent_id, :item_id)
   end

data/app/controllers/form_of_works_controller.rb

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

data/app/controllers/frequencies_controller.rb

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

data/app/controllers/identifier_types_controller.rb

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