enju_biblio 0.1.3 → 0.2.0.beta.1

data/app/controllers/resource_import_files_controller.rb

@@ -1,6 +1,7 @@
 class ResourceImportFilesController < ApplicationController
-  load_and_authorize_resource
-  before_filter :prepare_options, only: [:new, :edit]
+  before_action :set_resource_import_file, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :prepare_options, only: [:new, :edit]
 
   # GET /resource_import_files
   # GET /resource_import_files.json
@@ -61,7 +62,7 @@ class ResourceImportFilesController < ApplicationController
     respond_to do |format|
       if @resource_import_file.save
         if @resource_import_file.mode == 'import'
-          Resque.enqueue(ResourceImportFileQueue, @resource_import_file.id)
+          ResourceImportFileJob.perform_later(@resource_import_file)
         end
         format.html { redirect_to @resource_import_file, notice: t('import.successfully_created', model: t('activerecord.models.resource_import_file')) }
         format.json { render json: @resource_import_file, status: :created, location: @resource_import_file }
@@ -79,7 +80,7 @@ class ResourceImportFilesController < ApplicationController
     respond_to do |format|
       if @resource_import_file.update_attributes(resource_import_file_params)
         if @resource_import_file.mode == 'import'
-          Resque.enqueue(ResourceImportFileQueue, @resource_import_file.id)
+          ResourceImportFileJob.perform_later(@resource_import_file)
         end
         format.html { redirect_to @resource_import_file, notice: t('controller.successfully_updated', model: t('activerecord.models.resource_import_file')) }
         format.json { head :no_content }
@@ -103,6 +104,15 @@ class ResourceImportFilesController < ApplicationController
   end
 
   private
+  def set_resource_import_file
+    @resource_import_file = ResourceImportFile.find(params[:id])
+    authorize @resource_import_file
+  end
+
+  def check_policy
+    authorize ResourceImportFile
+  end
+
   def resource_import_file_params
     params.require(:resource_import_file).permit(
       :resource_import, :edit_mode, :user_encoding, :mode,

data/app/controllers/resource_import_results_controller.rb

@@ -1,5 +1,7 @@
 class ResourceImportResultsController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_resource_import_result, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index]
+
   # GET /resource_import_results
   # GET /resource_import_results.json
   def index
@@ -38,6 +40,15 @@ class ResourceImportResultsController < ApplicationController
   end
 
   private
+  def set_resource_import_result
+    @resource_import_result = ResourceImportResult.find(params[:id])
+    authorize @resource_import_result
+  end
+
+  def check_policy
+    authorize ResourceImportResult
+  end
+
   def resource_import_result_params
     params.require(:resource_import_result).permit(
       :resource_import_file_id, :manifestation_id, :item_id, :body

data/app/controllers/series_statement_merge_lists_controller.rb

@@ -1,5 +1,6 @@
 class SeriesStatementMergeListsController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_series_statement_merge_list, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /series_statement_merge_lists
   # GET /series_statement_merge_lists.json
@@ -91,6 +92,15 @@ class SeriesStatementMergeListsController < ApplicationController
   end
 
   private
+  def set_series_statement_merge_list
+    @series_statement_merge_list = SeriesStatementMergeList.find(params[:id])
+    authorize @series_statement_merge_list
+  end
+
+  def check_policy
+    authorize SeriesStatementMergeList
+  end
+
   def series_statement_merge_list_params
     params.require(:series_statement_merge_list).permit(:title)
   end

data/app/controllers/series_statement_merges_controller.rb

@@ -1,6 +1,7 @@
 class SeriesStatementMergesController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_series_statement, :get_series_statement_merge_list
+  before_action :set_series_statement_merge, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_series_statement, :get_series_statement_merge_list
 
   # GET /series_statement_merges
   # GET /series_statement_merges.json
@@ -89,6 +90,15 @@ class SeriesStatementMergesController < ApplicationController
   end
 
   private
+  def set_series_statement_merge
+    @series_statement_merge = SeriesStatementMerge.find(params[:id])
+    authorize @series_statement_merge
+  end
+
+  def check_policy
+    authorize SeriesStatementMerge
+  end
+
   def series_statement_merge_params
     params.require(:series_statement_merge).permit(
       :series_statement_id, :series_statement_merge_list_id

data/app/controllers/series_statements_controller.rb

@@ -1,9 +1,8 @@
-# -*- encoding: utf-8 -*-
 class SeriesStatementsController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_manifestation, except: [:create, :update, :destroy]
-  after_filter :solr_commit, only: [:create, :update, :destroy]
-  before_filter :get_series_statement_merge_list, except: [:create, :update, :destroy]
+  before_action :set_series_statement, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_manifestation, except: [:create, :update, :destroy]
+  before_action :get_series_statement_merge_list, except: [:create, :update, :destroy]
 
   # GET /series_statements
   # GET /series_statements.json
@@ -116,6 +115,15 @@ class SeriesStatementsController < ApplicationController
   end
 
   private
+  def set_series_statement
+    @series_statement = SeriesStatement.find(params[:id])
+    authorize @series_statement
+  end
+
+  def check_policy
+    authorize SeriesStatement
+  end
+
   def series_statement_params
     params.require(:series_statement).permit(
       :original_title, :numbering, :title_subseries,:numbering_subseries,

data/app/helpers/manifestations_helper.rb

@@ -71,10 +71,10 @@ module ManifestationsHelper
     current = true if languages.include?(language.name)
     if current
       content_tag :strong do
-        link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(page: nil, language: language.name, view: nil, only_path: true)))
+        link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(params.permit.merge(page: nil, language: language.name, view: nil, only_path: true)))
       end
     else
-      link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(page: nil, language: language.name, view: nil, only_path: true)))
+      link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(params.permit.merge(page: nil, language: language.name, view: nil, only_path: true)))
     end
   end
 
@@ -86,10 +86,10 @@ module ManifestationsHelper
     content_tag :li do
       if current
         content_tag :strong do
-          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
+          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.permit.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
         end
       else
-        link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
+        link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.permit.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
       end
     end
   end
@@ -102,10 +102,10 @@ module ManifestationsHelper
       current = true if params[:carrier_type] == carrier_type.name
       if current
         content_tag :strong do
-          link_to("#{carrier_type.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
+          link_to("#{carrier_type.display_name.localize} (" + facet.count.to_s + ")", url_for(params.permit.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
         end
       else
-        link_to("#{carrier_type.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
+        link_to("#{carrier_type.display_name.localize} (" + facet.count.to_s + ")", url_for(params.permit.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
       end
     end
   end
@@ -115,10 +115,10 @@ module ManifestationsHelper
     current = true if facet.value.first.to_i == pub_date_from.to_i and facet.value.last.to_i - 1 == pub_date_until.to_i
     if current
       content_tag :strong do
-        link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(params.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
+        link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(params.permit.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
       end
     else
-      link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(params.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
+      link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(params.permit.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
     end
   end
 

data/app/jobs/agent_import_file_job.rb

@@ -0,0 +1,7 @@
+class AgentImportFileJob < ActiveJob::Base
+  queue_as :enju_leaf
+
+  def perform(agent_import_file)
+    agent_import_file.import_start
+  end
+end

data/app/jobs/resource_export_file_job.rb

@@ -0,0 +1,7 @@
+class ResourceExportFileJob < ActiveJob::Base
+  queue_as :enju_leaf
+
+  def perform(resource_export_file)
+    resource_export_file.export!
+  end
+end

data/app/jobs/resource_import_file_job.rb

@@ -0,0 +1,7 @@
+class ResourceImportFileJob < ActiveJob::Base
+  queue_as :enju_leaf
+
+  def perform(resource_import_file)
+    resource_import_file.import_start
+  end
+end

data/app/models/agent.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 class Agent < ActiveRecord::Base
   scope :readable_by, lambda{ |user|
     if user
@@ -29,6 +28,7 @@ class Agent < ActiveRecord::Base
   belongs_to :language
   belongs_to :country
   has_one :agent_import_result
+  belongs_to :profile
 
   validates_presence_of :language, :agent_type, :country
   validates_associated :language, :agent_type, :country
@@ -54,6 +54,8 @@ class Agent < ActiveRecord::Base
     Sunspot.commit
   end
 
+  attr_accessor :agent_id
+
   searchable do
     text :name, :place, :address_1, :address_2, :other_designation, :note
     string :zip_code_1
@@ -243,6 +245,26 @@ class Agent < ActiveRecord::Base
   def agents
     self.original_agents + self.derived_agents
   end
+
+  def self.new_agents(agents_params)
+    return [] unless agents_params
+    agents = []
+    Agent.transaction do
+      agents_params.each do |k, v|
+        next if v['_destroy'] == '1'
+        if v['agent_id'].present?
+          agent = Agent.find(v['agent_id'])
+        elsif v['id'].present?
+          agent = Agent.find(v['id'])
+        else
+          v.delete('_destroy')
+          agent = Agent.create(v)
+        end
+        agents << agent
+      end
+    end
+    agents
+  end
 end
 
 # == Schema Information

data/app/models/agent_import_file.rb

@@ -31,7 +31,6 @@ class AgentImportFile < ActiveRecord::Base
 
   has_many :agent_import_file_transitions
 
-  enju_import_file_model
   attr_accessor :mode
 
   def state_machine

data/app/models/carrier_type.rb

@@ -2,7 +2,6 @@ class CarrierType < ActiveRecord::Base
   include MasterModel
   default_scope { order("carrier_types.position") }
   has_many :manifestations
-  enju_circulation_carrier_type_model if defined?(EnjuCirculation)
 
   def mods_type
     case name

data/app/models/identifier.rb

@@ -13,7 +13,7 @@ class Identifier < ActiveRecord::Base
   }
 
   acts_as_list scope: :manifestation_id
-  normalize_attributes :body
+  strip_attributes only: :body
 
   def check_identifier
     case identifier_type.try(:name)

data/app/models/item.rb

@@ -1,11 +1,4 @@
-# -*- encoding: utf-8 -*-
 class Item < ActiveRecord::Base
-  enju_library_item_model if defined?(EnjuLibrary)
-  enju_circulation_item_model if defined?(EnjuCirculation)
-  enju_export if defined?(EnjuExport)
-  enju_question_item_model if defined?(EnjuQuestion)
-  enju_inventory_item_model if defined?(EnjuInventory)
-  enju_inter_library_loan_item_model if defined?(EnjuInterLibraryLoan)
   scope :on_shelf, -> { where('shelf_id != 1') }
   scope :on_web, -> { where(shelf_id: 1) }
   scope :available_for, -> user {
@@ -33,8 +26,8 @@ class Item < ActiveRecord::Base
   validates :url, url: true, allow_blank: true, length: { maximum: 255 }
   validates_date :acquired_at, allow_blank: true
 
-  normalize_attributes :item_identifier, :binding_item_identifier,
-    :call_number, :binding_call_number, :url
+  strip_attributes only: [:item_identifier, :binding_item_identifier,
+    :call_number, :binding_call_number, :url]
 
   searchable do
     text :item_identifier, :note, :title, :creator, :contributor, :publisher,