enju_resource_merge 0.0.10 → 0.0.11

data/app/controllers/patron_merges_controller.rb

@@ -51,8 +51,7 @@ class PatronMergesController < ApplicationController
 
     respond_to do |format|
       if @patron_merge.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.patron_merge'))
-        format.html { redirect_to(@patron_merge) }
+        format.html { redirect_to(@patron_merge, :notice => t('controller.successfully_created', :model => t('activerecord.models.patron_merge'))) }
         format.json { render :json => @patron_merge, :status => :created, :location => @patron_merge }
       else
         format.html { render :action => "new" }
@@ -66,8 +65,7 @@ class PatronMergesController < ApplicationController
   def update
     respond_to do |format|
       if @patron_merge.update_attributes(params[:patron_merge])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.patron_merge'))
-        format.html { redirect_to(@patron_merge) }
+        format.html { redirect_to(@patron_merge, :notice => t('controller.successfully_updated', :model => t('activerecord.models.patron_merge'))) }
         format.json { head :no_content }
       else
         format.html { render :action => "edit" }

data/lib/enju_resource_merge/version.rb

@@ -1,3 +1,3 @@
 module EnjuResourceMerge
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/dummy/app/models/role.rb

@@ -1,5 +1,47 @@
 class Role < ActiveRecord::Base
+  attr_accessible :name, :display_name, :note
+  include MasterModel
+  default_scope :order => "roles.position"
+  has_many :user_has_roles
+  has_many :users, :through => :user_has_roles
+  after_save :clear_all_cache
+  after_destroy :clear_all_cache
+
+  extend FriendlyId
+  friendly_id :name
+
+  def localized_name
+    display_name.localize
+  end
+
+  def self.all_cache
+    if Rails.env == 'production'
+      Rails.cache.fetch('role_all'){Role.select(:name).all}
+    else
+      Role.select(:name)
+    end
+  end
+
+  def clear_all_cache
+    Rails.cache.delete('role_all')
+  end
+
   def self.default_role
-    Role.where(:name => 'Guest').first
+    Rails.cache.fetch('default_role'){Role.find('Guest')}
   end
 end
+
+# == Schema Information
+#
+# Table name: roles
+#
+#  id           :integer         not null, primary key
+#  name         :string(255)     not null
+#  display_name :string(255)
+#  note         :text
+#  created_at   :datetime
+#  updated_at   :datetime
+#  score        :integer         default(0), not null
+#  position     :integer
+#
+

data/spec/dummy/config/application.rb

@@ -43,4 +43,5 @@ module Dummy
   end
 end
 
+require 'enju_biblio'
 require 'url_validator'

data/spec/dummy/db/migrate/001_create_patrons.rb

@@ -1,5 +1,5 @@
 class CreatePatrons < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :patrons do |t|
       t.integer :user_id
       t.string :last_name
@@ -38,11 +38,6 @@ class CreatePatrons < ActiveRecord::Migration
       t.integer :patron_type_id, :default => 1, :null => false
       t.integer :lock_version, :default => 0, :null => false
       t.text :note
-      t.integer :creates_count, :default => 0, :null => false
-      t.integer :realizes_count, :default => 0, :null => false
-      t.integer :produces_count, :default => 0, :null => false
-      t.integer :owns_count, :default => 0, :null => false
-      #t.integer :resource_has_subjects_count, :default => 0, :null => false
       t.integer :required_role_id, :default => 1, :null => false
       t.integer :required_score, :default => 0, :null => false
       t.string :state
@@ -55,8 +50,4 @@ class CreatePatrons < ActiveRecord::Migration
     add_index :patrons, :required_role_id
     add_index :patrons, :full_name
   end
-
-  def self.down
-    drop_table :patrons
-  end
 end

data/spec/dummy/db/migrate/005_create_manifestations.rb

@@ -1,5 +1,5 @@
 class CreateManifestations < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :manifestations do |t|
       t.text :original_title, :null => false
       t.text :title_alternative
@@ -16,9 +16,9 @@ class CreateManifestations < ActiveRecord::Migration
       t.integer :extent_id, :default => 1, :null => false
       t.integer :start_page
       t.integer :end_page
-      t.decimal :height
-      t.decimal :width
-      t.decimal :depth
+      t.integer :height
+      t.integer :width
+      t.integer :depth
       t.string :isbn
       t.string :isbn10
       t.string :wrong_isbn
@@ -27,20 +27,12 @@ class CreateManifestations < ActiveRecord::Migration
       t.string :oclc_number
       t.string :issn
       t.integer :price # TODO: 通貨単位
-      #t.text :filename
-      #t.string :content_type
-      #t.integer :size
       t.text :fulltext
       t.string :volume_number_list
       t.string :issue_number_list
       t.string :serial_number_list
       t.integer :edition
       t.text :note
-      t.integer :produces_count, :default => 0, :null => false
-      t.integer :exemplifies_count, :default => 0, :null => false
-      t.integer :embodies_count, :default => 0, :null => false
-      t.integer :exemplifies_count, :default => 0, :null => false
-      t.integer :work_has_subjects_count, :default => 0, :null => false
       t.boolean :repository_content, :default => false, :null => false
       t.integer :lock_version, :default => 0, :null => false
       t.integer :required_role_id, :default => 1, :null => false
@@ -61,8 +53,4 @@ class CreateManifestations < ActiveRecord::Migration
     add_index :manifestations, :manifestation_identifier
     add_index :manifestations, :updated_at
   end
-
-  def self.down
-    drop_table :manifestations
-  end
 end

data/spec/dummy/db/migrate/006_create_items.rb

@@ -1,5 +1,5 @@
 class CreateItems < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :items do |t|
       #t.integer :manifestation_id
       t.string :call_number
@@ -9,11 +9,7 @@ class CreateItems < ActiveRecord::Migration
       t.timestamps
       t.datetime :deleted_at
       t.integer :shelf_id, :default => 1, :null => false
-      t.integer :basket_id
       t.boolean :include_supplements, :default => false, :null => false
-      t.integer :checkouts_count, :default => 0, :null => false
-      t.integer :owns_count, :default => 0, :null => false
-      t.integer :resource_has_subjects_count, :default => 0, :null => false
       t.text :note
       t.string :url
       t.integer :price
@@ -29,8 +25,4 @@ class CreateItems < ActiveRecord::Migration
     add_index :items, :item_identifier
     add_index :items, :required_role_id
   end
-
-  def self.down
-    drop_table :items
-  end
 end

data/spec/dummy/db/migrate/012_create_owns.rb

@@ -0,0 +1,12 @@
+class CreateOwns < ActiveRecord::Migration
+  def change
+    create_table :owns do |t|
+      t.references :patron, :null => false
+      t.references :item, :null => false
+      t.integer :position
+      t.timestamps
+    end
+    add_index :owns, :patron_id
+    add_index :owns, :item_id
+  end
+end

data/spec/dummy/db/migrate/015_create_creates.rb

@@ -0,0 +1,12 @@
+class CreateCreates < ActiveRecord::Migration
+  def change
+    create_table :creates do |t|
+      t.references :patron, :null => false
+      t.references :work, :null => false
+      t.integer :position
+      t.timestamps
+    end
+    add_index :creates, :patron_id
+    add_index :creates, :work_id
+  end
+end

data/spec/dummy/db/migrate/047_create_produces.rb

@@ -0,0 +1,12 @@
+class CreateProduces < ActiveRecord::Migration
+  def change
+    create_table :produces do |t|
+      t.references :patron, :null => false
+      t.references :manifestation, :null => false
+      t.integer :position
+      t.timestamps
+    end
+    add_index :produces, :patron_id
+    add_index :produces, :manifestation_id
+  end
+end

data/spec/dummy/db/migrate/073_create_carrier_types.rb

@@ -0,0 +1,11 @@
+class CreateCarrierTypes < ActiveRecord::Migration
+  def change
+    create_table :carrier_types do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/112_create_frequencies.rb

@@ -0,0 +1,12 @@
+class CreateFrequencies < ActiveRecord::Migration
+  def change
+    create_table :frequencies do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/117_create_form_of_works.rb

@@ -0,0 +1,12 @@
+class CreateFormOfWorks < ActiveRecord::Migration
+  def change
+    create_table :form_of_works do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/125_create_donates.rb

@@ -1,5 +1,5 @@
 class CreateDonates < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :donates do |t|
       t.integer :patron_id, :null => false
       t.integer :item_id, :null => false
@@ -9,8 +9,4 @@ class CreateDonates < ActiveRecord::Migration
     add_index :donates, :patron_id
     add_index :donates, :item_id
   end
-
-  def self.down
-    drop_table :donates
-  end
 end

data/spec/dummy/db/migrate/20080830154109_create_realizes.rb

@@ -0,0 +1,13 @@
+class CreateRealizes < ActiveRecord::Migration
+  def change
+    create_table :realizes do |t|
+      t.references :patron, :null => false
+      t.references :expression, :null => false
+      t.integer :position
+
+      t.timestamps
+    end
+    add_index :realizes, :patron_id
+    add_index :realizes, :expression_id
+  end
+end

data/spec/dummy/db/migrate/20080830172106_create_exemplifies.rb

@@ -0,0 +1,13 @@
+class CreateExemplifies < ActiveRecord::Migration
+  def change
+    create_table :exemplifies do |t|
+      t.integer :manifestation_id, :null => false
+      t.integer :item_id, :null => false
+      t.integer :position
+
+      t.timestamps
+    end
+    add_index :exemplifies, :manifestation_id
+    add_index :exemplifies, :item_id, :unique => true
+  end
+end

data/spec/dummy/db/migrate/20080905191442_create_patron_types.rb

@@ -0,0 +1,12 @@
+class CreatePatronTypes < ActiveRecord::Migration
+  def change
+    create_table :patron_types do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20081025083323_create_countries.rb

@@ -0,0 +1,28 @@
+class CreateCountries < ActiveRecord::Migration
+
+  # ISO 3166 is the International Standard for country codes.
+  #
+  # ISO 3166-1:2006 Codes for the representation of names of countries and their subdivisions - Part 1: 
+  # Country codes which is what most users know as ISO's country codes. First published in 1974, it is has since 
+  # then become one of the world's most popular and most widely used standard solution for coding country names. 
+  # It contains a two-letter code which is recommended as the general purpose code, a three-letter code which has 
+  # better mnenomic properties and a numeric-3 code which can be useful if script independence of the codes is important.
+  #
+  # http://www.iso.org/iso/country_codes/background_on_iso_3166/what_is_iso_3166.htm
+
+  def change
+    create_table :countries do |t|
+      t.string :name,         :size => 80, :null => false
+      t.text :display_name
+      t.string :alpha_2,      :size => 2
+      t.string :alpha_3,      :size => 3
+      t.string :numeric_3, :size => 3
+      t.text :note
+      t.integer :position
+    end
+    add_index :countries, :name
+    add_index :countries, :alpha_2
+    add_index :countries, :alpha_3
+    add_index :countries, :numeric_3
+  end
+end

data/spec/dummy/db/migrate/20081025083905_create_languages.rb

@@ -0,0 +1,23 @@
+class CreateLanguages < ActiveRecord::Migration
+
+  # ISO 639 is the set of international standards that lists short codes for language names.
+  # Note this doesn't include macrolanguages (dialects)
+  # Information on macrolanguages http://en.wikipedia.org/wiki/ISO_639_macrolanguage
+
+  def change
+    create_table :languages do |t|
+      t.string :name, :null => false
+      t.string :native_name
+      t.text :display_name
+      t.string :iso_639_1,        :size => 3
+      t.string :iso_639_2,        :size => 3
+      t.string :iso_639_3,        :size => 3
+      t.text :note
+      t.integer :position
+    end
+    add_index :languages, :name, :unique => true
+    add_index :languages, :iso_639_1
+    add_index :languages, :iso_639_2
+    add_index :languages, :iso_639_3
+  end
+end

data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb

@@ -0,0 +1,15 @@
+class CreatePictureFiles < ActiveRecord::Migration
+  def change
+    create_table :picture_files do |t|
+      t.integer :picture_attachable_id
+      t.string :picture_attachable_type
+      t.string :content_type
+      t.text :title
+      t.string :thumbnail
+      t.integer :position
+
+      t.timestamps
+    end
+    add_index :picture_files, [:picture_attachable_id, :picture_attachable_type], :name => "index_picture_files_on_picture_attachable_id_and_type"
+  end
+end

data/spec/dummy/db/migrate/20081028083142_create_patron_import_files.rb

@@ -0,0 +1,22 @@
+class CreatePatronImportFiles < ActiveRecord::Migration
+  def change
+    create_table :patron_import_files do |t|
+      t.integer :parent_id
+      t.string :content_type
+      t.integer :size
+      t.integer :user_id
+      t.text :note
+      t.datetime :imported_at
+      t.string :state
+      t.string :patron_import_file_name
+      t.string :patron_import_content_type
+      t.integer :patron_import_file_size
+      t.datetime :patron_import_updated_at
+
+      t.timestamps
+    end
+    add_index :patron_import_files, :parent_id
+    add_index :patron_import_files, :user_id
+    add_index :patron_import_files, :state
+  end
+end

data/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb

@@ -0,0 +1,22 @@
+class CreateResourceImportFiles < ActiveRecord::Migration
+  def change
+    create_table :resource_import_files do |t|
+      t.integer :parent_id
+      t.string :content_type
+      t.integer :size
+      t.integer :user_id
+      t.text :note
+      t.datetime :imported_at
+      t.string :state
+      t.string :resource_import_file_name
+      t.string :resource_import_content_type
+      t.integer :resource_import_file_size
+      t.datetime :resource_import_updated_at
+
+      t.timestamps
+    end
+    add_index :resource_import_files, :parent_id
+    add_index :resource_import_files, :user_id
+    add_index :resource_import_files, :state
+  end
+end

data/spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb

@@ -0,0 +1,15 @@
+class AddAttachmentsPictureToPictureFile < ActiveRecord::Migration
+  def self.up
+    add_column :picture_files, :picture_file_name, :string
+    add_column :picture_files, :picture_content_type, :string
+    add_column :picture_files, :picture_file_size, :integer
+    add_column :picture_files, :picture_updated_at, :datetime
+  end
+
+  def self.down
+    remove_column :picture_files, :picture_file_name
+    remove_column :picture_files, :picture_content_type
+    remove_column :picture_files, :picture_file_size
+    remove_column :picture_files, :picture_updated_at
+  end
+end

data/spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb

@@ -0,0 +1,15 @@
+class AddAttachmentsAttachmentToManifestation < ActiveRecord::Migration
+  def self.up
+    add_column :manifestations, :attachment_file_name, :string
+    add_column :manifestations, :attachment_content_type, :string
+    add_column :manifestations, :attachment_file_size, :integer
+    add_column :manifestations, :attachment_updated_at, :datetime
+  end
+
+  def self.down
+    remove_column :manifestations, :attachment_file_name
+    remove_column :manifestations, :attachment_content_type
+    remove_column :manifestations, :attachment_file_size
+    remove_column :manifestations, :attachment_updated_at
+  end
+end

data/spec/dummy/db/migrate/20090719201843_create_extents.rb

@@ -0,0 +1,12 @@
+class CreateExtents < ActiveRecord::Migration
+  def change
+    create_table :extents do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb

@@ -0,0 +1,12 @@
+class CreateMediumOfPerformances < ActiveRecord::Migration
+  def change
+    create_table :medium_of_performances do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20090720091429_create_content_types.rb

@@ -0,0 +1,12 @@
+class CreateContentTypes < ActiveRecord::Migration
+  def change
+    create_table :content_types do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20090812151902_create_patron_relationship_types.rb

@@ -0,0 +1,12 @@
+class CreatePatronRelationshipTypes < ActiveRecord::Migration
+  def change
+    create_table :patron_relationship_types do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb

@@ -0,0 +1,27 @@
+class AddDcndlSchema < ActiveRecord::Migration
+  def self.up
+    add_column :manifestations, :title_alternative_transcription, :text
+    add_column :patrons, :full_name_alternative_transcription, :text
+    add_column :manifestations, :description, :text
+    add_column :manifestations, :abstract, :text
+    add_column :manifestations, :available_at, :timestamp
+    add_column :manifestations, :valid_until, :timestamp
+    add_column :manifestations, :date_submitted, :timestamp
+    add_column :manifestations, :date_accepted, :timestamp
+    add_column :manifestations, :date_caputured, :timestamp
+    rename_column :manifestations, :copyright_date, :date_copyrighted
+  end
+
+  def self.down
+    remove_column :manifestations, :title_alternative_transcription
+    remove_column :patrons, :full_name_alternative_transcription
+    remove_column :manifestations, :description
+    remove_column :manifestations, :abstract
+    remove_column :manifestations, :available_at
+    remove_column :manifestations, :valid_until
+    remove_column :manifestations, :date_submitted
+    remove_column :manifestations, :date_accepted
+    remove_column :manifestations, :date_caputured
+    rename_column :manifestations, :date_copyrighted, :copyright_date
+  end
+end

data/spec/dummy/db/migrate/20091025080447_create_licenses.rb

@@ -0,0 +1,12 @@
+class CreateLicenses < ActiveRecord::Migration
+  def change
+    create_table :licenses do |t|
+      t.string :name, :null => false
+      t.string :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20091202124834_create_versions.rb

@@ -0,0 +1,18 @@
+class CreateVersions < ActiveRecord::Migration
+  def self.up
+    create_table :versions do |t|
+      t.string   :item_type, :null => false
+      t.integer  :item_id,   :null => false
+      t.string   :event,     :null => false
+      t.string   :whodunnit
+      t.text     :object
+      t.datetime :created_at
+    end
+    add_index :versions, [:item_type, :item_id]
+  end
+
+  def self.down
+    remove_index :versions, [:item_type, :item_id]
+    drop_table :versions
+  end
+end

data/spec/dummy/db/migrate/20091214131723_create_series_statements.rb

@@ -1,5 +1,5 @@
 class CreateSeriesStatements < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :series_statements do |t|
       t.text :title
       t.text :numbering
@@ -10,8 +10,4 @@ class CreateSeriesStatements < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :series_statements
-  end
 end

data/spec/dummy/db/migrate/20100129142347_create_import_requests.rb

@@ -0,0 +1,15 @@
+class CreateImportRequests < ActiveRecord::Migration
+  def change
+    create_table :import_requests do |t|
+      t.string :isbn
+      t.string :state
+      t.integer :manifestation_id
+      t.integer :user_id
+
+      t.timestamps
+    end
+    add_index :import_requests, :isbn
+    add_index :import_requests, :manifestation_id
+    add_index :import_requests, :user_id
+  end
+end

data/spec/dummy/db/migrate/{20100223121519_rename_sereis_statement_title_to_original_title.rb → 20100223121519_rename_series_statement_title_to_original_title.rb}

@@ -1,4 +1,4 @@
-class RenameSereisStatementTitleToOriginalTitle < ActiveRecord::Migration
+class RenameSeriesStatementTitleToOriginalTitle < ActiveRecord::Migration
   def self.up
     rename_column :series_statements, :title, :original_title
     add_column :series_statements, :title_transcription, :text

data/spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb

@@ -0,0 +1,13 @@
+class CreateManifestationRelationships < ActiveRecord::Migration
+  def change
+    create_table :manifestation_relationships do |t|
+      t.integer :parent_id
+      t.integer :child_id
+      t.integer :manifestation_relationship_type_id
+
+      t.timestamps
+    end
+    add_index :manifestation_relationships, :parent_id
+    add_index :manifestation_relationships, :child_id
+  end
+end

data/spec/dummy/db/migrate/20100606073747_create_patron_relationships.rb

@@ -0,0 +1,13 @@
+class CreatePatronRelationships < ActiveRecord::Migration
+  def change
+    create_table :patron_relationships do |t|
+      t.integer :parent_id
+      t.integer :child_id
+      t.integer :patron_relationship_type_id
+
+      t.timestamps
+    end
+    add_index :patron_relationships, :parent_id
+    add_index :patron_relationships, :child_id
+  end
+end