enju_biblio 0.1.0.pre63 → 0.1.0.pre64

data/app/models/agent_merge_list.rb

@@ -1,5 +1,4 @@
 class AgentMergeList < ActiveRecord::Base
-  attr_accessible :title
   has_many :agent_merges, dependent: :destroy
   has_many :agents, through: :agent_merges
   validates_presence_of :title

data/app/models/agent_relationship.rb

@@ -1,5 +1,4 @@
 class AgentRelationship < ActiveRecord::Base
-  attr_accessible :parent_id, :child_id, :agent_relationship_type_id
   belongs_to :parent, foreign_key: 'parent_id', class_name: 'Agent'
   belongs_to :child, foreign_key: 'child_id', class_name: 'Agent'
   belongs_to :agent_relationship_type

data/app/models/agent_relationship_type.rb

@@ -1,5 +1,4 @@
 class AgentRelationshipType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope { order('agent_relationship_types.position') }
   has_many :agent_relationships

data/app/models/agent_type.rb

@@ -1,5 +1,4 @@
 class AgentType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope { order('agent_types.position') }
   has_many :agents

data/app/models/carrier_type.rb

@@ -1,14 +1,8 @@
 class CarrierType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note, :position
   include MasterModel
   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
+  enju_circulation_carrier_type_model if defined?(EnjuCirculation)
 
   def mods_type
     case name

data/app/models/content_type.rb

@@ -1,5 +1,4 @@
 class ContentType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope { order('content_types.position') }
   has_many :manifestations

data/app/models/country.rb

@@ -1,5 +1,4 @@
 class Country < ActiveRecord::Base
-  attr_accessible :name, :display_name, :alpha_2, :alpha_3, :numeric_3, :note
   include MasterModel
   default_scope { order('countries.position') }
   has_many :agents

data/app/models/create.rb

@@ -1,5 +1,4 @@
 class Create < ActiveRecord::Base
-  attr_accessible :agent_id, :work_id, :create_type_id, :position
   belongs_to :agent
   belongs_to :work, class_name: 'Manifestation', foreign_key: 'work_id', touch: true
   belongs_to :create_type

data/app/models/create_type.rb

@@ -1,5 +1,4 @@
 class CreateType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note, :position
   include MasterModel
   default_scope { order('create_types.position') }
 end

data/app/models/donate.rb

@@ -1,5 +1,4 @@
 class Donate < ActiveRecord::Base
-  attr_accessible :agent_id, :item_id
   belongs_to :agent
   belongs_to :item
   validates_associated :agent, :item

data/app/models/enju_biblio/ability.rb

@@ -19,7 +19,17 @@ module EnjuBiblio
         end
         can [:read, :create, :update], Manifestation
         can [:destroy, :delete], Manifestation do |manifestation|
-          manifestation.items.empty? && !manifestation.series_master?
+          if  manifestation.items.empty?
+            if manifestation.series_master?
+              if manifestation.children.empty?
+                true
+              else
+                false
+              end
+            else
+              true
+            end
+          end
         end
         can :manage, [
           AgentMerge,
@@ -73,10 +83,23 @@ module EnjuBiblio
         ]
       when 'Librarian'
         can :manage, Item
+        can [:destroy, :delete], Item do |item|
+          item.removable?
+        end
         can :index, Manifestation
         can [:show, :create, :update], Manifestation
         can [:destroy, :delete], Manifestation do |manifestation|
-          manifestation.items.empty? && !manifestation.series_master?
+          if  manifestation.items.empty?
+            if manifestation.series_master?
+              if manifestation.children.empty?
+                return true
+              else
+                return false
+              end
+            else
+              true
+            end
+          end
         end
         can [:index, :create], Agent
         can :show, Agent do |agent|

data/app/models/exemplify.rb

@@ -1,5 +1,5 @@
 class Exemplify < ActiveRecord::Base
-  attr_accessible :manifestation_id, :item_id, :position
+  #attr_accessible :manifestation_id, :item_id, :position
   belongs_to :manifestation
   belongs_to :item
   #accepts_nested_attributes_for :item

data/app/models/form_of_work.rb

@@ -1,5 +1,4 @@
 class FormOfWork < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope { order('form_of_works.position') }
   has_many :works

data/app/models/frequency.rb

@@ -1,5 +1,4 @@
 class Frequency < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope { order('frequencies.position') }
   has_many :manifestations

data/app/models/identifier.rb

@@ -1,5 +1,5 @@
 class Identifier < ActiveRecord::Base
-  attr_accessible :body, :identifier_type_id, :manifestation_id, :primary, :position
+  #attr_accessible :body, :identifier_type_id, :manifestation_id, :primary, :position
   belongs_to :identifier_type
   belongs_to :manifestation, touch: true
 

data/app/models/identifier_type.rb

@@ -1,5 +1,4 @@
 class IdentifierType < ActiveRecord::Base
-  attr_accessible :display_name, :name, :note, :position
   include MasterModel
   default_scope { order('identifier_types.position') }
   has_many :identifiers

data/app/models/import_request.rb

@@ -1,6 +1,5 @@
 class ImportRequest < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordModel
-  attr_accessible :isbn, :manifestation_id, :user_id
+  include Statesman::Adapters::ActiveRecordQueries
   default_scope { order('import_requests.id DESC') }
   belongs_to :manifestation
   belongs_to :user
@@ -28,7 +27,9 @@ class ImportRequest < ActiveRecord::Base
 
   def check_imported
     if isbn.present?
-      if Identifier.where(body: isbn, identifier_type_id: IdentifierType.where(name: 'isbn').first_or_create.id).first.try(:manifestation)
+      identifier_type = IdentifierType.where(name: 'isbn').first
+      identifier_type = IdentifierType.where(name: 'isbn').create! unless identifier_type
+      if Identifier.where(body: isbn, identifier_type_id: identifier_type.id).first.try(:manifestation)
         errors.add(:isbn, I18n.t('import_request.isbn_taken'))
       end
     end
@@ -45,8 +46,8 @@ class ImportRequest < ActiveRecord::Base
       else
         transition_to!(:failed)
       end
-    else
-      transition_to!(:failed)
+    #else
+    #  transition_to!(:failed)
     end
     save
   rescue ActiveRecord::RecordInvalid
@@ -55,8 +56,8 @@ class ImportRequest < ActiveRecord::Base
     transition_to!(:failed)
   rescue EnjuNdl::RecordNotFound
     transition_to!(:failed)
-  #rescue EnjuNii::RecordNotFound
-  #  transition_to!(:failed)
+  rescue EnjuNii::RecordNotFound
+    transition_to!(:failed)
   end
 
   private

data/app/models/import_request_transition.rb

@@ -3,7 +3,7 @@ class ImportRequestTransition < ActiveRecord::Base
 
   
   belongs_to :import_request, inverse_of: :import_request_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/item.rb

@@ -6,11 +6,6 @@ class Item < ActiveRecord::Base
   enju_question_item_model if defined?(EnjuQuestion)
   enju_inventory_item_model if defined?(EnjuInventory)
   enju_inter_library_loan_item_model if defined?(EnjuInterLibraryLoan)
-  attr_accessible :call_number, :item_identifier, :circulation_status_id,
-    :checkout_type_id, :shelf_id, :include_supplements, :note, :url, :price,
-    :acquired_at, :bookstore_id, :missing_since, :budget_type_id, :lock_version,
-    :manifestation_id, :library_id, :required_role_id,
-    :binding_item_identifier, :binding_call_number, :binded_at
   scope :on_shelf, -> { where('shelf_id != 1') }
   scope :on_web, -> { where(shelf_id: 1) }
   delegate :display_name, to: :shelf, prefix: true

data/app/models/language.rb

@@ -1,6 +1,4 @@
 class Language < ActiveRecord::Base
-  attr_accessible :name, :native_name, :display_name, :iso_639_1, :iso_639_2,
-    :iso_639_3, :note
   include MasterModel
   default_scope { order('languages.position') }
   # If you wish to change the field names for brevity, feel free to enable/modify these.

data/app/models/license.rb

@@ -1,5 +1,4 @@
 class License < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope { order('licenses.position') }
 end

data/app/models/manifestation.rb

@@ -10,22 +10,6 @@ class Manifestation < ActiveRecord::Base
   enju_oai if defined?(EnjuOai)
   enju_question_manifestation_model if defined?(EnjuQuestion)
   enju_bookmark_manifestation_model if defined?(EnjuBookmark)
-  attr_accessible :original_title, :title_alternative, :title_transcription,
-    :manifestation_identifier, :date_copyrighted,
-    :access_address, :language_id, :carrier_type_id, :extent, :start_page,
-    :end_page, :height, :width, :depth, :publication_place,
-    :price, :fulltext, :volume_number_string,
-    :issue_number_string, :serial_number_string, :edition, :note,
-    :repository_content, :required_role_id, :frequency_id,
-    :title_alternative_transcription, :description, :abstract, :available_at,
-    :valid_until, :date_submitted, :date_accepted, :date_captured, :ndl_bib_id,
-    :pub_date, :edition_string, :volume_number, :issue_number, :serial_number,
-    :content_type_id, :attachment, :lock_version,
-    :series_statements_attributes, :serial, :statement_of_responsibility,
-    :creators_attributes, :contributors_attributes, :publishers_attributes,
-    :identifiers_attributes, :dimensions
-  attr_accessible :fulltext_content, :extent,
-    :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'
@@ -224,7 +208,8 @@ class Manifestation < ActiveRecord::Base
   end
 
   if Setting.uploaded_file.storage == :s3
-    has_attached_file :attachment, storage: :s3, s3_credentials: "#{Rails.root.to_s}/config/s3.yml",
+    has_attached_file :attachment, storage: :s3,
+      s3_credentials: Setting.amazon,
       s3_permissions: :private
   else
     has_attached_file :attachment,
@@ -262,24 +247,35 @@ class Manifestation < ActiveRecord::Base
 
   def set_date_of_publication
     return if pub_date.blank?
+    year = Time.utc(pub_date.rjust(4, "0")).year rescue nil
     begin
-      date = Time.zone.parse(pub_date)
+      date = Time.zone.parse(pub_date.rjust(4, "0"))
+      if date.year != year
+        raise ArgumentError
+      end
     rescue ArgumentError, TZInfo::AmbiguousTime
       date = nil
     end
-    pub_date_string = pub_date.split(';').first.gsub(/[\[\]]/, '')
-
-    while date.nil? do
-      pub_date_string += '-01'
-      break if pub_date_string =~ /-01-01-01$/
-      begin
-        date = Time.zone.parse(pub_date_string)
-      rescue ArgumentError
-        date = nil
-      rescue TZInfo::AmbiguousTime
-        date = nil
-        self.year_of_publication = pub_date_string.to_i if pub_date_string =~ /^\d+$/
-        break
+
+    pub_date_string = pub_date.rjust(4, "0").split(';').first.gsub(/[\[\]]/, '')
+    if pub_date_string.length == 4
+      date = Time.zone.parse(Time.utc(pub_date_string).to_s).beginning_of_day
+    else
+      while date.nil? do
+        pub_date_string += '-01'
+        break if pub_date_string =~ /-01-01-01$/
+        begin
+          date = Time.zone.parse(pub_date_string)
+          if date.year != year
+            raise ArgumentError
+          end
+        rescue ArgumentError
+          date = nil
+        rescue TZInfo::AmbiguousTime
+          date = nil
+          self.year_of_publication = pub_date_string.to_i if pub_date_string =~ /^\d+$/
+          break
+        end
       end
     end
 
@@ -495,7 +491,7 @@ class Manifestation < ActiveRecord::Base
 
   def identifier_contents(name)
     if IdentifierType.where(name: name.to_s).exists?
-      identifiers.where(identifier_type_id: IdentifierType.where(name: name).first.id).pluck(:body)
+      identifiers.where(identifier_type_id: IdentifierType.where(name: name).first.id).order(:position).pluck(:body)
     else
       []
     end
@@ -533,6 +529,7 @@ class Manifestation < ActiveRecord::Base
           item_lines << m.pub_date
           item_lines << m.price
           item_lines << m.identifier_contents(:isbn).first
+          item_lines << m.identifier_contents(:issn).first
           item_lines << i.item_identifier
           item_lines << i.call_number
           item_lines << i.price
@@ -542,7 +539,6 @@ class Manifestation < ActiveRecord::Base
           item_lines << i.circulation_status.try(:name)
           item_lines << i.shelf.name
           item_lines << i.shelf.library.name
-          #raise item_lines.to_s if i.item_identifier == '10202'
         lines << item_lines
         end
         lines

data/app/models/manifestation_relationship.rb

@@ -1,5 +1,4 @@
 class ManifestationRelationship < ActiveRecord::Base
-  attr_accessible :parent_id, :child_id, :manifestation_relationship_type_id
   belongs_to :parent, foreign_key: 'parent_id', class_name: 'Manifestation'
   belongs_to :child, foreign_key: 'child_id', class_name: 'Manifestation'
   belongs_to :manifestation_relationship_type

data/app/models/manifestation_relationship_type.rb

@@ -1,5 +1,4 @@
 class ManifestationRelationshipType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope { order('manifestation_relationship_types.position') }
   has_many :manifestation_relationships

data/app/models/medium_of_performance.rb

@@ -1,5 +1,4 @@
 class MediumOfPerformance < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope { order('medium_of_performances.position') }
   has_many :works

data/app/models/own.rb

@@ -1,5 +1,4 @@
 class Own < ActiveRecord::Base
-  attr_accessible :agent_id, :item_id
   belongs_to :agent
   belongs_to :item
 

data/app/models/picture_file.rb

@@ -1,12 +1,10 @@
 class PictureFile < ActiveRecord::Base
-  attr_accessible :picture, :picture_attachable_id,
-    :picture_attachable_type
   scope :attached, -> { where('picture_attachable_id IS NOT NULL') }
   belongs_to :picture_attachable, polymorphic: true, validate: true
 
   if Setting.uploaded_file.storage == :s3
     has_attached_file :picture, storage: :s3, styles: { medium: "600x600>", thumb: "100x100>" },
-      s3_credentials: "#{Rails.root}/config/s3.yml",
+      s3_credentials: Setting.amazon,
       s3_permissions: :private
   else
     has_attached_file :picture, styles: { medium: "600x600>", thumb: "100x100>" },

data/app/models/produce.rb

@@ -1,5 +1,4 @@
 class Produce < ActiveRecord::Base
-  attr_accessible :agent_id, :manifestation_id, :produce_type_id, :position
   belongs_to :agent
   belongs_to :manifestation, touch: true
   belongs_to :produce_type

data/app/models/produce_type.rb

@@ -1,5 +1,4 @@
 class ProduceType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note, :position
   include MasterModel
   default_scope { order('produce_types.position') }
 end

data/app/models/realize.rb

@@ -1,5 +1,4 @@
 class Realize < ActiveRecord::Base
-  attr_accessible :agent_id, :expression_id, :realize_type_id, :position
   belongs_to :agent
   belongs_to :expression, class_name: 'Manifestation', foreign_key: 'expression_id', touch: true
   belongs_to :realize_type

data/app/models/realize_type.rb

@@ -1,5 +1,4 @@
 class RealizeType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note, :position
   include MasterModel
   default_scope { order('realize_types.position') }
 end

data/app/models/resource_export_file.rb

@@ -1,9 +1,15 @@
 class ResourceExportFile < ActiveRecord::Base
-  attr_accessible
-  include Statesman::Adapters::ActiveRecordModel
+  include Statesman::Adapters::ActiveRecordQueries
   include ExportFile
   enju_export_file_model
-  has_attached_file :resource_export
+  if Setting.uploaded_file.storage == :s3
+    has_attached_file :resource_export, storage: :s3,
+      s3_credentials: Setting.amazon,
+      s3_permissions: :private
+  else
+    has_attached_file :resource_export,
+      path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
+  end
   validates_attachment_content_type :resource_export, content_type: /\Atext\/plain\Z/
 
   has_many :resource_export_file_transitions

data/app/models/resource_export_file_transition.rb

@@ -3,7 +3,7 @@ class ResourceExportFileTransition < ActiveRecord::Base
 
   
   belongs_to :resource_export_file, inverse_of: :resource_export_file_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information