enju_seed 0.3.0.beta.4 → 0.3.0.beta.6

data/db/migrate/20150421023923_create_identities.rb

@@ -1,12 +1,14 @@
-class CreateIdentities < ActiveRecord::Migration[5.0]
+class CreateIdentities < ActiveRecord::Migration[4.2]
   def change
     create_table :identities do |t|
-      t.string :name, index: true
-      t.string :email, index: true
+      t.string :name
+      t.string :email
       t.string :password_digest
       t.references :profile, index: true
 
-      t.timestamps
+      t.timestamps null: false
     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[5.0]
+class AddProviderToIdentity < ActiveRecord::Migration[4.2]
   def change
-    add_column :identities, :provider, :string, null: false
+    add_column :identities, :provider, :string
   end
 end

data/lib/enju_seed/engine.rb

@@ -13,9 +13,8 @@ require 'sitemap_generator'
 require 'browser'
 require 'simple_form'
 require 'validates_timeliness'
-require 'shrine'
-require 'json_translate'
-require 'statesman'
+require 'globalize'
+require 'globalize-accessors'
 
 module EnjuSeed
   class Engine < ::Rails::Engine

data/lib/enju_seed/localized_name.rb

@@ -1,7 +1,9 @@
 module LocalizedName
   def localize(locale = I18n.locale)
     string = YAML.load(self)
-    return string[locale.to_s] if string.is_a?(Hash) && string[locale.to_s]
+    if string.is_a?(Hash) and string[locale.to_s]
+      return string[locale.to_s]
+    end
     self
   rescue NoMethodError
     self

data/lib/enju_seed/version.rb

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

data/lib/enju_seed.rb

@@ -1,5 +1,6 @@
-require 'enju_seed/engine'
+require "enju_seed/engine"
+require "enju_seed/version"
+require "enju_seed/localized_name"
 
 module EnjuSeed
-  # Your code goes here...
 end

data/lib/generators/enju_seed/update/update_generator.rb

@@ -0,0 +1,9 @@
+class EnjuSeed::UpdateGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+  desc "Create files for updating Next-L Enju"
+
+  def copy_migration_files
+    generate('statesman:add_constraints_to_most_recent', 'UserImportFile', 'UserImportFileTransition')
+    generate('statesman:add_constraints_to_most_recent', 'UserExportFile', 'UserExportFileTransition')
+  end
+end

data/spec/controllers/my_accounts_controller_spec.rb

@@ -3,20 +3,20 @@ require 'rails_helper'
 describe MyAccountsController do
   fixtures :all
 
-  describe 'GET show' do
-    describe 'When logged in as Administrator' do
+  describe "GET show" do
+    describe "When logged in as Administrator" do
       before(:each) do
         sign_in User.friendly.find('enjuadmin')
       end
 
-      it 'assigns the requested user as @user' do
+      it "assigns the requested user as @user" do
         get :show, params: { id: 'admin' }
         expect(response).to be_success
       end
     end
 
-    describe 'When not logged in' do
-      it 'assigns the requested user as @user' do
+    describe "When not logged in" do
+      it "assigns the requested user as @user" do
         get :show, params: { id: 'admin' }
         expect(assigns(:user)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
@@ -24,46 +24,52 @@ describe MyAccountsController do
     end
   end
 
-  describe 'GET edit' do
-    describe 'When logged in as Administrator' do
+  describe "GET edit" do
+    describe "When logged in as Administrator" do
       before(:each) do
-        @user = FactoryGirl.create(:admin)
+        profile = FactoryBot.create(:profile)
+        @user = FactoryBot.create(:admin)
+        @user.profile = profile
         sign_in @user
       end
 
-      it 'assigns the requested user as @user' do
+      it "assigns the requested user as @user" do
         get :edit
         expect(assigns(:profile)).to eq(@user.profile)
       end
     end
 
-    describe 'When logged in as Librarian' do
+    describe "When logged in as Librarian" do
       before(:each) do
-        @user = FactoryGirl.create(:librarian)
+        profile = FactoryBot.create(:profile)
+        @user = FactoryBot.create(:librarian)
+        @user.profile = profile
         sign_in @user
       end
 
-      it 'should assign the requested user as @user' do
+      it "should assign the requested user as @user" do
         get :edit
         expect(assigns(:profile)).to eq(@user.profile)
       end
     end
 
-    describe 'When logged in as User' do
+    describe "When logged in as User" do
       before(:each) do
-        @user = FactoryGirl.create(:user)
+        profile = FactoryBot.create(:profile)
+        @user = FactoryBot.create(:user)
+        @user.profile = profile
         sign_in @user
       end
 
-      it 'should assign the requested user as @user' do
+      it "should assign the requested user as @user" do
         get :edit
         expect(assigns(:profile)).to eq(@user.profile)
         expect(response).to be_success
       end
     end
 
-    describe 'When not logged in' do
-      it 'should not assign the requested user as @user' do
+    describe "When not logged in" do
+      it "should not assign the requested user as @user" do
         get :edit
         expect(assigns(:user)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
@@ -71,32 +77,34 @@ describe MyAccountsController do
     end
   end
 
-  describe 'PUT update' do
+  describe "PUT update" do
     before(:each) do
       @attrs = { user_attributes: { email: 'newaddress@example.jp', current_password: 'password' }, locale: 'en' }
       @invalid_attrs = { user_attributes: { username: '' }, user_number: '日本語' }
       @invalid_passwd_attrs = { user_attributes: { current_password: '' } }
     end
 
-    describe 'When logged in as Administrator' do
+    describe "When logged in as Administrator" do
       before(:each) do
-        @user = FactoryGirl.create(:admin, password: 'password', password_confirmation: 'password')
+        profile = FactoryBot.create(:profile)
+        @user = FactoryBot.create(:admin, password: 'password', password_confirmation: 'password')
+        @user.profile = profile
         sign_in @user
       end
 
-      describe 'with valid params' do
-        it 'updates the requested user' do
+      describe "with valid params" do
+        it "updates the requested user" do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
         end
 
-        it 'assigns the requested user as @user' do
+        it "assigns the requested user as @user" do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
           expect(assigns(:profile)).to eq(@user.profile)
         end
 
-        it 'redirects to the user' do
+        it "redirects to the user" do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
           expect(assigns(:profile)).to eq(@user.profile)
@@ -104,15 +112,15 @@ describe MyAccountsController do
         end
       end
 
-      describe 'with invalid params' do
-        it 'assigns the requested user as @user' do
+      describe "with invalid params" do
+        it "assigns the requested user as @user" do
           put :update, params: { profile: @invalid_attrs }
           expect(assigns(:profile)).to eq(@user.profile)
         end
 
         it "re-renders the 'edit' template" do
           put :update, params: { profile: @invalid_attrs }
-          expect(response).to render_template('edit')
+          expect(response).to render_template("edit")
         end
       end
 
@@ -124,25 +132,27 @@ describe MyAccountsController do
       # end
     end
 
-    describe 'When logged in as Librarian' do
+    describe "When logged in as Librarian" do
       before(:each) do
-        @user = FactoryGirl.create(:librarian, password: 'password', password_confirmation: 'password')
+        profile = FactoryBot.create(:profile)
+        @user = FactoryBot.create(:librarian, password: 'password', password_confirmation: 'password')
+        @user.profile = profile
         sign_in @user
       end
 
-      describe 'with valid params' do
-        it 'updates the requested user' do
+      describe "with valid params" do
+        it "updates the requested user" do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
         end
 
-        it 'assigns the requested user as @user' do
+        it "assigns the requested user as @user" do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
           expect(assigns(:profile)).to eq(@user.profile)
         end
 
-        it 'redirects to the user' do
+        it "redirects to the user" do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
           expect(assigns(:profile)).to eq(@user.profile)
@@ -150,34 +160,36 @@ describe MyAccountsController do
         end
       end
 
-      describe 'with invalid params' do
-        it 'assigns the user as @user' do
+      describe "with invalid params" do
+        it "assigns the user as @user" do
           put :update, params: { profile: @invalid_attrs }
           expect(assigns(:profile)).to_not be_valid
           expect(response).to be_success
         end
 
-        it 'should ignore username' do
+        it "should ignore username" do
           put :update, params: { profile: @invalid_attrs }
-          expect(response).to render_template('edit')
+          expect(response).to render_template("edit")
           expect(assigns(:profile).changed?).to be_truthy
         end
       end
     end
 
-    describe 'When logged in as User' do
+    describe "When logged in as User" do
       before(:each) do
-        @user = FactoryGirl.create(:user, password: 'password', password_confirmation: 'password')
+        profile = FactoryBot.create(:profile)
+        @user = FactoryBot.create(:user, password: 'password', password_confirmation: 'password')
+        @user.profile = profile
         sign_in @user
       end
 
-      describe 'with valid params' do
-        it 'updates the requested user' do
+      describe "with valid params" do
+        it "updates the requested user" do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
         end
 
-        it 'assigns the requested user as @user' do
+        it "assigns the requested user as @user" do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
           expect(assigns(:profile)).to eq(@user.profile)
@@ -185,30 +197,29 @@ describe MyAccountsController do
         end
       end
 
-      describe 'with invalid params' do
-        it 'assigns the requested user as @user' do
+      describe "with invalid params" do
+        it "assigns the requested user as @user" do
           put :update, params: { profile: @invalid_attrs }
-          #expect(response).to be_success
           expect(assigns(:profile).user.username).to eq(@user.username)
           expect(response).to redirect_to(my_account_url)
         end
       end
     end
 
-    describe 'When not logged in' do
-      describe 'with valid params' do
-        it 'updates the requested user' do
+    describe "When not logged in" do
+      describe "with valid params" do
+        it "updates the requested user" do
           put :update, params: { profile: @attrs }
         end
 
-        it 'should be forbidden' do
+        it "should be forbidden" do
           put :update, params: { profile: @attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
 
-      describe 'with invalid params' do
-        it 'assigns the requested user as @user' do
+      describe "with invalid params" do
+        it "assigns the requested user as @user" do
           put :update, params: { profile: @invalid_attrs }
           expect(response).to redirect_to(new_user_session_url)
         end