enju_seed 0.3.0.beta.2 → 0.3.0.beta.3

data/db/migrate/20140811031145_add_expired_at_to_profile.rb

@@ -1,4 +1,4 @@
-class AddExpiredAtToProfile < ActiveRecord::Migration
+class AddExpiredAtToProfile < ActiveRecord::Migration[5.0]
   def change
     add_column :profiles, :expired_at, :datetime
   end

data/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb

@@ -1,4 +1,4 @@
-class AddFullNameTranscriptionToProfile < ActiveRecord::Migration
+class AddFullNameTranscriptionToProfile < ActiveRecord::Migration[5.0]
   def change
     add_column :profiles, :full_name_transcription, :text
   end

data/db/migrate/20141003182825_add_date_of_birth_to_profile.rb

@@ -1,4 +1,4 @@
-class AddDateOfBirthToProfile < ActiveRecord::Migration
+class AddDateOfBirthToProfile < ActiveRecord::Migration[5.0]
   def change
     add_column :profiles, :date_of_birth, :datetime
   end

data/db/migrate/20150421023923_create_identities.rb

@@ -1,14 +1,12 @@
-class CreateIdentities < ActiveRecord::Migration
+class CreateIdentities < ActiveRecord::Migration[5.0]
   def change
     create_table :identities do |t|
-      t.string :name
-      t.string :email
+      t.string :name, index: true
+      t.string :email, index: true
       t.string :password_digest
       t.references :profile, index: true
 
-      t.timestamps null: false
+      t.timestamps
     end
-    add_index :identities, :name
-    add_index :identities, :email
   end
 end

data/db/migrate/20151126005552_add_provider_to_identity.rb

@@ -1,5 +1,5 @@
-class AddProviderToIdentity < ActiveRecord::Migration
+class AddProviderToIdentity < ActiveRecord::Migration[5.0]
   def change
-    add_column :identities, :provider, :string
+    add_column :identities, :provider, :string, null: false
   end
 end

data/db/migrate/20170114174536_add_profile_id_to_user.rb

@@ -0,0 +1,5 @@
+class AddProfileIdToUser < ActiveRecord::Migration[5.0]
+  def change
+    add_reference :users, :profile, foreign_key: {on_delete: :cascade}, type: :uuid
+  end
+end

data/lib/enju_seed/engine.rb

@@ -14,6 +14,8 @@ require 'browser'
 require 'simple_form'
 require 'validates_timeliness'
 require 'shrine'
+require 'json_translate'
+require 'statesman'
 
 module EnjuSeed
   class Engine < ::Rails::Engine

data/lib/enju_seed/version.rb

@@ -1,3 +1,3 @@
 module EnjuSeed
-  VERSION = '0.3.0.beta.2'.freeze
+  VERSION = '0.3.0.beta.3'.freeze
 end

data/spec/controllers/my_accounts_controller_spec.rb

@@ -27,9 +27,7 @@ describe MyAccountsController do
   describe 'GET edit' do
     describe 'When logged in as Administrator' do
       before(:each) do
-        profile = FactoryGirl.create(:profile)
         @user = FactoryGirl.create(:admin)
-        @user.profile = profile
         sign_in @user
       end
 
@@ -41,9 +39,7 @@ describe MyAccountsController do
 
     describe 'When logged in as Librarian' do
       before(:each) do
-        profile = FactoryGirl.create(:profile)
         @user = FactoryGirl.create(:librarian)
-        @user.profile = profile
         sign_in @user
       end
 
@@ -55,9 +51,7 @@ describe MyAccountsController do
 
     describe 'When logged in as User' do
       before(:each) do
-        profile = FactoryGirl.create(:profile)
         @user = FactoryGirl.create(:user)
-        @user.profile = profile
         sign_in @user
       end
 
@@ -86,9 +80,7 @@ describe MyAccountsController do
 
     describe 'When logged in as Administrator' do
       before(:each) do
-        profile = FactoryGirl.create(:profile)
         @user = FactoryGirl.create(:admin, password: 'password', password_confirmation: 'password')
-        @user.profile = profile
         sign_in @user
       end
 
@@ -134,9 +126,7 @@ describe MyAccountsController do
 
     describe 'When logged in as Librarian' do
       before(:each) do
-        profile = FactoryGirl.create(:profile)
         @user = FactoryGirl.create(:librarian, password: 'password', password_confirmation: 'password')
-        @user.profile = profile
         sign_in @user
       end
 
@@ -177,9 +167,7 @@ describe MyAccountsController do
 
     describe 'When logged in as User' do
       before(:each) do
-        profile = FactoryGirl.create(:profile)
         @user = FactoryGirl.create(:user, password: 'password', password_confirmation: 'password')
-        @user.profile = profile
         sign_in @user
       end
 

data/spec/controllers/profiles_controller_spec.rb

@@ -314,7 +314,7 @@ describe ProfilesController do
   describe 'PUT update' do
     before(:each) do
       @profile = profiles(:user1)
-      @attrs = { user_group_id: '3', locale: 'en' }
+      @attrs = { user_group_id: user_groups(:user_group_00003).id, locale: 'en' }
       @invalid_attrs = { user_group_id: '', user_number: '日本語' }
     end
 
@@ -391,23 +391,23 @@ describe ProfilesController do
       end
 
       it 'should update other user' do
-        put :update, params: { id: profiles(:user1).id, profile: { user_number: '00003', locale: 'en', user_group_id: 3, library_id: 3, note: 'test' } }
+        put :update, params: { id: profiles(:user1).id, profile: { user_number: '00003', locale: 'en', user_group_id: user_groups(:user_group_00003).id, library_id: libraries(:library_00003).id, note: 'test' } }
         response.should redirect_to profile_url(assigns(:profile))
       end
 
       it 'should not update other admin' do
-        put :update, params: { id: profiles(:admin).id, profile: { user_number: '00003', locale: 'en', user_group_id: 3, library_id: 3, note: 'test' } }
+        put :update, params: { id: profiles(:admin).id, profile: { user_number: '00003', locale: 'en', user_group_id: user_groups(:user_group_00003).id, library_id: libraries(:library_00003).id, note: 'test' } }
         response.should be_forbidden
       end
 
       it "should update other user's user_group" do
-        put :update, params: { id: profiles(:user1).id, profile: { user_group_id: 3, library_id: 3, locale: 'en' } }
+        put :update, params: { id: profiles(:user1).id, profile: { user_group_id: user_groups(:user_group_00003).id, library_id: libraries(:library_00003).id, locale: 'en' } }
         response.should redirect_to profile_url(assigns(:profile))
-        assigns(:profile).user_group_id.should eq 3
+        assigns(:profile).user_group_id.should eq user_groups(:user_group_00003).id
       end
 
       it "should update other user's note" do
-        put :update, params: { id: profiles(:user1).id, profile: { user_group_id: 3, library_id: 3, note: 'test', locale: 'en' } }
+        put :update, params: { id: profiles(:user1).id, profile: { user_group_id: user_groups(:user_group_00003).id, library_id: libraries(:library_00003).id, note: 'test', locale: 'en' } }
         response.should redirect_to profile_url(assigns(:profile))
         assert_equal assigns(:profile).note, 'test'
       end
@@ -457,13 +457,13 @@ describe ProfilesController do
       end
 
       it 'should not update my user_group' do
-        put :update, params: { id: profiles(:user1).id, profile: { user_group_id: 3, library_id: 3 } }
+        put :update, params: { id: profiles(:user1).id, profile: { user_group_id: user_groups(:user_group_00003).id, library_id: libraries(:library_00003).id } }
         response.should redirect_to profile_url(assigns(:profile))
-        assigns(:profile).user_group_id.should eq 1
+        assigns(:profile).user_group_id.should eq user_groups(:user_group_00001).id
       end
 
       it 'should not update my note' do
-        put :update, params: { id: profiles(:user1).id, profile: { user_group_id: 3, library_id: 3, note: 'test' } }
+        put :update, params: { id: profiles(:user1).id, profile: { user_group_id: user_groups(:user_group_00003).id, library_id: libraries(:library_00003).id, note: 'test' } }
         response.should redirect_to profile_url(assigns(:profile))
         assigns(:profile).note.should be_nil
       end
@@ -504,20 +504,24 @@ describe ProfilesController do
   end
 
   describe 'DELETE destroy' do
+    before(:each) do
+      @profile = FactoryGirl.create(:profile)
+    end
+
     describe 'When logged in as Administrator' do
       login_fixture_admin
 
       it 'destroys the requested user' do
-        delete :destroy, params: { id: profiles(:user2).id }
+        delete :destroy, params: { id: @profile.id }
       end
 
       it 'redirects to the profiles list' do
-        delete :destroy, params: { id: profiles(:user2).id }
+        delete :destroy, params: { id: @profile.id }
         response.should redirect_to(profiles_url)
       end
 
       it 'should destroy librarian' do
-        delete :destroy, params: { id: profiles(:librarian2).id }
+        delete :destroy, params: { id: FactoryGirl.create(:librarian).profile.id }
         response.should redirect_to(profiles_url)
       end
     end
@@ -526,17 +530,17 @@ describe ProfilesController do
       login_fixture_librarian
 
       it 'destroys the requested user' do
-        delete :destroy, params: { id: profiles(:user2).id }
+        delete :destroy, params: { id: @profile.id }
         response.should redirect_to(profiles_url)
       end
 
       it 'redirects to the profiles list' do
-        delete :destroy, params: { id: profiles(:user2).id }
+        delete :destroy, params: { id: @profile.id }
         response.should redirect_to(profiles_url)
       end
 
       it 'should not destroy librarian' do
-        delete :destroy, params: { id: profiles(:librarian2).id }
+        delete :destroy, params: { id: FactoryGirl.create(:librarian_profile).id }
         response.should be_forbidden
       end
 
@@ -551,8 +555,7 @@ describe ProfilesController do
       end
 
       it 'should not be able to delete other librarian user' do
-        librarian = FactoryGirl.create(:librarian_profile)
-        delete :destroy, params: { id: librarian.id }
+        delete :destroy, params: { id: FactoryGirl.create(:librarian_profile).id }
         response.should be_forbidden
       end
     end
@@ -561,11 +564,11 @@ describe ProfilesController do
       login_fixture_user
 
       it 'destroys the requested user' do
-        delete :destroy, params: { id: profiles(:user2).id }
+        delete :destroy, params: { id: @profile.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, params: { id: profiles(:user2).id }
+        delete :destroy, params: { id: @profile.id }
         response.should be_forbidden
       end
 
@@ -577,12 +580,12 @@ describe ProfilesController do
 
     describe 'When not logged in' do
       it 'destroys the requested user' do
-        delete :destroy, params: { id: profiles(:user2).id }
+        delete :destroy, params: { id: @profile.id }
         response.should redirect_to(new_user_session_url)
       end
 
       it 'should be forbidden' do
-        delete :destroy, params: { id: profiles(:user2).id }
+        delete :destroy, params: { id: @profile.id }
         response.should redirect_to(new_user_session_url)
       end
     end

data/spec/controllers/roles_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe RolesController do
   fixtures :all

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

@@ -1,18 +1,18 @@
-class CreateManifestations < ActiveRecord::Migration
+class CreateManifestations < ActiveRecord::Migration[5.0]
   def change
-    create_table :manifestations do |t|
-      t.text :original_title, :null => false
+    create_table :manifestations, id: :uuid, default: 'gen_random_uuid()' do |t|
+      t.text :original_title, null: false
       t.text :title_alternative
       t.text :title_transcription
       t.string :classification_number
-      t.string :manifestation_identifier
+      t.string :manifestation_identifier, index: {unique: true}
       t.datetime :date_of_publication
       t.datetime :copyright_date
       t.timestamps
       t.datetime :deleted_at
       t.string :access_address
-      t.integer :language_id, :default => 1, :null => false
-      t.integer :carrier_type_id, :default => 1, :null => false
+      t.integer :language_id, default: 1, null: false
+      t.references :carrier_type, null: false
       t.integer :start_page
       t.integer :end_page
       t.integer :height
@@ -25,18 +25,17 @@ class CreateManifestations < ActiveRecord::Migration
       t.string :serial_number_string
       t.integer :edition
       t.text :note
-      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
-      t.integer :required_score, :default => 0, :null => false
-      t.integer :frequency_id, :default => 1, :null => false
-      t.boolean :subscription_master, :default => false, :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
+      t.integer :required_score, default: 0, null: false
+      t.integer :frequency_id, default: 1, null: false
+      t.boolean :subscription_master, default: false, null: false
     end
     #add_index :manifestations, :carrier_type_id
     #add_index :manifestations, :required_role_id
     add_index :manifestations, :access_address
     #add_index :manifestations, :frequency_id
-    add_index :manifestations, :manifestation_identifier
     add_index :manifestations, :updated_at
     add_index :manifestations, :date_of_publication
   end

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

@@ -1,20 +1,19 @@
-class CreateItems < ActiveRecord::Migration
+class CreateItems < ActiveRecord::Migration[5.0]
   def change
-    create_table :items do |t|
+    create_table :items, id: :uuid, default: 'gen_random_uuid()' do |t|
       t.string :call_number
       t.string :item_identifier
       t.timestamps
       t.datetime :deleted_at
-      t.integer :shelf_id, :default => 1, :null => false
-      t.boolean :include_supplements, :default => false, :null => false
+      t.references :shelf, default: 1
+      t.boolean :include_supplements, default: false, null: false
       t.text :note
       t.string :url
       t.integer :price
-      t.integer :lock_version, :default => 0, :null => false
-      t.integer :required_role_id, :default => 1, :null => false
-      t.integer :required_score, :default => 0, :null => false
+      t.integer :lock_version, default: 0, null: false
+      t.integer :required_role_id, default: 1, null: false
+      t.integer :required_score, default: 0, null: false
     end
-    add_index :items, :shelf_id
     add_index :items, :item_identifier
     add_index :items, :required_role_id
   end

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

@@ -1,12 +1,10 @@
-class CreateOwns < ActiveRecord::Migration
+class CreateOwns < ActiveRecord::Migration[5.0]
   def change
     create_table :owns do |t|
-      t.references :agent, :null => false
-      t.references :item, :null => false
+      t.references :agent, null: false, foreign_key: true
+      t.references :item, null: false, foreign_key: true, type: :uuid
       t.integer :position
       t.timestamps
     end
-    add_index :owns, :agent_id
-    add_index :owns, :item_id
   end
 end

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

@@ -1,12 +1,10 @@
-class CreateCreates < ActiveRecord::Migration
+class CreateCreates < ActiveRecord::Migration[5.0]
   def change
     create_table :creates do |t|
-      t.references :agent, :null => false
-      t.references :work, :null => false
+      t.references :agent, null: false, foreign_key: true
+      t.references :work, null: false, index: true, type: :uuid
       t.integer :position
       t.timestamps
     end
-    add_index :creates, :agent_id
-    add_index :creates, :work_id
   end
 end

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

@@ -1,12 +1,10 @@
-class CreateProduces < ActiveRecord::Migration
+class CreateProduces < ActiveRecord::Migration[5.0]
   def change
     create_table :produces do |t|
-      t.references :agent, :null => false
-      t.references :manifestation, :null => false
+      t.references :agent, null: false, foreign_key: true
+      t.references :manifestation, null: false, foreign_key: true, type: :uuid
       t.integer :position
       t.timestamps
     end
-    add_index :produces, :agent_id
-    add_index :produces, :manifestation_id
   end
 end

data/spec/dummy/db/migrate/059_create_libraries.rb

@@ -1,9 +1,9 @@
-class CreateLibraries < ActiveRecord::Migration
+class CreateLibraries < ActiveRecord::Migration[5.0]
   def change
-    create_table :libraries do |t|
-      t.string :name, :null => false
-      t.text :display_name
-      t.string :short_display_name, :null => false
+    create_table :libraries, id: :uuid, default: 'gen_random_uuid()' do |t|
+      t.string :name, null: false, index: {unique: true}
+      t.jsonb :display_name_translations
+      t.jsonb :short_display_name_translations
       t.string :zip_code
       t.text :street
       t.text :locality
@@ -12,10 +12,10 @@ class CreateLibraries < ActiveRecord::Migration
       t.string :telephone_number_2
       t.string :fax_number
       t.text :note
-      t.integer :call_number_rows, :default => 1, :null => false
-      t.string :call_number_delimiter, :default => "|", :null => false
-      t.integer :library_group_id, :default => 1, :null => false
-      t.integer :users_count, :default => 0, :null => false
+      t.integer :call_number_rows, default: 1, null: false
+      t.string :call_number_delimiter, default: "|", null: false
+      t.integer :library_group_id, default: 1, null: false
+      t.integer :users_count, default: 0, null: false
       t.integer :position
       t.integer :country_id
 
@@ -23,6 +23,5 @@ class CreateLibraries < ActiveRecord::Migration
       t.datetime :deleted_at
     end
     add_index :libraries, :library_group_id
-    add_index :libraries, :name, :unique => true
   end
 end

data/spec/dummy/db/migrate/069_create_shelves.rb

@@ -1,15 +1,14 @@
-class CreateShelves < ActiveRecord::Migration
+class CreateShelves < ActiveRecord::Migration[5.0]
   def change
     create_table :shelves do |t|
-      t.string :name, :null => false
-      t.text :display_name
+      t.string :name, null: false
+      t.jsonb :display_name_translations
       t.text :note
-      t.integer :library_id, :default => 1, :null => false
-      t.integer :items_count, :default => 0, :null => false
+      t.references :library, foreign_key: true, null: false, type: :uuid
+      t.integer :items_count, default: 0, null: false
       t.integer :position
       t.timestamps
       t.datetime :deleted_at
     end
-    add_index :shelves, :library_id
   end
 end