enju_biblio 0.1.0.pre55 → 0.1.0.pre56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a84e1f844d7b64552589c89391e7c346839db56b
-  data.tar.gz: b119ce618536fa206add432215445f3f23838f86
+  metadata.gz: 99daa38e420051427e8608818d3679ed80dd4be7
+  data.tar.gz: 6c8e5fa37d67e33c6ff3a7423f2dc747a066d0f2
 SHA512:
-  metadata.gz: 7f7c9adb46291aefd57f582f0dd59bf02d387086bf9286e738b9ac0b7ca3b01946ea2e8adcea23e0f4118591160f71084456da6033d31a5e0b3d1a1144438fd7
-  data.tar.gz: 0c2fc46d4d0c42101811c3c2b548626a9fe63c4aa21a5479030ad63caa0f600b283791b82577ec77aa34b30f0649d502ddba6ce3e9259eaf9ecdb6423afea4e0
+  metadata.gz: 5f738f3c0eb6a3ca984ae032d17ceacb2ee01c5dbb8d31fa1709470346cb19e0072f901079feb0c1ee08f8b30b5d06a4aeb1ee6873c6461a7aa84af679e798ef
+  data.tar.gz: dca4914c76b182b96eba3bcca18cbf0fc3e4bf53f35cb3d427c7df4b46fd79514902b0644e63509dc7791778d0a546903a23d33f17b85a0749d665a560bda6a8

data/app/controllers/agent_import_files_controller.rb

@@ -8,7 +8,7 @@ class AgentImportFilesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @agent_import_files }
+      format.json { render json: @agent_import_files }
     end
   end
 
@@ -23,12 +23,12 @@ class AgentImportFilesController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @agent_import_file }
+      format.json { render json: @agent_import_file }
       format.download {
         if Setting.uploaded_file.storage == :s3
           redirect_to @agent_import_file.agent_import.expiring_url(10)
         else
-          send_file file, :filename => @agent_import_file.agent_import_file_name, :type => 'application/octet-stream'
+          send_file file, filename: @agent_import_file.agent_import_file_name, type: 'application/octet-stream'
         end
       }
     end
@@ -41,7 +41,7 @@ class AgentImportFilesController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @agent_import_file }
+      format.json { render json: @agent_import_file }
     end
   end
 
@@ -60,11 +60,11 @@ class AgentImportFilesController < ApplicationController
         if @agent_import_file.mode == 'import'
           Resque.enqueue(AgentImportFileQueue, @agent_import_file.id)
         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 }
+        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 }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @agent_import_file.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @agent_import_file.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -77,11 +77,11 @@ class AgentImportFilesController < ApplicationController
         if @agent_import_file.mode == 'import'
           Resque.enqueue(AgentImportFileQueue, @agent_import_file.id)
         end
-        format.html { redirect_to @agent_import_file, :notice => t('controller.successfully_updated', :model => t('activerecord.models.agent_import_file')) }
+        format.html { redirect_to @agent_import_file, notice: t('controller.successfully_updated', model: t('activerecord.models.agent_import_file')) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @agent_import_file.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @agent_import_file.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/agent_import_results_controller.rb

@@ -1,5 +1,5 @@
 class AgentImportResultsController < InheritedResources::Base
-  respond_to :html, :json, :tsv
+  respond_to :html, :json, :txt
   load_and_authorize_resource
   has_scope :file_id
   actions :index, :show, :destroy

data/app/controllers/agent_relationship_types_controller.rb

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

data/app/controllers/agent_relationships_controller.rb

@@ -1,8 +1,8 @@
 class AgentRelationshipsController < 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
     @agent_relationship = AgentRelationship.new(params[:agent_relationship])

data/app/controllers/agent_types_controller.rb

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

data/app/controllers/agents_controller.rb

@@ -1,16 +1,15 @@
 # -*- 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]
+  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]
   if defined?(EnjuResourceMerge)
-    before_filter :get_agent_merge_list, :except => [:create, :update, :destroy]
+    before_filter :get_agent_merge_list, except: [:create, :update, :destroy]
   end
-  before_filter :prepare_options, :only => [:new, :edit]
+  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]
-  cache_sweeper :agent_sweeper, :only => [:create, :update, :destroy]
+  before_filter :get_version, only: [:show]
+  after_filter :solr_commit, only: [:create, :update, :destroy]
 
   # GET /agents
   # GET /agents.json
@@ -87,9 +86,9 @@ class AgentsController < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.xml  { render :xml => @agents }
-      format.rss  { render :layout => false }
+      format.rss  { render layout: false }
       format.atom
-      format.json { render :json => @agents }
+      format.json { render json: @agents }
       format.mobile
     end
   end
@@ -130,7 +129,7 @@ class AgentsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @agent }
+      format.json { render json: @agent }
       format.js
       format.mobile
     end
@@ -140,14 +139,14 @@ class AgentsController < ApplicationController
   # GET /agents/new.json
   def new
     @agent = Agent.new
-    @agent.required_role = Role.where(:name => 'Guest').first
+    @agent.required_role = Role.where(name: 'Guest').first
     @agent.language = Language.where(:iso_639_1 => I18n.default_locale.to_s).first || Language.first
-    @agent.country = current_user.library.country
+    @agent.country = current_user.profile.library.country
     prepare_options
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @agent }
+      format.json { render json: @agent }
     end
   end
 
@@ -179,12 +178,12 @@ class AgentsController < ApplicationController
         when @item
           @agent.items << @item
         end
-        format.html { redirect_to @agent, :notice => t('controller.successfully_created', :model => t('activerecord.models.agent')) }
-        format.json { render :json => @agent, :status => :created, :location => @agent }
+        format.html { redirect_to @agent, notice: t('controller.successfully_created', model: t('activerecord.models.agent')) }
+        format.json { render json: @agent, status: :created, location: @agent }
       else
         prepare_options
-        format.html { render :action => "new" }
-        format.json { render :json => @agent.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @agent.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -194,12 +193,12 @@ class AgentsController < ApplicationController
   def update
     respond_to do |format|
       if @agent.update_attributes(params[:agent])
-        format.html { redirect_to @agent, :notice => t('controller.successfully_updated', :model => t('activerecord.models.agent')) }
+        format.html { redirect_to @agent, notice: t('controller.successfully_updated', model: t('activerecord.models.agent')) }
         format.json { head :no_content }
       else
         prepare_options
-        format.html { render :action => "edit" }
-        format.json { render :json => @agent.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @agent.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -210,7 +209,7 @@ class AgentsController < ApplicationController
     @agent.destroy
 
     respond_to do |format|
-      format.html { redirect_to agents_url, :notice => t('controller.successfully_deleted', :model => t('activerecord.models.agent')) }
+      format.html { redirect_to agents_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.agent')) }
       format.json { head :no_content }
     end
   end
@@ -221,6 +220,6 @@ class AgentsController < ApplicationController
     @agent_types = AgentType.all
     @roles = Role.all
     @languages = Language.all_cache
-    @agent_type = AgentType.where(:name => 'Person').first
+    @agent_type = AgentType.where(name: 'Person').first
   end
 end

data/app/controllers/carrier_types_controller.rb

@@ -1,6 +1,6 @@
 class CarrierTypesController < ApplicationController
   load_and_authorize_resource
-  before_filter :prepare_options, :only => [:new, :edit]
+  before_filter :prepare_options, only: [:new, :edit]
 
   # GET /carrier_types
   # GET /carrier_types.json
@@ -9,7 +9,7 @@ class CarrierTypesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @carrier_types }
+      format.json { render json: @carrier_types }
     end
   end
 
@@ -18,7 +18,7 @@ class CarrierTypesController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @carrier_type }
+      format.json { render json: @carrier_type }
     end
   end
 
@@ -29,7 +29,7 @@ class CarrierTypesController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @carrier_type }
+      format.json { render json: @carrier_type }
     end
   end
 
@@ -44,12 +44,12 @@ class CarrierTypesController < ApplicationController
 
     respond_to do |format|
       if @carrier_type.save
-        format.html { redirect_to @carrier_type, :notice => t('controller.successfully_created', :model => t('activerecord.models.carrier_type')) }
-        format.json { render :json => @carrier_type, :status => :created, :location => @carrier_type }
+        format.html { redirect_to @carrier_type, notice: t('controller.successfully_created', model: t('activerecord.models.carrier_type')) }
+        format.json { render json: @carrier_type, status: :created, location: @carrier_type }
       else
         prepare_options
-        format.html { render :action => "new" }
-        format.json { render :json => @carrier_type.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @carrier_type.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -64,12 +64,12 @@ class CarrierTypesController < ApplicationController
 
     respond_to do |format|
       if @carrier_type.update_attributes(params[:carrier_type])
-        format.html { redirect_to @carrier_type, :notice => t('controller.successfully_updated', :model => t('activerecord.models.carrier_type')) }
+        format.html { redirect_to @carrier_type, notice: t('controller.successfully_updated', model: t('activerecord.models.carrier_type')) }
         format.json { head :no_content }
       else
         prepare_options
-        format.html { render :action => "edit" }
-        format.json { render :json => @carrier_type.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @carrier_type.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/content_types_controller.rb

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

data/app/controllers/countries_controller.rb

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

data/app/controllers/create_types_controller.rb

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

data/app/controllers/creates_controller.rb

@@ -1,9 +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]
-  cache_sweeper :page_sweeper, :only => [:create, :update, :destroy]
+  before_filter :prepare_options, only: [:new, :edit]
+  after_filter :solr_commit, only: [:create, :update, :destroy]
 
   # GET /creates
   # GET /creates.json
@@ -19,7 +18,7 @@ class CreatesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @creates }
+      format.json { render json: @creates }
     end
   end
 
@@ -28,7 +27,7 @@ class CreatesController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @create }
+      format.json { render json: @create }
     end
   end
 
@@ -58,12 +57,12 @@ class CreatesController < ApplicationController
 
     respond_to do |format|
       if @create.save
-        format.html { redirect_to @create, :notice => t('controller.successfully_created', :model => t('activerecord.models.create')) }
-        format.json { render :json => @create, :status => :created, :location => @create }
+        format.html { redirect_to @create, notice: t('controller.successfully_created', model: t('activerecord.models.create')) }
+        format.json { render json: @create, status: :created, location: @create }
       else
         prepare_options
-        format.html { render :action => "new" }
-        format.json { render :json => @create.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @create.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -74,18 +73,18 @@ class CreatesController < ApplicationController
     # 並べ替え
     if @work and params[:move]
       move_position(@create, params[:move], false)
-      redirect_to work_creates_url(@work)
+      redirect_to creates_url(work_id: @create.work_id)
       return
     end
 
     respond_to do |format|
       if @create.update_attributes(params[:create])
-        format.html { redirect_to @create, :notice => t('controller.successfully_updated', :model => t('activerecord.models.create')) }
+        format.html { redirect_to @create, notice: t('controller.successfully_updated', model: t('activerecord.models.create')) }
         format.json { head :no_content }
       else
         prepare_options
-        format.html { render :action => "edit" }
-        format.json { render :json => @create.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @create.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -96,7 +95,7 @@ class CreatesController < ApplicationController
     @create.destroy
 
     respond_to do |format|
-      flash[:notice] = t('controller.successfully_deleted', :model => t('activerecord.models.create'))
+      flash[:notice] = t('controller.successfully_deleted', model: t('activerecord.models.create'))
       case
       when @agent
         format.html { redirect_to agent_works_url(@agent) }

data/app/controllers/donates_controller.rb

@@ -8,7 +8,7 @@ class DonatesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @donates }
+      format.json { render json: @donates }
     end
   end
 
@@ -17,7 +17,7 @@ class DonatesController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @donate }
+      format.json { render json: @donate }
     end
   end
 
@@ -28,7 +28,7 @@ class DonatesController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @donate }
+      format.json { render json: @donate }
     end
   end
 
@@ -43,11 +43,11 @@ class DonatesController < ApplicationController
 
     respond_to do |format|
       if @donate.save
-        format.html { redirect_to @donate, :notice => t('controller.successfully_created', :model => t('activerecord.models.donate')) }
-        format.json { render :json => @donate, :status => :created, :location => @donate }
+        format.html { redirect_to @donate, notice: t('controller.successfully_created', model: t('activerecord.models.donate')) }
+        format.json { render json: @donate, status: :created, location: @donate }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @donate.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @donate.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -57,11 +57,11 @@ class DonatesController < ApplicationController
   def update
     respond_to do |format|
       if @donate.update_attributes(params[:donate])
-        format.html { redirect_to @donate, :notice => t('controller.successfully_updated', :model => t('activerecord.models.donate')) }
+        format.html { redirect_to @donate, notice: t('controller.successfully_updated', model: t('activerecord.models.donate')) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @donate.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @donate.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/extents_controller.rb

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

data/app/controllers/form_of_works_controller.rb

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

data/app/controllers/frequencies_controller.rb

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

data/app/controllers/identifier_types_controller.rb

@@ -8,7 +8,7 @@ class IdentifierTypesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @identifier_types }
+      format.json { render json: @identifier_types }
     end
   end
 
@@ -17,7 +17,7 @@ class IdentifierTypesController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @identifier_type }
+      format.json { render json: @identifier_type }
     end
   end
 
@@ -28,7 +28,7 @@ class IdentifierTypesController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @identifier_type }
+      format.json { render json: @identifier_type }
     end
   end
 
@@ -43,11 +43,11 @@ class IdentifierTypesController < ApplicationController
 
     respond_to do |format|
       if @identifier_type.save
-        format.html { redirect_to @identifier_type, :notice => t('controller.successfully_created', :model => t('activerecord.models.identifier_type')) }
-        format.json { render :json => @identifier_type, :status => :created, :location => @identifier_type }
+        format.html { redirect_to @identifier_type, notice: t('controller.successfully_created', model: t('activerecord.models.identifier_type')) }
+        format.json { render json: @identifier_type, status: :created, location: @identifier_type }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @identifier_type.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @identifier_type.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -62,11 +62,11 @@ class IdentifierTypesController < ApplicationController
 
     respond_to do |format|
       if @identifier_type.update_attributes(params[:identifier_type])
-        format.html { redirect_to @identifier_type, :notice => t('controller.successfully_updated', :model => t('activerecord.models.identifier_type')) }
+        format.html { redirect_to @identifier_type, notice: t('controller.successfully_updated', model: t('activerecord.models.identifier_type')) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @identifier_type.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @identifier_type.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/import_requests_controller.rb

@@ -8,7 +8,7 @@ class ImportRequestsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @import_requests }
+      format.json { render json: @import_requests }
     end
   end
 
@@ -17,7 +17,7 @@ class ImportRequestsController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @import_request }
+      format.json { render json: @import_request }
     end
   end
 
@@ -28,7 +28,7 @@ class ImportRequestsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @import_request }
+      format.json { render json: @import_request }
     end
   end
 
@@ -47,19 +47,19 @@ class ImportRequestsController < ApplicationController
         @import_request.import!
         format.html {
           if @import_request.manifestation
-            redirect_to @import_request.manifestation, :notice => t('controller.successfully_created', :model => t('activerecord.models.import_request'))
+            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')
+            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 }
+        format.json { render json: @import_request, status: :created, location: @import_request }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @import_request.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @import_request.errors, status: :unprocessable_entity }
       end
     end
   rescue Timeout::Error
-    @import_request.sm_fail!
+    @import_request.transition_to!(:failed)
     flash[:notice] = t('page.timed_out')
     redirect_to new_import_request_url
   end
@@ -70,11 +70,11 @@ class ImportRequestsController < ApplicationController
     respond_to do |format|
       if @import_request.update_attributes(params[:import_request])
         @import_request.import!
-        format.html { redirect_to @import_request, :notice => t('controller.successfully_updated', :model => t('activerecord.models.import_request')) }
+        format.html { redirect_to @import_request, notice: t('controller.successfully_updated', model: t('activerecord.models.import_request')) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @import_request.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @import_request.errors, status: :unprocessable_entity }
       end
     end
   end