enju_biblio 0.1.0.pre42 → 0.1.0.pre43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14fdd443b0e6eaf90b096f61980dfe9bbce5fbc0
-  data.tar.gz: 1c82d2cf2448865032d573d928e626b2fae6bfd2
+  metadata.gz: 05e41c2afb92e36527a3eda64e40ce1699d52245
+  data.tar.gz: 078c063e6952e3fd647c2f3a5b443bce2510ff88
 SHA512:
-  metadata.gz: 037fe3bfe9f799d42bbecb15a97528f5392d3063e2ea7eff3687c9b96892bb1dd12f3d16caffc05795b84dcc35dce595b99d990d1971e95490dc0d0ae79d48fc
-  data.tar.gz: cfe5d61be511eb83e340e11a9eff57c97d80c50144dd5a6750ffc0367d6a6970d23627d5bff5de0d3404e243681d525164bc0f46d4e0af6dbb3dac0e64a54aad
+  metadata.gz: 4daa909c36210b558fec08687ac3192a0ee6fc2d3339a0d9c4f64aadcda002a37148133ddd890d6febf0fd60b09a34e1795695a6e299ea4ee46b3d748bbd32fd
+  data.tar.gz: f9cfbe413e6d31f995cba2076b46bc20825ee6479d0a80af74a1ce0f5645b59fd6084a43273b47513c01aa638a68cf3e4becfb4d3fd39569e61fc88003d9c2c1

data/app/controllers/creates_controller.rb

@@ -1,6 +1,6 @@
 class CreatesController < ApplicationController
   load_and_authorize_resource
-  before_filter :get_patron, :get_work
+  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]
@@ -9,8 +9,8 @@ class CreatesController < ApplicationController
   # GET /creates.json
   def index
     case
-    when @patron
-      @creates = @patron.creates.order('creates.position').page(params[:page])
+    when @agent
+      @creates = @agent.creates.order('creates.position').page(params[:page])
     when @work
       @creates = @work.creates.order('creates.position').page(params[:page])
     else
@@ -34,16 +34,16 @@ class CreatesController < ApplicationController
 
   # GET /creates/new
   def new
-    if @patron and @work.blank?
-      redirect_to patron_works_url(@patorn)
+    if @agent and @work.blank?
+      redirect_to agent_works_url(@patorn)
       return
-    elsif @work and @patron.blank?
-      redirect_to work_patrons_url(@work)
+    elsif @work and @agent.blank?
+      redirect_to work_agents_url(@work)
       return
     else
       @create = Create.new
       @create.work = @work
-      @create.patron = @patron
+      @create.agent = @agent
     end
   end
 
@@ -98,11 +98,11 @@ class CreatesController < ApplicationController
     respond_to do |format|
       flash[:notice] = t('controller.successfully_deleted', :model => t('activerecord.models.create'))
       case
-      when @patron
-        format.html { redirect_to patron_works_url(@patron) }
+      when @agent
+        format.html { redirect_to agent_works_url(@agent) }
         format.json { head :no_content }
       when @work
-        format.html { redirect_to work_patrons_url(@work) }
+        format.html { redirect_to work_agents_url(@work) }
         format.json { head :no_content }
       else
         format.html { redirect_to creates_url }

data/app/controllers/items_controller.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 class ItemsController < ApplicationController
   load_and_authorize_resource
-  before_filter :get_patron, :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
@@ -63,12 +63,12 @@ class ItemsController < ApplicationController
         end
       end
 
-      patron = @patron
+      agent = @agent
       manifestation = @manifestation
       shelf = @shelf
       unless params[:mode] == 'add'
         search.build do
-          with(:patron_ids).equal_to patron.id if patron
+          with(:agent_ids).equal_to agent.id if agent
           with(:manifestation_id).equal_to manifestation.id if manifestation
           with(:shelf_id).equal_to shelf.id if shelf
         end

data/app/controllers/manifestations_controller.rb

@@ -3,7 +3,7 @@ class ManifestationsController < ApplicationController
   load_and_authorize_resource :except => :index
   authorize_resource :only => :index
   before_filter :authenticate_user!, :only => :edit
-  before_filter :get_patron, :get_manifestation, :except => [:create, :update, :destroy]
+  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]
@@ -110,8 +110,8 @@ class ManifestationsController < ApplicationController
         reservable = nil
       end
 
-      patron = get_index_patron
-      @index_patron = patron
+      agent = get_index_agent
+      @index_agent = agent
       manifestation = @manifestation if @manifestation
       series_statement = @series_statement if @series_statement
       parent = @parent = Manifestation.where(:id => params[:parent_id]).first if params[:parent_id].present?
@@ -122,9 +122,9 @@ class ManifestationsController < ApplicationController
 
       unless mode == 'add'
         search.build do
-          with(:creator_ids).equal_to patron[:creator].id if patron[:creator]
-          with(:contributor_ids).equal_to patron[:contributor].id if patron[:contributor]
-          with(:publisher_ids).equal_to patron[:publisher].id if patron[:publisher]
+          with(:creator_ids).equal_to agent[:creator].id if agent[:creator]
+          with(:contributor_ids).equal_to agent[:contributor].id if agent[:contributor]
+          with(:publisher_ids).equal_to agent[:publisher].id if agent[:publisher]
           with(:series_statement_ids).equal_to series_statement.id if series_statement
           with(:parent_ids).equal_to parent.id if parent
         end
@@ -683,19 +683,19 @@ class ManifestationsController < ApplicationController
     end
   end
 
-  def get_index_patron
-    patron = {}
+  def get_index_agent
+    agent = {}
     case
-    when params[:patron_id]
-      patron[:patron] = Patron.find(params[:patron_id])
+    when params[:agent_id]
+      agent[:agent] = Agent.find(params[:agent_id])
     when params[:creator_id]
-      patron[:creator] = @creator = Patron.find(params[:creator_id])
+      agent[:creator] = @creator = Agent.find(params[:creator_id])
     when params[:contributor_id]
-      patron[:contributor] = @contributor = Patron.find(params[:contributor_id])
+      agent[:contributor] = @contributor = Agent.find(params[:contributor_id])
     when params[:publisher_id]
-      patron[:publisher] = @publisher = Patron.find(params[:publisher_id])
+      agent[:publisher] = @publisher = Agent.find(params[:publisher_id])
     end
-    patron
+    agent
   end
 
   def set_reservable

data/app/controllers/owns_controller.rb

@@ -1,14 +1,14 @@
 class OwnsController < ApplicationController
   load_and_authorize_resource
-  before_filter :get_patron, :get_item
+  before_filter :get_agent, :get_item
   after_filter :solr_commit, :only => [:create, :update, :destroy]
   cache_sweeper :page_sweeper, :only => [:create, :update, :destroy]
 
   # GET /owns
   # GET /owns.json
   def index
-    if @patron
-      @owns = @patron.owns.order('owns.position').page(params[:page])
+    if @agent
+      @owns = @agent.owns.order('owns.position').page(params[:page])
     elsif @item
       @owns = @item.owns.order('owns.position').page(params[:page])
     else
@@ -32,16 +32,16 @@ class OwnsController < ApplicationController
 
   # GET /owns/new
   def new
-    if @item and @patron.blank?
-      redirect_to item_patrons_url(@item)
+    if @item and @agent.blank?
+      redirect_to item_agents_url(@item)
       return
-    elsif @patron and @item.blank?
-      redirect_to patron_items_url(@patron)
+    elsif @agent and @item.blank?
+      redirect_to agent_items_url(@agent)
       return
     else
       @own = Own.new
       @own.item = @item
-      @own.patron = @patron
+      @own.agent = @agent
     end
   end
 
@@ -94,8 +94,8 @@ class OwnsController < ApplicationController
       format.html {
         flash[:notice] = t('controller.successfully_deleted', :model => t('activerecord.models.own'))
         case
-        when @patron
-          redirect_to patron_owns_url(@patron)
+        when @agent
+          redirect_to agent_owns_url(@agent)
         when @item
           redirect_to item_owns_url(@item)
         else

data/app/controllers/patron_import_files_controller.rb

@@ -1,92 +1,92 @@
-class PatronImportFilesController < ApplicationController
+class AgentImportFilesController < ApplicationController
   load_and_authorize_resource
 
-  # GET /patron_import_files
-  # GET /patron_import_files.json
+  # GET /agent_import_files
+  # GET /agent_import_files.json
   def index
-    @patron_import_files = PatronImportFile.page(params[:page])
+    @agent_import_files = AgentImportFile.page(params[:page])
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @patron_import_files }
+      format.json { render :json => @agent_import_files }
     end
   end
 
-  # GET /patron_import_files/1
-  # GET /patron_import_files/1.json
+  # GET /agent_import_files/1
+  # GET /agent_import_files/1.json
   def show
-    if @patron_import_file.patron_import.path
+    if @agent_import_file.agent_import.path
       unless Setting.uploaded_file.storage == :s3
-        file = @patron_import_file.patron_import.path
+        file = @agent_import_file.agent_import.path
       end
     end
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @patron_import_file }
+      format.json { render :json => @agent_import_file }
       format.download {
         if Setting.uploaded_file.storage == :s3
-          redirect_to @patron_import_file.patron_import.expiring_url(10)
+          redirect_to @agent_import_file.agent_import.expiring_url(10)
         else
-          send_file file, :filename => @patron_import_file.patron_import_file_name, :type => 'application/octet-stream'
+          send_file file, :filename => @agent_import_file.agent_import_file_name, :type => 'application/octet-stream'
         end
       }
     end
   end
 
-  # GET /patron_import_files/new
-  # GET /patron_import_files/new.json
+  # GET /agent_import_files/new
+  # GET /agent_import_files/new.json
   def new
-    @patron_import_file = PatronImportFile.new
+    @agent_import_file = AgentImportFile.new
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @patron_import_file }
+      format.json { render :json => @agent_import_file }
     end
   end
 
-  # GET /patron_import_files/1/edit
+  # GET /agent_import_files/1/edit
   def edit
   end
 
-  # POST /patron_import_files
-  # POST /patron_import_files.json
+  # POST /agent_import_files
+  # POST /agent_import_files.json
   def create
-    @patron_import_file = PatronImportFile.new(params[:patron_import_file])
-    @patron_import_file.user = current_user
+    @agent_import_file = AgentImportFile.new(params[:agent_import_file])
+    @agent_import_file.user = current_user
 
     respond_to do |format|
-      if @patron_import_file.save
-        format.html { redirect_to @patron_import_file, :notice => t('controller.successfully_created', :model => t('activerecord.models.patron_import_file')) }
-        format.json { render :json => @patron_import_file, :status => :created, :location => @patron_import_file }
+      if @agent_import_file.save
+        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 => @patron_import_file.errors, :status => :unprocessable_entity }
+        format.json { render :json => @agent_import_file.errors, :status => :unprocessable_entity }
       end
     end
   end
 
-  # PUT /patron_import_files/1
-  # PUT /patron_import_files/1.json
+  # PUT /agent_import_files/1
+  # PUT /agent_import_files/1.json
   def update
     respond_to do |format|
-      if @patron_import_file.update_attributes(params[:patron_import_file])
-        format.html { redirect_to @patron_import_file, :notice => t('controller.successfully_updated', :model => t('activerecord.models.patron_import_file')) }
+      if @agent_import_file.update_attributes(params[: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 => @patron_import_file.errors, :status => :unprocessable_entity }
+        format.json { render :json => @agent_import_file.errors, :status => :unprocessable_entity }
       end
     end
   end
 
-  # DELETE /patron_import_files/1
-  # DELETE /patron_import_files/1.json
+  # DELETE /agent_import_files/1
+  # DELETE /agent_import_files/1.json
   def destroy
-    @patron_import_file.destroy
+    @agent_import_file.destroy
 
     respond_to do |format|
-      format.html { redirect_to(patron_import_files_url) }
+      format.html { redirect_to(agent_import_files_url) }
       format.json { head :no_content }
     end
   end

data/app/controllers/patron_import_results_controller.rb

@@ -1,15 +1,15 @@
-class PatronImportResultsController < InheritedResources::Base
+class AgentImportResultsController < InheritedResources::Base
   respond_to :html, :json, :csv
   load_and_authorize_resource
   has_scope :file_id
   actions :index, :show, :destroy
 
   def index
-    @patron_import_file = PatronImportFile.where(:id => params[:patron_import_file_id]).first
-    if @patron_import_file
-      @patron_import_results = @patron_import_file.patron_import_results.page(params[:page])
+    @agent_import_file = AgentImportFile.where(:id => params[:agent_import_file_id]).first
+    if @agent_import_file
+      @agent_import_results = @agent_import_file.agent_import_results.page(params[:page])
     else
-      @patron_import_results = PatronImportResult.page(params[:page])
+      @agent_import_results = AgentImportResult.page(params[:page])
     end
   end
 end

data/app/controllers/patron_relationship_types_controller.rb

@@ -1,12 +1,12 @@
-class PatronRelationshipTypesController < InheritedResources::Base
+class AgentRelationshipTypesController < InheritedResources::Base
   respond_to :html, :json
   has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update
-    @patron_relationship_type = PatronRelationshipType.find(params[:id])
+    @agent_relationship_type = AgentRelationshipType.find(params[:id])
     if params[:move]
-      move_position(@patron_relationship_type, params[:move])
+      move_position(@agent_relationship_type, params[:move])
       return
     end
     update!

data/app/controllers/patron_relationships_controller.rb

@@ -1,19 +1,19 @@
-class PatronRelationshipsController < InheritedResources::Base
+class AgentRelationshipsController < InheritedResources::Base
   respond_to :html, :json
   has_scope :page, :default => 1
   load_and_authorize_resource
   before_filter :prepare_options, :except => [:index, :destroy]
 
   def new
-    @patron_relationship = PatronRelationship.new(params[:patron_relationship])
-    @patron_relationship.parent = Patron.find(params[:patron_id]) rescue nil
-    @patron_relationship.child = Patron.find(params[:child_id]) rescue nil
+    @agent_relationship = AgentRelationship.new(params[:agent_relationship])
+    @agent_relationship.parent = Agent.find(params[:agent_id]) rescue nil
+    @agent_relationship.child = Agent.find(params[:child_id]) rescue nil
   end
 
   def update
-    @patron_relationship = PatronRelationship.find(params[:id])
+    @agent_relationship = AgentRelationship.find(params[:id])
     if params[:move]
-      move_position(@patron_relationship, params[:move])
+      move_position(@agent_relationship, params[:move])
       return
     end
     update!
@@ -21,6 +21,6 @@ class PatronRelationshipsController < InheritedResources::Base
 
   private
   def prepare_options
-    @patron_relationship_types = PatronRelationshipType.all
+    @agent_relationship_types = AgentRelationshipType.all
   end
 end

data/app/controllers/patron_types_controller.rb

@@ -1,12 +1,12 @@
-class PatronTypesController < InheritedResources::Base
+class AgentTypesController < InheritedResources::Base
   respond_to :html, :json
   has_scope :page, :default => 1
   load_and_authorize_resource
 
   def update
-    @patron_type = PatronType.find(params[:id])
+    @agent_type = AgentType.find(params[:id])
     if params[:move]
-      move_position(@patron_type, params[:move])
+      move_position(@agent_type, params[:move])
       return
     end
     update!