enju_biblio 0.1.0.pre56 → 0.1.0.pre57

data/app/controllers/medium_of_performances_controller.rb

@@ -1,12 +1,83 @@
-class MediumOfPerformancesController < InheritedResources::Base
-  respond_to :html, :json
+class MediumOfPerformancesController < ApplicationController
   load_and_authorize_resource
+  # GET /medium_of_performances
+  # GET /medium_of_performances.json
+  def index
+    @medium_of_performances = MediumOfPerformance.all
 
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @medium_of_performances }
+    end
+  end
+
+  # GET /medium_of_performances/1
+  # GET /medium_of_performances/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @medium_of_performance }
+    end
+  end
+
+  # GET /medium_of_performances/new
+  # GET /medium_of_performances/new.json
+  def new
+    @medium_of_performance = MediumOfPerformance.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @medium_of_performance }
+    end
+  end
+
+  # GET /medium_of_performances/1/edit
+  def edit
+  end
+
+  # POST /medium_of_performances
+  # POST /medium_of_performances.json
+  def create
+    @medium_of_performance = MediumOfPerformance.new(params[:medium_of_performance])
+
+    respond_to do |format|
+      if @medium_of_performance.save
+        format.html { redirect_to @medium_of_performance, notice:  t('controller.successfully_created', model:  t('activerecord.models.medium_of_performance')) }
+        format.json { render json: @medium_of_performance, status: :created, location: @medium_of_performance }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @medium_of_performance.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /medium_of_performances/1
+  # PUT /medium_of_performances/1.json
   def update
     if params[:move]
       move_position(@medium_of_performance, params[:move])
       return
     end
-    update!
+
+    respond_to do |format|
+      if @medium_of_performance.update_attributes(params[:medium_of_performance])
+        format.html { redirect_to @medium_of_performance, notice:  t('controller.successfully_updated', model:  t('activerecord.models.medium_of_performance')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @medium_of_performance.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /medium_of_performances/1
+  # DELETE /medium_of_performances/1.json
+  def destroy
+    @medium_of_performance.destroy
+
+    respond_to do |format|
+      format.html { redirect_to medium_of_performances_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.medium_of_performance')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/picture_files_controller.rb

@@ -96,11 +96,19 @@ class PictureFilesController < ApplicationController
       move_position(@picture_file, params[:move], false)
       case
       when @picture_file.picture_attachable.is_a?(Shelf)
-        redirect_to shelf_picture_files_url(@picture_file.picture_attachable)
+        redirect_to picture_files_url(shelf_id: @picture_file.picture_attachable_id)
       when @picture_file.picture_attachable.is_a?(Manifestation)
-        redirect_to manifestation_picture_files_url(@picture_file.picture_attachable)
+        redirect_to picture_files_url(manifestation_id: @picture_file.picture_attachable_id)
       else
-        redirect_to picture_files_url
+        if defined?(EnjuEvent)
+          if @picture_file.picture_attachable.is_a?(Event)
+            redirect_to picture_files_url(manifestation_id: @picture_file.picture_attachable_id)
+          else
+            redirect_to picture_files_url
+          end
+        else
+          redirect_to picture_files_url
+        end
       end
       return
     end
@@ -119,16 +127,32 @@ class PictureFilesController < ApplicationController
   # DELETE /picture_files/1
   # DELETE /picture_files/1.json
   def destroy
+    attachable = @picture_file.picture_attachable
     @picture_file.destroy
 
     respond_to do |format|
-      if @shelf
-        format.html { redirect_to shelf_picture_files_url(@shelf) }
-        format.json { head :no_content }
-      else
-        format.html { redirect_to picture_files_url }
-        format.json { head :no_content }
-      end
+      flash[:notice] = t('controller.successfully_deleted', model: t('activerecord.models.picture_file'))
+      format.html {
+        case attachable.class.name
+        when 'Manifestation'
+          redirect_to picture_files_url(manifestation_id: attachable.id)
+        when 'Agent'
+          redirect_to picture_files_url(agent_id: attachable.id)
+        when 'Shelf'
+          redirect_to picture_files_url(shelf_id: attachable.id)
+        else
+          if defined?(EnjuEvent)
+            if attachable.class.name == 'Event'
+              redirect_to picture_files_url(event_id: attachable.id)
+            else
+              redirect_to picture_files_url
+            end
+          else
+            redirect_to picture_files_url
+          end
+        end
+      }
+      format.json { head :no_content }
     end
   end
 

data/app/controllers/produce_types_controller.rb

@@ -1,12 +1,83 @@
-class ProduceTypesController < InheritedResources::Base
-  respond_to :html, :json
+class ProduceTypesController < ApplicationController
   load_and_authorize_resource
+  # GET /produce_types
+  # GET /produce_types.json
+  def index
+    @produce_types = ProduceType.all
 
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @produce_types }
+    end
+  end
+
+  # GET /produce_types/1
+  # GET /produce_types/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @produce_type }
+    end
+  end
+
+  # GET /produce_types/new
+  # GET /produce_types/new.json
+  def new
+    @produce_type = ProduceType.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @produce_type }
+    end
+  end
+
+  # GET /produce_types/1/edit
+  def edit
+  end
+
+  # POST /produce_types
+  # POST /produce_types.json
+  def create
+    @produce_type = ProduceType.new(params[:produce_type])
+
+    respond_to do |format|
+      if @produce_type.save
+        format.html { redirect_to @produce_type, notice:  t('controller.successfully_created', model:  t('activerecord.models.produce_type')) }
+        format.json { render json: @produce_type, status: :created, location: @produce_type }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @produce_type.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /produce_types/1
+  # PUT /produce_types/1.json
   def update
     if params[:move]
       move_position(@produce_type, params[:move])
       return
     end
-    update!
+
+    respond_to do |format|
+      if @produce_type.update_attributes(params[:produce_type])
+        format.html { redirect_to @produce_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.produce_type')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @produce_type.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /produce_types/1
+  # DELETE /produce_types/1.json
+  def destroy
+    @produce_type.destroy
+
+    respond_to do |format|
+      format.html { redirect_to produce_types_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.produce_type')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/realize_types_controller.rb

@@ -1,12 +1,83 @@
-class RealizeTypesController < InheritedResources::Base
-  respond_to :html, :json
+class RealizeTypesController < ApplicationController
   load_and_authorize_resource
+  # GET /realize_types
+  # GET /realize_types.json
+  def index
+    @realize_types = RealizeType.all
 
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @realize_types }
+    end
+  end
+
+  # GET /realize_types/1
+  # GET /realize_types/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @realize_type }
+    end
+  end
+
+  # GET /realize_types/new
+  # GET /realize_types/new.json
+  def new
+    @realize_type = RealizeType.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @realize_type }
+    end
+  end
+
+  # GET /realize_types/1/edit
+  def edit
+  end
+
+  # POST /realize_types
+  # POST /realize_types.json
+  def create
+    @realize_type = RealizeType.new(params[:realize_type])
+
+    respond_to do |format|
+      if @realize_type.save
+        format.html { redirect_to @realize_type, notice:  t('controller.successfully_created', model:  t('activerecord.models.realize_type')) }
+        format.json { render json: @realize_type, status: :created, location: @realize_type }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @realize_type.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /realize_types/1
+  # PUT /realize_types/1.json
   def update
     if params[:move]
       move_position(@realize_type, params[:move])
       return
     end
-    update!
+
+    respond_to do |format|
+      if @realize_type.update_attributes(params[:realize_type])
+        format.html { redirect_to @realize_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.realize_type')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @realize_type.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /realize_types/1
+  # DELETE /realize_types/1.json
+  def destroy
+    @realize_type.destroy
+
+    respond_to do |format|
+      format.html { redirect_to realize_types_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.realize_type')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/resource_import_files_controller.rb

@@ -97,11 +97,12 @@ class ResourceImportFilesController < ApplicationController
     @resource_import_file.destroy
 
     respond_to do |format|
-      format.html { redirect_to resource_import_files_url }
+      format.html { redirect_to resource_import_files_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.resource_import_file')) }
       format.json { head :no_content }
     end
   end
 
+  private
   def prepare_options
     @libraries = Library.all
     library = Library.where(id: @resource_import_file.try(:library_id)).first

data/app/controllers/resource_import_results_controller.rb

@@ -1,19 +1,39 @@
-class ResourceImportResultsController < InheritedResources::Base
-  respond_to :html, :json, :txt
+class ResourceImportResultsController < ApplicationController
   load_and_authorize_resource
-  has_scope :file_id
-  actions :index, :show, :destroy
-
+  # GET /resource_import_results
+  # GET /resource_import_results.json
   def index
-    @resource_import_file = ResourceImportFile.where(:id => params[:resource_import_file_id]).first
+    @resource_import_file = ResourceImportFile.where(id: params[:resource_import_file_id]).first
     if @resource_import_file
-      if params[:format] == 'txt'
-        @resource_import_results = @resource_import_file.resource_import_results
-      else
-        @resource_import_results = @resource_import_file.resource_import_results.page(params[:page])
-      end
+      @resource_import_results = @resource_import_file.resource_import_results.page(params[:page])
     else
       @resource_import_results = ResourceImportResult.page(params[:page])
     end
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @resource_import_results }
+      format.txt
+    end
+  end
+
+  # GET /resource_import_results/1
+  # GET /resource_import_results/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @resource_import_result }
+    end
+  end
+
+  # DELETE /resource_import_results/1
+  # DELETE /resource_import_results/1.json
+  def destroy
+    @resource_import_result.destroy
+
+    respond_to do |format|
+      format.html { redirect_to resource_import_results_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.resource_import_result')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/models/agent_import_file.rb

@@ -4,7 +4,7 @@ class AgentImportFile < ActiveRecord::Base
   attr_accessible :agent_import, :edit_mode, :user_encoding, :mode
   default_scope {order('agent_import_files.id DESC')}
   scope :not_imported, -> {in_state(:pending)}
-  scope :stucked, -> {in_state(:pending).where('created_at < ?', 1.hour.ago)}
+  scope :stucked, -> {in_state(:pending).where('agent_import_files.created_at < ?', 1.hour.ago)}
 
   if Setting.uploaded_file.storage == :s3
     has_attached_file :agent_import, :storage => :s3, :s3_credentials => "#{Setting.amazon}",

data/app/models/agent_import_result.rb

@@ -17,9 +17,7 @@ end
 #  id                   :integer          not null, primary key
 #  agent_import_file_id :integer
 #  agent_id             :integer
-#  user_id              :integer
 #  body                 :text
 #  created_at           :datetime         not null
 #  updated_at           :datetime         not null
 #
-

data/app/models/carrier_type.rb

@@ -12,7 +12,7 @@ class CarrierType < ActiveRecord::Base
 
   def mods_type
     case name
-    when 'print'
+    when 'volume'
       'text'
     else
       # TODO: その他のタイプ

data/app/models/identifier.rb

@@ -27,6 +27,11 @@ class Identifier < ActiveRecord::Base
       unless StdNum::LCCN.valid?(body)
         errors.add(:body)
       end
+
+    when 'doi'
+      if URI.parse(body).scheme
+        errors.add(:body)
+      end
     end
   end
 

data/app/models/item.rb

@@ -34,7 +34,7 @@ class Item < ActiveRecord::Base
   validates_date :acquired_at, allow_blank: true
 
   normalize_attributes :item_identifier, :binding_item_identifier,
-    :call_number, :binding_call_number
+    :call_number, :binding_call_number, :url
 
   searchable do
     text :item_identifier, :note, :title, :creator, :contributor, :publisher,

data/app/models/manifestation.rb

@@ -24,8 +24,8 @@ class Manifestation < ActiveRecord::Base
     :series_statements_attributes, :periodical, :statement_of_responsibility,
     :creators_attributes, :contributors_attributes, :publishers_attributes,
     :identifiers_attributes
-  attr_accessible :fulltext_content,
-    :doi, :number_of_page_string, :parent_id
+  attr_accessible :fulltext_content, :extent_of_text,
+    :number_of_page_string, :parent_id
 
   has_many :creates, dependent: :destroy, foreign_key: 'work_id'
   has_many :creators, through: :creates, source: :agent, order: 'creates.position'
@@ -201,7 +201,9 @@ class Manifestation < ActiveRecord::Base
       end
     end
     string :sort_title
-    string :doi
+    string :doi, multiple: true do
+      identifier_contents(:doi)
+    end
     boolean :periodical do
       periodical?
     end
@@ -232,8 +234,11 @@ class Manifestation < ActiveRecord::Base
 
   validates_presence_of :original_title, :carrier_type, :language
   validates_associated :carrier_type, :language
-  validates :start_page, :numericality => true, allow_blank: true
-  validates :end_page, :numericality => true, allow_blank: true
+  validates :start_page, numericality: {greater_than_or_equal_to: 0}, allow_blank: true
+  validates :end_page, numericality: {greater_than_or_equal_to: 0}, allow_blank: true
+  validates :height, numericality: {greater_than_or_equal_to: 0}, allow_blank: true
+  validates :width, numericality: {greater_than_or_equal_to: 0}, allow_blank: true
+  validates :depth, numericality: {greater_than_or_equal_to: 0}, allow_blank: true
   validates :manifestation_identifier, uniqueness: true, allow_blank: true
   validates :pub_date, format: {with: /\A\[{0,1}\d+([\/-]\d{0,2}){0,2}\]{0,1}\z/}, allow_blank: true
   validates :access_address, url: true, allow_blank: true, length: {:maximum => 255}
@@ -300,8 +305,8 @@ class Manifestation < ActiveRecord::Base
   end
 
   def number_of_pages
-    if self.start_page and self.end_page
-      page = self.end_page.to_i - self.start_page.to_i + 1
+    if start_page and end_page
+      end_page.to_i - start_page.to_i + 1
     end
   end
 
@@ -613,8 +618,8 @@ end
 #  attachment_meta                 :text
 #  month_of_publication            :integer
 #  fulltext_content                :boolean
-#  doi                             :string(255)
 #  periodical                      :boolean
 #  statement_of_responsibility     :text
 #  publication_place               :text
+#  extent_of_text                  :text
 #