enju_ndl 0.1.0.pre25 → 0.1.0.pre26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b19ae34cf02eb8f53d1b106c68eedb29e168a96
-  data.tar.gz: a1b564c2b8184d2b60f7133826fdee5a140321a2
+  metadata.gz: ee1c48789c634e863b03e8e22228eb35ebfef5d5
+  data.tar.gz: a29e1bac9d9f11dbb171c44c4b870e9d547aacf2
 SHA512:
-  metadata.gz: be6ed4576996a2a2ed169b0d60abb94ccbf1549b3fd5c31d83a9e9baa438e605fdec6d57c1d313030bffa5328830b2168dc53b2ec11243919f1358c9a5fff3ae
-  data.tar.gz: 25d27661c4c399c23773145af60af659314aa1f024cc0b97b94de7cddec07dbbf118f912bb6bd77f9fe4d251abc1589d7d51e0045ec7565dee83cc428c832b52
+  metadata.gz: a19dcc7d9ba551144e50181df1be9fee83882257f92dde5bf93f0235e35468b9e732764154139809343568fb7f9b781474e4519b0b74e9bbf5f21dbcf5c08161
+  data.tar.gz: db3ad54d5539bd43fb631fe66c1718850951ccc86ac8c55f74c86891619b3f68a2fc4dc2ecf96d47a5d192993ac1c0cc765da7ce723d5006a8e94b4f60a8a92c

data/lib/enju_ndl/ndl_search.rb

@@ -85,8 +85,8 @@ module EnjuNdl
         statement_of_responsibility = doc.xpath('//dcndl:BibResource/dc:creator').map{|e| e.content}.join("; ")
 
         manifestation = nil
-        Patron.transaction do
-          publisher_patrons = Patron.import_patrons(publishers)
+        Agent.transaction do
+          publisher_agents = Agent.import_agents(publishers)
 
           manifestation = Manifestation.new(
             :manifestation_identifier => admin_identifier,
@@ -130,7 +130,7 @@ module EnjuNdl
             identifier.each do |k, v|
               manifestation.identifiers << v if v.valid?
             end
-            manifestation.publishers << publisher_patrons
+            manifestation.publishers << publisher_agents
             create_additional_attributes(doc, manifestation)
             create_series_statement(doc, manifestation)
           end
@@ -148,11 +148,11 @@ module EnjuNdl
         classifications = get_classifications(doc).uniq
         classification_urls = doc.xpath('//dcterms:subject[@rdf:resource]').map{|subject| subject.attributes['resource'].value}
 
-        Patron.transaction do
-          creator_patrons = Patron.import_patrons(creators)
+        Agent.transaction do
+          creator_agents = Agent.import_agents(creators)
           language_id = Language.where(:iso_639_2 => language).first.id rescue 1
           content_type_id = ContentType.where(:name => 'text').first.id rescue 1
-          manifestation.creators << creator_patrons
+          manifestation.creators << creator_agents
 
           if defined?(EnjuSubject)
             subject_heading_type = SubjectHeadingType.where(:name => 'ndlsh').first_or_create
@@ -235,7 +235,7 @@ module EnjuNdl
           creators << {
             :full_name => creator.at('./foaf:name').content,
             :full_name_transcription => creator.at('./dcndl:transcription').try(:content),
-            :patron_identifier => creator.attributes["about"].try(:content)
+            :agent_identifier => creator.attributes["about"].try(:content)
           }
         end
         creators
@@ -276,7 +276,7 @@ module EnjuNdl
           publishers << {
             :full_name => publisher.at('./foaf:name').content,
             :full_name_transcription => publisher.at('./dcndl:transcription').try(:content),
-            :patron_identifier => publisher.attributes["about"].try(:content)
+            :agent_identifier => publisher.attributes["about"].try(:content)
           }
         end
         return publishers

data/lib/enju_ndl/version.rb

@@ -1,3 +1,3 @@
 module EnjuNdl
-  VERSION = "0.1.0.pre25"
+  VERSION = "0.1.0.pre26"
 end

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

@@ -1,30 +1,8 @@
+# -*- encoding: utf-8 -*-
 class User < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
+  devise :database_authenticatable, #:registerable,
+    :recoverable, :rememberable, :trackable, #, :validatable
+    :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-
-  has_one :user_has_role
-  has_one :role, :through => :user_has_role
-  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
-  has_many :purchase_requests
-  has_many :order_lists
-  extend FriendlyId
-  friendly_id :username
-
-  def has_role?(role_in_question)
-    return false unless role
-    return true if role.name == role_in_question
-    case role.name
-    when 'Administrator'
-      return true
-    when 'Librarian'
-      return true if role_in_question == 'User'
-    else
-      false
-    end
-  end
+  enju_leaf_user_model
 end

data/spec/dummy/db/migrate/{001_create_patrons.rb → 001_create_agents.rb}

@@ -1,6 +1,6 @@
-class CreatePatrons < ActiveRecord::Migration
+class CreateAgents < ActiveRecord::Migration
   def change
-    create_table :patrons do |t|
+    create_table :agents do |t|
       t.integer :user_id
       t.string :last_name
       t.string :middle_name
@@ -35,7 +35,7 @@ class CreatePatrons < ActiveRecord::Migration
       t.datetime :date_of_death
       t.integer :language_id, :default => 1, :null => false
       t.integer :country_id, :default => 1, :null => false
-      t.integer :patron_type_id, :default => 1, :null => false
+      t.integer :agent_type_id, :default => 1, :null => false
       t.integer :lock_version, :default => 0, :null => false
       t.text :note
       t.integer :required_role_id, :default => 1, :null => false
@@ -44,10 +44,10 @@ class CreatePatrons < ActiveRecord::Migration
       t.text :email
       t.text :url
     end
-    add_index :patrons, :user_id, :unique => true
-    add_index :patrons, :language_id
-    add_index :patrons, :country_id
-    add_index :patrons, :required_role_id
-    add_index :patrons, :full_name
+    add_index :agents, :user_id, :unique => true
+    add_index :agents, :language_id
+    add_index :agents, :country_id
+    add_index :agents, :required_role_id
+    add_index :agents, :full_name
   end
 end

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

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

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

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

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

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

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

@@ -1,12 +1,12 @@
 class CreateDonates < ActiveRecord::Migration
   def change
     create_table :donates do |t|
-      t.integer :patron_id, :null => false
+      t.integer :agent_id, :null => false
       t.integer :item_id, :null => false
 
       t.timestamps
     end
-    add_index :donates, :patron_id
+    add_index :donates, :agent_id
     add_index :donates, :item_id
   end
 end

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

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

data/spec/dummy/db/migrate/{20080905191442_create_patron_types.rb → 20080905191442_create_agent_types.rb}

@@ -1,6 +1,6 @@
-class CreatePatronTypes < ActiveRecord::Migration
+class CreateAgentTypes < ActiveRecord::Migration
   def change
-    create_table :patron_types do |t|
+    create_table :agent_types do |t|
       t.string :name, :null => false
       t.text :display_name
       t.text :note

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

@@ -0,0 +1,22 @@
+class CreateAgentImportFiles < ActiveRecord::Migration
+  def change
+    create_table :agent_import_files do |t|
+      t.integer :parent_id
+      t.string :content_type
+      t.integer :size
+      t.integer :user_id
+      t.text :note
+      t.datetime :executed_at
+      t.string :state
+      t.string :agent_import_file_name
+      t.string :agent_import_content_type
+      t.integer :agent_import_file_size
+      t.datetime :agent_import_updated_at
+
+      t.timestamps
+    end
+    add_index :agent_import_files, :parent_id
+    add_index :agent_import_files, :user_id
+    add_index :agent_import_files, :state
+  end
+end

data/spec/dummy/db/migrate/{20090812151902_create_patron_relationship_types.rb → 20090812151902_create_agent_relationship_types.rb}

@@ -1,6 +1,6 @@
-class CreatePatronRelationshipTypes < ActiveRecord::Migration
+class CreateAgentRelationshipTypes < ActiveRecord::Migration
   def change
-    create_table :patron_relationship_types do |t|
+    create_table :agent_relationship_types do |t|
       t.string :name, :null => false
       t.text :display_name
       t.text :note

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

@@ -1,7 +1,7 @@
 class AddDcndlSchema < ActiveRecord::Migration
   def self.up
     add_column :manifestations, :title_alternative_transcription, :text
-    add_column :patrons, :full_name_alternative_transcription, :text
+    add_column :agents, :full_name_alternative_transcription, :text
     add_column :manifestations, :description, :text
     add_column :manifestations, :abstract, :text
     add_column :manifestations, :available_at, :timestamp
@@ -14,7 +14,7 @@ class AddDcndlSchema < ActiveRecord::Migration
 
   def self.down
     remove_column :manifestations, :title_alternative_transcription
-    remove_column :patrons, :full_name_alternative_transcription
+    remove_column :agents, :full_name_alternative_transcription
     remove_column :manifestations, :description
     remove_column :manifestations, :abstract
     remove_column :manifestations, :available_at

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

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

data/spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb

@@ -0,0 +1,11 @@
+class AddPositionToAgentRelationship < ActiveRecord::Migration
+  def self.up
+    add_column :manifestation_relationships, :position, :integer
+    add_column :agent_relationships, :position, :integer
+  end
+
+  def self.down
+    remove_column :agent_relationships, :position
+    remove_column :manifestation_relationships, :position
+  end
+end

data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb

@@ -0,0 +1,12 @@
+class CreateAgentImportResults < ActiveRecord::Migration
+  def change
+    create_table :agent_import_results do |t|
+      t.integer :agent_import_file_id
+      t.integer :agent_id
+      t.integer :user_id
+      t.text :body
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb

@@ -0,0 +1,11 @@
+class AddBirthDateAndDeathDateToAgent < ActiveRecord::Migration
+  def self.up
+    add_column :agents, :birth_date, :string
+    add_column :agents, :death_date, :string
+  end
+
+  def self.down
+    remove_column :agents, :death_date
+    remove_column :agents, :birth_date
+  end
+end

data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb

@@ -0,0 +1,5 @@
+class AddFingerprintToAgentImportFile < ActiveRecord::Migration
+  def change
+    add_column :agent_import_files, :agent_import_fingerprint, :string
+  end
+end

data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb

@@ -0,0 +1,5 @@
+class AddErrorMessageToAgentImportFile < ActiveRecord::Migration
+  def change
+    add_column :agent_import_files, :error_message, :text
+  end
+end

data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb

@@ -0,0 +1,6 @@
+class AddAgentIdentifierToAgent < ActiveRecord::Migration
+  def change
+    add_column :agents, :agent_identifier, :string
+    add_index :agents, :agent_identifier
+  end
+end

data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb

@@ -0,0 +1,5 @@
+class AddEditModeToAgentImportFile < ActiveRecord::Migration
+  def change
+    add_column :agent_import_files, :edit_mode, :string
+  end
+end

data/spec/dummy/db/schema.rb

@@ -13,6 +13,125 @@
 
 ActiveRecord::Schema.define(:version => 20130509185724) do
 
+  create_table "agent_import_files", :force => true do |t|
+    t.integer  "parent_id"
+    t.string   "content_type"
+    t.integer  "size"
+    t.integer  "user_id"
+    t.text     "note"
+    t.datetime "executed_at"
+    t.string   "state"
+    t.string   "agent_import_file_name"
+    t.string   "agent_import_content_type"
+    t.integer  "agent_import_file_size"
+    t.datetime "agent_import_updated_at"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+    t.string   "agent_import_fingerprint"
+    t.text     "error_message"
+    t.string   "edit_mode"
+  end
+
+  add_index "agent_import_files", ["parent_id"], :name => "index_agent_import_files_on_parent_id"
+  add_index "agent_import_files", ["state"], :name => "index_agent_import_files_on_state"
+  add_index "agent_import_files", ["user_id"], :name => "index_agent_import_files_on_user_id"
+
+  create_table "agent_import_results", :force => true do |t|
+    t.integer  "agent_import_file_id"
+    t.integer  "agent_id"
+    t.integer  "user_id"
+    t.text     "body"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  create_table "agent_relationship_types", :force => true do |t|
+    t.string   "name",         :null => false
+    t.text     "display_name"
+    t.text     "note"
+    t.integer  "position"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "agent_relationships", :force => true do |t|
+    t.integer  "parent_id"
+    t.integer  "child_id"
+    t.integer  "agent_relationship_type_id"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+    t.integer  "position"
+  end
+
+  add_index "agent_relationships", ["child_id"], :name => "index_agent_relationships_on_child_id"
+  add_index "agent_relationships", ["parent_id"], :name => "index_agent_relationships_on_parent_id"
+
+  create_table "agent_types", :force => true do |t|
+    t.string   "name",         :null => false
+    t.text     "display_name"
+    t.text     "note"
+    t.integer  "position"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "agents", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "last_name"
+    t.string   "middle_name"
+    t.string   "first_name"
+    t.string   "last_name_transcription"
+    t.string   "middle_name_transcription"
+    t.string   "first_name_transcription"
+    t.string   "corporate_name"
+    t.string   "corporate_name_transcription"
+    t.string   "full_name"
+    t.text     "full_name_transcription"
+    t.text     "full_name_alternative"
+    t.datetime "created_at",                                         :null => false
+    t.datetime "updated_at",                                         :null => false
+    t.datetime "deleted_at"
+    t.string   "zip_code_1"
+    t.string   "zip_code_2"
+    t.text     "address_1"
+    t.text     "address_2"
+    t.text     "address_1_note"
+    t.text     "address_2_note"
+    t.string   "telephone_number_1"
+    t.string   "telephone_number_2"
+    t.string   "fax_number_1"
+    t.string   "fax_number_2"
+    t.text     "other_designation"
+    t.text     "place"
+    t.string   "postal_code"
+    t.text     "street"
+    t.text     "locality"
+    t.text     "region"
+    t.datetime "date_of_birth"
+    t.datetime "date_of_death"
+    t.integer  "language_id",                         :default => 1, :null => false
+    t.integer  "country_id",                          :default => 1, :null => false
+    t.integer  "agent_type_id",                       :default => 1, :null => false
+    t.integer  "lock_version",                        :default => 0, :null => false
+    t.text     "note"
+    t.integer  "required_role_id",                    :default => 1, :null => false
+    t.integer  "required_score",                      :default => 0, :null => false
+    t.string   "state"
+    t.text     "email"
+    t.text     "url"
+    t.text     "full_name_alternative_transcription"
+    t.string   "birth_date"
+    t.string   "death_date"
+    t.string   "agent_identifier"
+  end
+
+  add_index "agents", ["agent_identifier"], :name => "index_agents_on_agent_identifier"
+  add_index "agents", ["country_id"], :name => "index_agents_on_country_id"
+  add_index "agents", ["full_name"], :name => "index_agents_on_full_name"
+  add_index "agents", ["language_id"], :name => "index_agents_on_language_id"
+  add_index "agents", ["required_role_id"], :name => "index_agents_on_required_role_id"
+  add_index "agents", ["user_id"], :name => "index_agents_on_user_id", :unique => true
+
   create_table "carrier_types", :force => true do |t|
     t.string   "name",         :null => false
     t.text     "display_name"
@@ -82,7 +201,7 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
   end
 
   create_table "creates", :force => true do |t|
-    t.integer  "patron_id",      :null => false
+    t.integer  "agent_id",       :null => false
     t.integer  "work_id",        :null => false
     t.integer  "position"
     t.datetime "created_at",     :null => false
@@ -90,18 +209,18 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
     t.integer  "create_type_id"
   end
 
-  add_index "creates", ["patron_id"], :name => "index_creates_on_patron_id"
+  add_index "creates", ["agent_id"], :name => "index_creates_on_agent_id"
   add_index "creates", ["work_id"], :name => "index_creates_on_work_id"
 
   create_table "donates", :force => true do |t|
-    t.integer  "patron_id",  :null => false
+    t.integer  "agent_id",   :null => false
     t.integer  "item_id",    :null => false
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end
 
+  add_index "donates", ["agent_id"], :name => "index_donates_on_agent_id"
   add_index "donates", ["item_id"], :name => "index_donates_on_item_id"
-  add_index "donates", ["patron_id"], :name => "index_donates_on_patron_id"
 
   create_table "exemplifies", :force => true do |t|
     t.integer  "manifestation_id", :null => false
@@ -326,134 +445,15 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
   end
 
   create_table "owns", :force => true do |t|
-    t.integer  "patron_id",  :null => false
+    t.integer  "agent_id",   :null => false
     t.integer  "item_id",    :null => false
     t.integer  "position"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end
 
+  add_index "owns", ["agent_id"], :name => "index_owns_on_agent_id"
   add_index "owns", ["item_id"], :name => "index_owns_on_item_id"
-  add_index "owns", ["patron_id"], :name => "index_owns_on_patron_id"
-
-  create_table "patron_import_files", :force => true do |t|
-    t.integer  "parent_id"
-    t.string   "content_type"
-    t.integer  "size"
-    t.integer  "user_id"
-    t.text     "note"
-    t.datetime "executed_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.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
-    t.string   "patron_import_fingerprint"
-    t.text     "error_message"
-    t.string   "edit_mode"
-  end
-
-  add_index "patron_import_files", ["parent_id"], :name => "index_patron_import_files_on_parent_id"
-  add_index "patron_import_files", ["state"], :name => "index_patron_import_files_on_state"
-  add_index "patron_import_files", ["user_id"], :name => "index_patron_import_files_on_user_id"
-
-  create_table "patron_import_results", :force => true do |t|
-    t.integer  "patron_import_file_id"
-    t.integer  "patron_id"
-    t.integer  "user_id"
-    t.text     "body"
-    t.datetime "created_at",            :null => false
-    t.datetime "updated_at",            :null => false
-  end
-
-  create_table "patron_relationship_types", :force => true do |t|
-    t.string   "name",         :null => false
-    t.text     "display_name"
-    t.text     "note"
-    t.integer  "position"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  create_table "patron_relationships", :force => true do |t|
-    t.integer  "parent_id"
-    t.integer  "child_id"
-    t.integer  "patron_relationship_type_id"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-    t.integer  "position"
-  end
-
-  add_index "patron_relationships", ["child_id"], :name => "index_patron_relationships_on_child_id"
-  add_index "patron_relationships", ["parent_id"], :name => "index_patron_relationships_on_parent_id"
-
-  create_table "patron_types", :force => true do |t|
-    t.string   "name",         :null => false
-    t.text     "display_name"
-    t.text     "note"
-    t.integer  "position"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  create_table "patrons", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "last_name"
-    t.string   "middle_name"
-    t.string   "first_name"
-    t.string   "last_name_transcription"
-    t.string   "middle_name_transcription"
-    t.string   "first_name_transcription"
-    t.string   "corporate_name"
-    t.string   "corporate_name_transcription"
-    t.string   "full_name"
-    t.text     "full_name_transcription"
-    t.text     "full_name_alternative"
-    t.datetime "created_at",                                         :null => false
-    t.datetime "updated_at",                                         :null => false
-    t.datetime "deleted_at"
-    t.string   "zip_code_1"
-    t.string   "zip_code_2"
-    t.text     "address_1"
-    t.text     "address_2"
-    t.text     "address_1_note"
-    t.text     "address_2_note"
-    t.string   "telephone_number_1"
-    t.string   "telephone_number_2"
-    t.string   "fax_number_1"
-    t.string   "fax_number_2"
-    t.text     "other_designation"
-    t.text     "place"
-    t.string   "postal_code"
-    t.text     "street"
-    t.text     "locality"
-    t.text     "region"
-    t.datetime "date_of_birth"
-    t.datetime "date_of_death"
-    t.integer  "language_id",                         :default => 1, :null => false
-    t.integer  "country_id",                          :default => 1, :null => false
-    t.integer  "patron_type_id",                      :default => 1, :null => false
-    t.integer  "lock_version",                        :default => 0, :null => false
-    t.text     "note"
-    t.integer  "required_role_id",                    :default => 1, :null => false
-    t.integer  "required_score",                      :default => 0, :null => false
-    t.string   "state"
-    t.text     "email"
-    t.text     "url"
-    t.text     "full_name_alternative_transcription"
-    t.string   "birth_date"
-    t.string   "death_date"
-    t.string   "patron_identifier"
-  end
-
-  add_index "patrons", ["country_id"], :name => "index_patrons_on_country_id"
-  add_index "patrons", ["full_name"], :name => "index_patrons_on_full_name"
-  add_index "patrons", ["language_id"], :name => "index_patrons_on_language_id"
-  add_index "patrons", ["patron_identifier"], :name => "index_patrons_on_patron_identifier"
-  add_index "patrons", ["required_role_id"], :name => "index_patrons_on_required_role_id"
-  add_index "patrons", ["user_id"], :name => "index_patrons_on_user_id", :unique => true
 
   create_table "picture_files", :force => true do |t|
     t.integer  "picture_attachable_id"
@@ -484,7 +484,7 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
   end
 
   create_table "produces", :force => true do |t|
-    t.integer  "patron_id",        :null => false
+    t.integer  "agent_id",         :null => false
     t.integer  "manifestation_id", :null => false
     t.integer  "position"
     t.datetime "created_at",       :null => false
@@ -492,8 +492,8 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
     t.integer  "produce_type_id"
   end
 
+  add_index "produces", ["agent_id"], :name => "index_produces_on_agent_id"
   add_index "produces", ["manifestation_id"], :name => "index_produces_on_manifestation_id"
-  add_index "produces", ["patron_id"], :name => "index_produces_on_patron_id"
 
   create_table "realize_types", :force => true do |t|
     t.string   "name"
@@ -505,7 +505,7 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
   end
 
   create_table "realizes", :force => true do |t|
-    t.integer  "patron_id",       :null => false
+    t.integer  "agent_id",        :null => false
     t.integer  "expression_id",   :null => false
     t.integer  "position"
     t.datetime "created_at",      :null => false
@@ -513,8 +513,8 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
     t.integer  "realize_type_id"
   end
 
+  add_index "realizes", ["agent_id"], :name => "index_realizes_on_agent_id"
   add_index "realizes", ["expression_id"], :name => "index_realizes_on_expression_id"
-  add_index "realizes", ["patron_id"], :name => "index_realizes_on_patron_id"
 
   create_table "resource_import_files", :force => true do |t|
     t.integer  "parent_id"

data/spec/fixtures/{patron_types.yml → agent_types.yml}

@@ -1,19 +1,19 @@
 --- 
-patron_type_00001:
+agent_type_00001:
   id: 1
   name: Person
   display_name: Person
   note: 
   position: 1
 
-patron_type_00002:
+agent_type_00002:
   id: 2
   name: CorporateBody
   display_name: CorporateBody
   note: 
   position: 2
 
-patron_type_00003:
+agent_type_00003:
   id: 3
   name: Conference
   display_name: Conference
@@ -22,7 +22,7 @@ patron_type_00003:
 
 # == Schema Information
 #
-# Table name: patron_types
+# Table name: agent_types
 #
 #  id           :integer         not null, primary key
 #  name         :string(255)     not null

data/spec/models/ndl_book_spec.rb

@@ -28,7 +28,7 @@ describe NdlBook do
       manifestation.language.name.should eq "Japanese"
       manifestation.creators.first.full_name.should eq '秋葉, 拓哉'
       manifestation.creators.first.full_name_transcription.should eq 'アキバ, タクヤ'
-      manifestation.creators.first.patron_identifier.should eq 'http://id.ndl.go.jp/auth/entity/01208840'
+      manifestation.creators.first.agent_identifier.should eq 'http://id.ndl.go.jp/auth/entity/01208840'
       manifestation.price.should eq 3280
       manifestation.start_page.should eq 1
       manifestation.end_page.should eq 315

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_ndl
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre25
+  version: 0.1.0.pre26
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-01 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
 - !ruby/object:Gem::Dependency
   name: enju_question
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre19
-  type: :runtime
+        version: 0.1.0.pre20
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre19
+        version: 0.1.0.pre20
 description: NDL WebAPI wrapper for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -266,8 +266,7 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
-- spec/dummy/db/migrate/001_create_patrons.rb
+- spec/dummy/db/migrate/001_create_agents.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
 - spec/dummy/db/migrate/012_create_owns.rb
@@ -286,11 +285,11 @@ files:
 - spec/dummy/db/migrate/20080606052544_create_work_has_subjects.rb
 - spec/dummy/db/migrate/20080830154109_create_realizes.rb
 - spec/dummy/db/migrate/20080830172106_create_exemplifies.rb
-- spec/dummy/db/migrate/20080905191442_create_patron_types.rb
+- spec/dummy/db/migrate/20080905191442_create_agent_types.rb
 - spec/dummy/db/migrate/20081025083323_create_countries.rb
 - spec/dummy/db/migrate/20081025083905_create_languages.rb
 - spec/dummy/db/migrate/20081027150907_create_picture_files.rb
-- spec/dummy/db/migrate/20081028083142_create_patron_import_files.rb
+- spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb
 - spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb
 - spec/dummy/db/migrate/20090208044541_create_subject_heading_type_has_subjects.rb
 - spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb
@@ -298,7 +297,7 @@ files:
 - spec/dummy/db/migrate/20090719201843_create_extents.rb
 - spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb
 - spec/dummy/db/migrate/20090720091429_create_content_types.rb
-- spec/dummy/db/migrate/20090812151902_create_patron_relationship_types.rb
+- spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb
 - spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb
 - spec/dummy/db/migrate/20091025080447_create_licenses.rb
 - spec/dummy/db/migrate/20091202124834_create_versions.rb
@@ -307,14 +306,14 @@ files:
 - spec/dummy/db/migrate/20100223121519_rename_series_statement_title_to_original_title.rb
 - spec/dummy/db/migrate/20100321235924_add_series_statement_identifier_to_series_statement.rb
 - spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb
-- spec/dummy/db/migrate/20100606073747_create_patron_relationships.rb
+- spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb
 - spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb
-- spec/dummy/db/migrate/20100814091104_add_position_to_patron_relationship.rb
+- spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb
 - spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb
-- spec/dummy/db/migrate/20100925074559_create_patron_import_results.rb
+- spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb
 - spec/dummy/db/migrate/20101212070145_add_acquired_at_to_item.rb
 - spec/dummy/db/migrate/20110301035123_add_pub_date_to_manifestation.rb
-- spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_patron.rb
+- spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb
 - spec/dummy/db/migrate/20110425133109_add_issn_to_series_statement.rb
 - spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb
 - spec/dummy/db/migrate/20110618091240_add_periodical_to_series_statement.rb
@@ -345,15 +344,14 @@ files:
 - spec/dummy/db/migrate/20120413072700_add_picture_meta_to_picture_file.rb
 - spec/dummy/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb
 - spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb
-- spec/dummy/db/migrate/20120413161403_add_fingerprint_to_patron_import_file.rb
+- spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb
 - spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb
-- spec/dummy/db/migrate/20120413170720_add_error_message_to_patron_import_file.rb
+- spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb
 - spec/dummy/db/migrate/20120415060308_rename_resource_import_file_imported_at_to_executed_at.rb
-- spec/dummy/db/migrate/20120415060323_rename_patron_import_file_imported_at_to_executed_at.rb
 - spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb
 - spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb
-- spec/dummy/db/migrate/20120511072422_add_patron_identifier_to_patron.rb
-- spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
+- spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb
+- spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb
 - spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb
 - spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb
 - spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb
@@ -386,13 +384,13 @@ files:
 - spec/dummy/test/unit/produce_test.rb
 - spec/dummy/test/unit/role_test.rb
 - spec/dummy/test/unit/user_test.rb
+- spec/fixtures/agent_types.yml
 - spec/fixtures/carrier_types.yml
 - spec/fixtures/classification_types.yml
 - spec/fixtures/content_types.yml
 - spec/fixtures/countries.yml
 - spec/fixtures/identifier_types.yml
 - spec/fixtures/languages.yml
-- spec/fixtures/patron_types.yml
 - spec/fixtures/roles.yml
 - spec/fixtures/subject_heading_types.yml
 - spec/fixtures/subject_types.yml
@@ -425,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: enju_ndl plugin
@@ -480,8 +478,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
-- spec/dummy/db/migrate/001_create_patrons.rb
+- spec/dummy/db/migrate/001_create_agents.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
 - spec/dummy/db/migrate/012_create_owns.rb
@@ -500,11 +497,11 @@ test_files:
 - spec/dummy/db/migrate/20080606052544_create_work_has_subjects.rb
 - spec/dummy/db/migrate/20080830154109_create_realizes.rb
 - spec/dummy/db/migrate/20080830172106_create_exemplifies.rb
-- spec/dummy/db/migrate/20080905191442_create_patron_types.rb
+- spec/dummy/db/migrate/20080905191442_create_agent_types.rb
 - spec/dummy/db/migrate/20081025083323_create_countries.rb
 - spec/dummy/db/migrate/20081025083905_create_languages.rb
 - spec/dummy/db/migrate/20081027150907_create_picture_files.rb
-- spec/dummy/db/migrate/20081028083142_create_patron_import_files.rb
+- spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb
 - spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb
 - spec/dummy/db/migrate/20090208044541_create_subject_heading_type_has_subjects.rb
 - spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb
@@ -512,7 +509,7 @@ test_files:
 - spec/dummy/db/migrate/20090719201843_create_extents.rb
 - spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb
 - spec/dummy/db/migrate/20090720091429_create_content_types.rb
-- spec/dummy/db/migrate/20090812151902_create_patron_relationship_types.rb
+- spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb
 - spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb
 - spec/dummy/db/migrate/20091025080447_create_licenses.rb
 - spec/dummy/db/migrate/20091202124834_create_versions.rb
@@ -521,14 +518,14 @@ test_files:
 - spec/dummy/db/migrate/20100223121519_rename_series_statement_title_to_original_title.rb
 - spec/dummy/db/migrate/20100321235924_add_series_statement_identifier_to_series_statement.rb
 - spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb
-- spec/dummy/db/migrate/20100606073747_create_patron_relationships.rb
+- spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb
 - spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb
-- spec/dummy/db/migrate/20100814091104_add_position_to_patron_relationship.rb
+- spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb
 - spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb
-- spec/dummy/db/migrate/20100925074559_create_patron_import_results.rb
+- spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb
 - spec/dummy/db/migrate/20101212070145_add_acquired_at_to_item.rb
 - spec/dummy/db/migrate/20110301035123_add_pub_date_to_manifestation.rb
-- spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_patron.rb
+- spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb
 - spec/dummy/db/migrate/20110425133109_add_issn_to_series_statement.rb
 - spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb
 - spec/dummy/db/migrate/20110618091240_add_periodical_to_series_statement.rb
@@ -559,15 +556,14 @@ test_files:
 - spec/dummy/db/migrate/20120413072700_add_picture_meta_to_picture_file.rb
 - spec/dummy/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb
 - spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb
-- spec/dummy/db/migrate/20120413161403_add_fingerprint_to_patron_import_file.rb
+- spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb
 - spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb
-- spec/dummy/db/migrate/20120413170720_add_error_message_to_patron_import_file.rb
+- spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb
 - spec/dummy/db/migrate/20120415060308_rename_resource_import_file_imported_at_to_executed_at.rb
-- spec/dummy/db/migrate/20120415060323_rename_patron_import_file_imported_at_to_executed_at.rb
 - spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb
 - spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb
-- spec/dummy/db/migrate/20120511072422_add_patron_identifier_to_patron.rb
-- spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
+- spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb
+- spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb
 - spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb
 - spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb
 - spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb
@@ -600,13 +596,13 @@ test_files:
 - spec/dummy/test/unit/produce_test.rb
 - spec/dummy/test/unit/role_test.rb
 - spec/dummy/test/unit/user_test.rb
+- spec/fixtures/agent_types.yml
 - spec/fixtures/carrier_types.yml
 - spec/fixtures/classification_types.yml
 - spec/fixtures/content_types.yml
 - spec/fixtures/countries.yml
 - spec/fixtures/identifier_types.yml
 - spec/fixtures/languages.yml
-- spec/fixtures/patron_types.yml
 - spec/fixtures/roles.yml
 - spec/fixtures/subject_heading_types.yml
 - spec/fixtures/subject_types.yml

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

@@ -1,22 +0,0 @@
-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/20100606073747_create_patron_relationships.rb

@@ -1,13 +0,0 @@
-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

data/spec/dummy/db/migrate/20100814091104_add_position_to_patron_relationship.rb

@@ -1,11 +0,0 @@
-class AddPositionToPatronRelationship < ActiveRecord::Migration
-  def self.up
-    add_column :manifestation_relationships, :position, :integer
-    add_column :patron_relationships, :position, :integer
-  end
-
-  def self.down
-    remove_column :patron_relationships, :position
-    remove_column :manifestation_relationships, :position
-  end
-end

data/spec/dummy/db/migrate/20100925074559_create_patron_import_results.rb

@@ -1,12 +0,0 @@
-class CreatePatronImportResults < ActiveRecord::Migration
-  def change
-    create_table :patron_import_results do |t|
-      t.integer :patron_import_file_id
-      t.integer :patron_id
-      t.integer :user_id
-      t.text :body
-
-      t.timestamps
-    end
-  end
-end

data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_patron.rb

@@ -1,11 +0,0 @@
-class AddBirthDateAndDeathDateToPatron < ActiveRecord::Migration
-  def self.up
-    add_column :patrons, :birth_date, :string
-    add_column :patrons, :death_date, :string
-  end
-
-  def self.down
-    remove_column :patrons, :death_date
-    remove_column :patrons, :birth_date
-  end
-end

data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_patron_import_file.rb

@@ -1,5 +0,0 @@
-class AddFingerprintToPatronImportFile < ActiveRecord::Migration
-  def change
-    add_column :patron_import_files, :patron_import_fingerprint, :string
-  end
-end

data/spec/dummy/db/migrate/20120413170720_add_error_message_to_patron_import_file.rb

@@ -1,5 +0,0 @@
-class AddErrorMessageToPatronImportFile < ActiveRecord::Migration
-  def change
-    add_column :patron_import_files, :error_message, :text
-  end
-end

data/spec/dummy/db/migrate/20120415060323_rename_patron_import_file_imported_at_to_executed_at.rb

@@ -1,9 +0,0 @@
-class RenamePatronImportFileImportedAtToExecutedAt < ActiveRecord::Migration
-  def up
-    rename_column :patron_import_files, :imported_at, :executed_at
-  end
-
-  def down
-    rename_column :patron_import_files, :executed_at, :imported_at
-  end
-end

data/spec/dummy/db/migrate/20120511072422_add_patron_identifier_to_patron.rb

@@ -1,6 +0,0 @@
-class AddPatronIdentifierToPatron < ActiveRecord::Migration
-  def change
-    add_column :patrons, :patron_identifier, :string
-    add_index :patrons, :patron_identifier
-  end
-end

data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb

@@ -1,5 +0,0 @@
-class AddEditModeToPatronImportFile < ActiveRecord::Migration
-  def change
-    add_column :patron_import_files, :edit_mode, :string
-  end
-end