enju_biblio 0.1.0.pre37 → 0.1.0.pre38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41a6675a780e68eea3ee082220ebb165f09b927b
-  data.tar.gz: af7fbb006e722aacad738bca1f303755629a317e
+  metadata.gz: cb9c6c9ab4fa481e1cb90e3b084369e41fb93df9
+  data.tar.gz: 5282c5b29fcdaa63b8d82c1d0b65835fa8f54252
 SHA512:
-  metadata.gz: f73678cf486d992ce16bab6427e91982fe5be32e87986dc5c1caec236154b8d14c6609a6808eb5c3c13d0f80fc77bbf7a727922af6be211c0f406c4af2868ebb
-  data.tar.gz: e296e9fa6733baffa7363734cfc2b63f2b8a15be0269edb60a94231e88ea5a0a163c684cff8e9cfeb72bf931bccaa196727213fca04064a1e7c12c78a00ed77a
+  metadata.gz: f17f0fe34499283c96fa960afc2b320d354bb8de2e1d4add975f7da2ee955a82ebeec5742e276a833cdc11b78252eb1afd51bbf87e5ba5e6a3df163a8c6b0c7f
+  data.tar.gz: 857cac540591576bcbffadf9ea8de65004566569f56955e0e4a1798f6fcd0eea4fbd9361f6213277341986c378200b509f2304cef2d5d1306c928e5b5eae44ea

data/app/assets/javascripts/addresses.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/javascripts/identifier_types.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/javascripts/identifiers.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/addresses.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/assets/stylesheets/identifier_types.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/assets/stylesheets/identifiers.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/controllers/addresses_controller.rb

@@ -0,0 +1,2 @@
+class AddressesController < InheritedResources::Base
+end

data/app/controllers/carrier_types_controller.rb

@@ -1,14 +1,94 @@
-class CarrierTypesController < InheritedResources::Base
-  respond_to :html, :json
-  has_scope :page, :default => 1
+class CarrierTypesController < ApplicationController
   load_and_authorize_resource
+  before_filter :prepare_options, :only => [:new, :edit]
 
+  # GET /carrier_types
+  # GET /carrier_types.json
+  def index
+    @carrier_types = CarrierType.order(:position).page(params[:page])
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render :json => @carrier_types }
+    end
+  end
+
+  # GET /carrier_types/1
+  # GET /carrier_types/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render :json => @carrier_type }
+    end
+  end
+
+  # GET /carrier_types/new
+  # GET /carrier_types/new.json
+  def new
+    @carrier_type = CarrierType.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render :json => @carrier_type }
+    end
+  end
+
+  # GET /carrier_types/1/edit
+  def edit
+  end
+
+  # POST /carrier_types
+  # POST /carrier_types.json
+  def create
+    @carrier_type = CarrierType.new(params[:carrier_type])
+
+    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 }
+      else
+        prepare_options
+        format.html { render :action => "new" }
+        format.json { render :json => @carrier_type.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /carrier_types/1
+  # PUT /carrier_types/1.json
   def update
-    @carrier_type = CarrierType.find(params[:id])
     if params[:move]
       move_position(@carrier_type, params[:move])
       return
     end
-    update!
+
+    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.json { head :no_content }
+      else
+        prepare_options
+        format.html { render :action => "edit" }
+        format.json { render :json => @carrier_type.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /carrier_types/1
+  # DELETE /carrier_types/1.json
+  def destroy
+    @carrier_type.destroy
+
+    respond_to do |format|
+      format.html { redirect_to carrier_types_url }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+  def prepare_options
+    if defined?(EnjuCirculation)
+      @checkout_types = CheckoutType.select([:id, :display_name, :position])
+    end
   end
 end

data/app/controllers/identifier_types_controller.rb

@@ -0,0 +1,84 @@
+class IdentifierTypesController < ApplicationController
+  load_and_authorize_resource
+
+  # GET /identifier_types
+  # GET /identifier_types.json
+  def index
+    @identifier_types = IdentifierType.order(:position).page(params[:page])
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render :json => @identifier_types }
+    end
+  end
+
+  # GET /identifier_types/1
+  # GET /identifier_types/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render :json => @identifier_type }
+    end
+  end
+
+  # GET /identifier_types/new
+  # GET /identifier_types/new.json
+  def new
+    @identifier_type = IdentifierType.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render :json => @identifier_type }
+    end
+  end
+
+  # GET /identifier_types/1/edit
+  def edit
+  end
+
+  # POST /identifier_types
+  # POST /identifier_types.json
+  def create
+    @identifier_type = IdentifierType.new(params[:identifier_type])
+
+    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 }
+      else
+        format.html { render :action => "new" }
+        format.json { render :json => @identifier_type.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /identifier_types/1
+  # PUT /identifier_types/1.json
+  def update
+    if params[:move]
+      move_position(@identifier_type, params[:move])
+      return
+    end
+
+    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.json { head :no_content }
+      else
+        format.html { render :action => "edit" }
+        format.json { render :json => @identifier_type.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /identifier_types/1
+  # DELETE /identifier_types/1.json
+  def destroy
+    @identifier_type.destroy
+
+    respond_to do |format|
+      format.html { redirect_to identifier_types_url }
+      format.json { head :no_content }
+    end
+  end
+end

data/app/controllers/identifiers_controller.rb

@@ -0,0 +1,14 @@
+class IdentifiersController < InheritedResources::Base
+  respond_to :html, :json
+  load_and_authorize_resource
+  has_scope :page, :default => 1
+
+  def update
+    @identifier = Identifier.find(params[:id])
+    if params[:move]
+      move_position(@identifier, params[:move])
+      return
+    end
+    update!
+  end
+end

data/app/controllers/manifestations_controller.rb

@@ -348,18 +348,8 @@ class ManifestationsController < ApplicationController
   # GET /manifestations/1
   # GET /manifestations/1.json
   def show
-    if params[:isbn]
-      @manifestation = Manifestation.find_by_isbn(params[:isbn])
-      if @manifestation
-        redirect_to manifestation_url(@manifestation, :format => params[:format])
-        return
-      else
-        raise ActiveRecord::RecordNotFound
-      end
-    else
-      if @version
-        @manifestation = @manifestation.versions.find(@version).item if @version
-      end
+    if @version
+      @manifestation = @manifestation.versions.find(@version).item if @version
     end
 
     case params[:mode]
@@ -557,39 +547,39 @@ class ManifestationsController < ApplicationController
     #  query = "#{query} subject_sm:#{options[:subject]}"
     #end
 
-    unless options[:tag].blank?
+    if options[:tag].present?
       query = "#{query} tag_sm:#{options[:tag]}"
     end
 
-    unless options[:creator].blank?
+    if options[:creator].present?
       query = "#{query} creator_text:#{options[:creator]}"
     end
 
-    unless options[:contributor].blank?
+    if options[:contributor].present?
       query = "#{query} contributor_text:#{options[:contributor]}"
     end
 
-    unless options[:isbn].blank?
+    if options[:isbn].present?
       query = "#{query} isbn_sm:#{options[:isbn].gsub('-', '')}"
     end
 
-    unless options[:issn].blank?
+    if options[:issn].present?
       query = "#{query} issn_sm:#{options[:issn].gsub('-', '')}"
     end
 
-    unless options[:lccn].blank?
+    if options[:lccn].present?
       query = "#{query} lccn_s:#{options[:lccn]}"
     end
 
-    unless options[:nbn].blank?
+    if options[:nbn].present?
       query = "#{query} nbn_s:#{options[:nbn]}"
     end
 
-    unless options[:publisher].blank?
+    if options[:publisher].present?
       query = "#{query} publisher_text:#{options[:publisher]}"
     end
 
-    unless options[:item_identifier].blank?
+    if options[:item_identifier].present?
       query = "#{query} item_identifier_sm:#{options[:item_identifier]}"
     end
 
@@ -679,9 +669,12 @@ class ManifestationsController < ApplicationController
     @roles = Role.select([:id, :display_name, :position])
     @languages = Language.select([:id, :display_name, :position])
     @frequencies = Frequency.select([:id, :display_name, :position])
+    @identifier_types = IdentifierType.select([:id, :display_name, :position])
+    @content_types = ContentType.select([:id, :display_name, :position])
     @nii_types = NiiType.select([:id, :display_name, :position]) if defined?(EnjuNii)
     if defined?(EnjuSubject)
       @subject_types = SubjectType.select([:id, :display_name, :position])
+      @subject_heading_types = SubjectHeadingType.select([:id, :display_name, :position])
       @classification_types = ClassificationType.select([:id, :display_name, :position])
     end
   end

data/app/helpers/addresses_helper.rb

@@ -0,0 +1,2 @@
+module AddressesHelper
+end

data/app/helpers/identifier_types_helper.rb

@@ -0,0 +1,2 @@
+module IdentifierTypesHelper
+end

data/app/helpers/identifiers_helper.rb

@@ -0,0 +1,2 @@
+module IdentifiersHelper
+end

data/app/models/carrier_type.rb

@@ -4,8 +4,10 @@ class CarrierType < ActiveRecord::Base
   default_scope :order => "carrier_types.position"
   has_many :manifestations
   if defined?(EnjuCirculation)
+    attr_accessible :carrier_type_has_checkout_types_attributes
     has_many :carrier_type_has_checkout_types, :dependent => :destroy
     has_many :checkout_types, :through => :carrier_type_has_checkout_types
+    accepts_nested_attributes_for :carrier_type_has_checkout_types, :allow_destroy => true, :reject_if => :all_blank
   end
 
   def mods_type

data/app/models/enju_biblio/ability.rb

@@ -9,6 +9,10 @@ module EnjuBiblio
         can [:destroy, :delete], CarrierType do |carrier_type|
           true unless carrier_type.manifestations.exists?
         end if LibraryGroup.site_config.network_access_allowed?(ip_address)
+        can [:read, :create, :update], IdentifierType
+        can [:destroy, :delete], IdentifierType do |identifier_type|
+          true unless identifier_type.identifiers.exists?
+        end if LibraryGroup.site_config.network_access_allowed?(ip_address)
         can [:read, :create, :update], Item
         can [:destroy, :delete], Item do |item|
           item.removable?
@@ -22,6 +26,7 @@ module EnjuBiblio
           CreateType,
           Donate,
           Exemplify,
+          Identifier,
           ImportRequest,
           ManifestationRelationship,
           ManifestationRelationshipType,
@@ -58,6 +63,7 @@ module EnjuBiblio
           Extent,
           Frequency,
           FormOfWork,
+          IdentifierType,
           Language,
           License,
           MediumOfPerformance,
@@ -85,6 +91,7 @@ module EnjuBiblio
           Create,
           Donate,
           Exemplify,
+          Identifier,
           ImportRequest,
           ManifestationRelationship,
           Own,
@@ -103,6 +110,7 @@ module EnjuBiblio
           Extent,
           Frequency,
           FormOfWork,
+          IdentifierType,
           Language,
           License,
           ManifestationRelationshipType,
@@ -151,6 +159,8 @@ module EnjuBiblio
           Extent,
           Frequency,
           FormOfWork,
+          Identifier,
+          IdentifierType,
           Language,
           License,
           ManifestationRelationship,
@@ -181,6 +191,8 @@ module EnjuBiblio
           Extent,
           Frequency,
           FormOfWork,
+          Identifier,
+          IdentifierType,
           Item,
           Language,
           License,

data/app/models/identifier.rb

@@ -0,0 +1,65 @@
+class Identifier < ActiveRecord::Base
+  attr_accessible :body, :identifier_type_id, :manifestation_id, :primary, :position
+  belongs_to :identifier_type
+  belongs_to :manifestation
+
+  validates_presence_of :body
+  validates_uniqueness_of :body, :scope => [:identifier_type_id, :manifestation_id]
+  validate :check_identifier
+  before_save :convert_isbn
+
+  acts_as_list :scope => :manifestation_id
+  normalize_attributes :body
+
+  def check_identifier
+    case identifier_type.try(:name)
+    when 'isbn'
+      unless StdNum::ISBN.valid?(body)
+        errors.add(:body)
+      end
+
+    when 'issn'
+      unless StdNum::ISSN.valid?(body)
+        errors.add(:issn)
+      end
+
+    when 'lccn'
+      unless StdNum::LCCN.valid?(body)
+        errors.add(:body)
+      end
+    end
+  end
+
+  def convert_isbn
+    if identifier_type.name == 'isbn'
+      lisbn = Lisbn.new(body)
+      if lisbn.isbn
+        if lisbn.isbn.length == 10
+          self.body = lisbn.isbn13
+        end
+      end
+    end
+  end
+
+  def hyphenated_isbn
+    if identifier_type.name == 'isbn'
+      lisbn = Lisbn.new(body)
+      lisbn.parts.join('-')
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: identifiers
+#
+#  id                 :integer          not null, primary key
+#  body               :string(255)      not null
+#  identifier_type_id :integer          not null
+#  manifestation_id   :integer
+#  primary            :boolean
+#  position           :integer
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#
+