enju_flower 0.1.0.pre11 → 0.1.0.pre12

data/spec/factories/{patron.rb → agent.rb}

@@ -1,13 +1,13 @@
 FactoryGirl.define do
-  factory :patron do |f|
+  factory :agent do |f|
     f.sequence(:full_name){|n| "full_name_#{n}"}
-    f.patron_type_id{PatronType.find_by_name('Person').id}
+    f.agent_type_id{AgentType.find_by_name('Person').id}
     f.country_id{Country.first.id}
     f.language_id{Language.first.id}
   end
 end
 
 FactoryGirl.define do
-  factory :invalid_patron, :class => Patron do |f|
+  factory :invalid_agent, :class => Agent do |f|
   end
 end

data/spec/factories/agent_relationship.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :agent_relationship do |f|
+    f.parent_id{FactoryGirl.create(:agent).id}
+    f.child_id{FactoryGirl.create(:agent).id}
+  end
+end

data/spec/factories/agent_relationship_type.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :agent_relationship_type do |f|
+    f.sequence(:name){|n| "agent_relationship_type_#{n}"}
+  end
+end

data/spec/factories/agent_type.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :agent_type do |f|
+    f.sequence(:name){|n| "agent_type_#{n}"}
+  end
+end

data/spec/factories/create.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :create do |f|
     f.work_id{FactoryGirl.create(:manifestation).id}
-    f.patron_id{FactoryGirl.create(:patron).id}
+    f.agent_id{FactoryGirl.create(:agent).id}
   end
 end

data/spec/factories/donate.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :donate do |f|
     f.item_id{FactoryGirl.create(:item).id}
-    f.patron_id{FactoryGirl.create(:patron).id}
+    f.agent_id{FactoryGirl.create(:agent).id}
   end
 end

data/spec/factories/library.rb

@@ -0,0 +1,13 @@
+FactoryGirl.define do
+  factory :library do |f|
+    f.sequence(:name){|n| "library#{n}"}
+    f.sequence(:short_display_name){|n| "library_#{n}"}
+    f.library_group_id{LibraryGroup.first.id}
+  end
+end
+
+FactoryGirl.define do
+  factory :invalid_library, :class => Library do |f|
+    f.library_group_id{LibraryGroup.first.id}
+  end
+end

data/spec/factories/own.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :own do |f|
     f.item_id{FactoryGirl.create(:item).id}
-    f.patron_id{FactoryGirl.create(:patron).id}
+    f.agent_id{FactoryGirl.create(:agent).id}
   end
 end

data/spec/factories/produce.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :produce do |f|
     f.manifestation_id{FactoryGirl.create(:manifestation).id}
-    f.patron_id{FactoryGirl.create(:patron).id}
+    f.agent_id{FactoryGirl.create(:agent).id}
   end
 end

data/spec/factories/realize.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :realize do |f|
     f.expression_id{FactoryGirl.create(:manifestation).id}
-    f.patron_id{FactoryGirl.create(:patron).id}
+    f.agent_id{FactoryGirl.create(:agent).id}
   end
 end

data/spec/factories/user.rb

@@ -2,34 +2,56 @@ FactoryGirl.define do
   factory :admin, :class => User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}
-    f.role {Role.find_by_name('Administrator')}
+    f.email_confirmation{|u| u.email}
+    f.library_id{FactoryGirl.create(:library).id}
     f.password 'adminpassword'
     f.password_confirmation 'adminpassword'
-    f.user_group {UserGroup.first}
-    f.required_role {Role.find_by_name('User')}
-    f.sequence(:user_number){|n| "user_number_#{n}"}
+    f.user_group_id{UserGroup.where(:name => 'User').first.id}
+    f.required_role_id{Role.find_by_name('User').id}
+    f.locale 'ja'
+    f.after(:create) do |user|
+      user_has_role = UserHasRole.new
+      user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('Administrator').id})
+      user_has_role.save
+      user.reload
+    end
   end
 
   factory :librarian, :class => User do |f|
     f.sequence(:username){|n| "librarian_#{n}"}
     f.sequence(:email){|n| "librarian_#{n}@example.jp"}
-    f.role {Role.find_by_name('Librarian')}
+    f.email_confirmation{|u| u.email}
+    f.library_id{FactoryGirl.create(:library).id}
     f.password 'librarianpassword'
     f.password_confirmation 'librarianpassword'
-    f.user_group {UserGroup.first}
-    f.required_role {Role.find_by_name('User')}
-    f.sequence(:user_number){|n| "user_number_#{n}"}
+    f.user_group_id{UserGroup.where(:name => 'User').first.id}
+    f.required_role_id{Role.find_by_name('User').id}
+    f.locale 'ja'
+    f.after(:create) do |user|
+      user_has_role = UserHasRole.new
+      user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('Librarian').id})
+      user_has_role.save
+      user.reload
+    end
   end
 
   factory :user, :class => User do |f|
     f.sequence(:username){|n| "user_#{n}"}
     f.sequence(:email){|n| "user_#{n}@example.jp"}
-    f.role {Role.find_by_name('User')}
+    f.email_confirmation{|u| u.email}
+    f.library_id{FactoryGirl.create(:library).id}
     f.password 'userpassword'
     f.password_confirmation 'userpassword'
-    f.user_group {UserGroup.first}
-    f.required_role {Role.find_by_name('User')}
+    f.user_group_id{UserGroup.where(:name => '(not specified)').first.id}
+    f.required_role_id{Role.find_by_name('User').id}
+    f.locale 'ja'
     f.sequence(:user_number){|n| "user_number_#{n}"}
+    f.after(:create) do |user|
+      user_has_role = UserHasRole.new
+      user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('User').id})
+      user_has_role.save
+      user.reload
+    end
   end
 
   factory :invalid_user, :class => User do |f|

data/spec/fixtures/{patron_relationship_types.yml → agent_relationship_types.yml}

@@ -1,18 +1,18 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 
-patron_relationship_type_00001:
+agent_relationship_type_00001:
   id: 1
   name: See also
   display_name: See also
   note: 
   position: 1
-patron_relationship_type_00002:
+agent_relationship_type_00002:
   id: 2
   name: Member
   display_name: Member
   note: 
   position: 2
-patron_relationship_type_00003:
+agent_relationship_type_00003:
   id: 3
   name: Child
   display_name: Child
@@ -21,7 +21,7 @@ patron_relationship_type_00003:
 
 # == Schema Information
 #
-# Table name: patron_relationship_types
+# Table name: agent_relationship_types
 #
 #  id           :integer          not null, primary key
 #  name         :string(255)      not null

data/spec/fixtures/{patron_relationships.yml → agent_relationships.yml}

@@ -3,21 +3,21 @@
 one:
   parent_id: 1
   child_id: 2
-  patron_relationship_type_id: 1
+  agent_relationship_type_id: 1
 
 two:
   parent_id: 2
   child_id: 3
-  patron_relationship_type_id: 1
+  agent_relationship_type_id: 1
 
 # == Schema Information
 #
-# Table name: patron_relationships
+# Table name: agent_relationships
 #
 #  id                          :integer          not null, primary key
 #  parent_id                   :integer
 #  child_id                    :integer
-#  patron_relationship_type_id :integer
+#  agent_relationship_type_id :integer
 #  created_at                  :datetime         not null
 #  updated_at                  :datetime         not null
 #  position                    :integer

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/fixtures/{patrons.yml → agents.yml}

@@ -1,5 +1,5 @@
 --- 
-patron_00001: 
+agent_00001: 
   place: ""
   last_name: Administrator
   first_name: 
@@ -12,11 +12,11 @@ patron_00001:
   address_1: 
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
   created_at: 2007-11-19 17:06:06.507237 +09:00
   user_id: 1
-patron_00002: 
+agent_00002: 
   place: ""
   last_name: Librarian1
   first_name: 
@@ -29,11 +29,11 @@ patron_00002:
   address_1: 
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 4
   created_at: 2007-11-19 17:06:07.724517 +09:00
   user_id: 2
-patron_00003: 
+agent_00003: 
   place: 
   last_name: Kosuke
   first_name: Tanabe
@@ -46,11 +46,11 @@ patron_00003:
   address_1: 
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 3
   created_at: 2007-12-04 16:25:01.523618 +09:00
   user_id: 3
-patron_00004: 
+agent_00004: 
   place: 
   last_name: Librarian2
   first_name: 
@@ -63,11 +63,11 @@ patron_00004:
   address_1: 
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
   created_at: 2007-12-04 16:25:01.785027 +09:00
   user_id: 4
-patron_00005: 
+agent_00005: 
   place: ""
   last_name: User2
   first_name: 
@@ -80,15 +80,15 @@ patron_00005:
   address_1: 
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 2
   created_at: 2007-11-19 17:24:50.153417 +09:00
   user_id: 5
-patron_00006: 
+agent_00006: 
   place: ""
-  last_name: New patron 1
+  last_name: New agent 1
   first_name: 
-  full_name: New patron 1
+  full_name: New agent 1
   updated_at: 2007-11-21 22:02:35.579396 +09:00
   other_designation: ""
   id: 6
@@ -97,14 +97,14 @@ patron_00006:
   address_1: 
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
   created_at: 2007-11-19 17:24:50.153417 +09:00
-patron_00007: 
+agent_00007: 
   place: ""
-  last_name: New patron 2
+  last_name: New agent 2
   first_name: 
-  full_name: New patron 2
+  full_name: New agent 2
   updated_at: 2007-11-21 22:02:35.579396 +09:00
   other_designation: ""
   id: 7
@@ -113,14 +113,14 @@ patron_00007:
   address_1: 
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
   created_at: 2007-11-19 17:24:50.153417 +09:00
-patron_00008: 
+agent_00008: 
   place: ""
-  last_name: New patron 3
+  last_name: New agent 3
   first_name: 
-  full_name: New patron 3
+  full_name: New agent 3
   updated_at: 2007-11-21 22:02:35.579396 +09:00
   other_designation: ""
   id: 8
@@ -129,14 +129,14 @@ patron_00008:
   address_1: 
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
   created_at: 2007-11-19 17:24:50.153417 +09:00
-patron_00009: 
+agent_00009: 
   place: ""
-  last_name: New patron 4
+  last_name: New agent 4
   first_name: 
-  full_name:  New patron 4
+  full_name:  New agent 4
   updated_at: 2007-11-21 22:02:35.579396 +09:00
   other_designation: ""
   id: 9
@@ -145,14 +145,14 @@ patron_00009:
   address_1: 
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
   created_at: 2007-11-19 17:24:50.153417 +09:00
-patron_00010: 
+agent_00010: 
   place: ""
-  last_name: New patron 5
+  last_name: New agent 5
   first_name: 
-  full_name: New patron 5
+  full_name: New agent 5
   updated_at: 2007-11-21 22:02:35.579396 +09:00
   other_designation: ""
   id: 10
@@ -161,10 +161,10 @@ patron_00010:
   address_1: 
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
   created_at: 2007-11-19 17:24:50.153417 +09:00
-patron_00011: 
+agent_00011: 
   place: ""
   last_name: User3
   first_name: 
@@ -177,11 +177,11 @@ patron_00011:
   address_1: 
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
   created_at: 2007-11-19 17:24:50.153417 +09:00
   user_id: 6
-patron_00101:
+agent_00101:
   place: ""
   last_name: テスト名字
   first_name: テスト名前
@@ -194,10 +194,10 @@ patron_00101:
   address_1:
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
   created_at: 2010-03-03 17:00:00.579396 +09:00
-patron_00102:
+agent_00102:
   place: ""
   last_name:
   first_name:
@@ -210,10 +210,10 @@ patron_00102:
   address_1:
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
   created_at: 2010-03-03 17:00:00.579396 +09:00
-patron_00103:
+agent_00103:
   place: ""
   last_name:
   first_name:
@@ -226,10 +226,10 @@ patron_00103:
   address_1:
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
   created_at: 2010-03-16 19:00:00.579396 +09:00
-patron_00104:
+agent_00104:
   place: ""
   last_name:
   first_name:
@@ -242,10 +242,10 @@ patron_00104:
   address_1:
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
   created_at: 2010-03-16 19:00:00.579396 +09:00
-patron_00201:
+agent_00201:
   place: ""
   last_name:
   first_name:
@@ -258,10 +258,10 @@ patron_00201:
   address_1:
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
   created_at: 2010-03-15 17:00:00.579396 +09:00
-patron_00202:
+agent_00202:
   place: ""
   last_name:
   first_name:
@@ -274,13 +274,13 @@ patron_00202:
   address_1:
   language_id: 1
   country_id: 1
-  patron_type_id: 1
+  agent_type_id: 1
   required_role_id: 1
   created_at: 2010-03-15 17:00:00.579396 +09:00
 
 # == Schema Information
 #
-# Table name: patrons
+# Table name: agents
 #
 #  id                                  :integer          not null, primary key
 #  user_id                             :integer
@@ -318,7 +318,7 @@ patron_00202:
 #  date_of_death                       :datetime
 #  language_id                         :integer          default(1), not null
 #  country_id                          :integer          default(1), not null
-#  patron_type_id                      :integer          default(1), not null
+#  agent_type_id                      :integer          default(1), not null
 #  lock_version                        :integer          default(0), not null
 #  note                                :text
 #  required_role_id                    :integer          default(1), not null
@@ -329,6 +329,6 @@ patron_00202:
 #  full_name_alternative_transcription :text
 #  birth_date                          :string(255)
 #  death_date                          :string(255)
-#  patron_identifier                   :string(255)
+#  agent_identifier                   :string(255)
 #
 

data/spec/fixtures/creates.yml

@@ -1,49 +1,49 @@
 --- 
 create_00001: 
   updated_at: 2007-12-13 19:56:07.002082 +09:00
-  patron_id: 1
+  agent_id: 1
   id: 1
   work_id: 1
   position: 1
   created_at: 2007-12-13 19:56:07.002082 +09:00
 create_00002: 
   updated_at: 2007-12-13 19:56:48.538796 +09:00
-  patron_id: 1
+  agent_id: 1
   id: 2
   work_id: 2
   position: 1
   created_at: 2007-12-13 19:56:48.538796 +09:00
 create_00003: 
   updated_at: 2007-12-13 19:56:48.538796 +09:00
-  patron_id: 2
+  agent_id: 2
   id: 3
   work_id: 1
   position: 2
   created_at: 2007-12-13 19:56:48.538796 +09:00
 create_00101:
   updated_at: 2010-03-03 17:00:00.538796 +09:00
-  patron_id: 101
+  agent_id: 101
   id: 101
   work_id: 101
   position: 2
   created_at: 2010-03-03 17:00:00.538796 +09:00
 create_00102:
   updated_at: 2010-03-16 19:00:00.538796 +09:00
-  patron_id: 103
+  agent_id: 103
   id: 102
   work_id: 102
   position: 2
   created_at: 2010-03-16 19:00:00.538796 +09:00
 create_00103:
   updated_at: 2010-03-16 19:00:00.538796 +09:00
-  patron_id: 103
+  agent_id: 103
   id: 103
   work_id: 103
   position: 2
   created_at: 2010-03-16 19:00:00.538796 +09:00
 create_00104:
   updated_at: 2010-03-16 19:00:00.538796 +09:00
-  patron_id: 103
+  agent_id: 103
   id: 104
   work_id: 104
   position: 2
@@ -54,7 +54,7 @@ create_00104:
 # Table name: creates
 #
 #  id             :integer          not null, primary key
-#  patron_id      :integer          not null
+#  agent_id      :integer          not null
 #  work_id        :integer          not null
 #  position       :integer
 #  created_at     :datetime         not null

data/spec/fixtures/donates.yml

@@ -2,19 +2,19 @@
 donate_00001: 
   item_id: 5
   updated_at: 2008-02-10 13:24:14.793431 +09:00
-  patron_id: 1
+  agent_id: 1
   id: 1
   created_at: 2008-02-10 13:24:14.793431 +09:00
 donate_00002: 
   item_id: 6
   updated_at: 2008-02-10 13:24:14.793431 +09:00
-  patron_id: 1
+  agent_id: 1
   id: 2
   created_at: 2008-02-10 13:24:14.793431 +09:00
 donate_00003: 
   item_id: 7
   updated_at: 2008-02-10 13:24:14.793431 +09:00
-  patron_id: 2
+  agent_id: 2
   id: 3
   created_at: 2008-02-10 13:24:14.793431 +09:00
 
@@ -23,7 +23,7 @@ donate_00003:
 # Table name: donates
 #
 #  id         :integer          not null, primary key
-#  patron_id  :integer          not null
+#  agent_id  :integer          not null
 #  item_id    :integer          not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null

data/spec/fixtures/owns.yml

@@ -2,13 +2,13 @@
 own_00001: 
   item_id: 1
   updated_at: 2007-11-21 21:22:57.654360 +09:00
-  patron_id: 1
+  agent_id: 1
   id: 1
   created_at: 2007-11-21 21:22:57.654360 +09:00
 own_00002: 
   item_id: 2
   updated_at: 2007-11-21 21:22:13.685287 +09:00
-  patron_id: 2
+  agent_id: 2
   id: 2
   created_at: 2007-11-21 21:22:13.685287 +09:00
 
@@ -17,7 +17,7 @@ own_00002:
 # Table name: owns
 #
 #  id         :integer          not null, primary key
-#  patron_id  :integer          not null
+#  agent_id  :integer          not null
 #  item_id    :integer          not null
 #  position   :integer
 #  created_at :datetime         not null

data/spec/fixtures/picture_files.yml

@@ -35,7 +35,7 @@ picture_file_00004:
   picture_file_size: 7028
   id: 4
   picture_file_name: overlay_spinner_geometry.gif
-  picture_attachable_type: Patron
+  picture_attachable_type: Agent
   picture_attachable_id: 1
   created_at: 2007-12-22 15:06:30.464930 +09:00
   position: 4