gaku 0.0.2 → 0.0.3

data/core/db/default/gaku/attendance_types.rb

@@ -1,6 +1,7 @@
 types = [
   {
     name: 'Present',
+    name_ja: 'Japanese Present',
     color_code: '#006e54',
     counted_absent: false,
     disable_credit: false,
@@ -10,6 +11,7 @@ types = [
 
   {
     name: 'Present for Credit',
+    name_ja: 'Japanese Present for Credit',
     color_code: '#00a497',
     counted_absent: false,
     disable_credit: false,
@@ -19,6 +21,7 @@ types = [
 
   {
     name: 'Excused',
+    name_ja: 'Japanese Excused',
     color_code: '#2c4f54',
     counted_absent: false,
     disable_credit: false,
@@ -28,6 +31,7 @@ types = [
 
   {
     name: 'Illness',
+    name_ja: 'Japanese Illness',
     color_code: '#4d4398',
     counted_absent: true,
     disable_credit: false,
@@ -37,6 +41,7 @@ types = [
 
   {
     name: 'Injury',
+    name: 'Japanese Injury',
     color_code: '#c85179',
     counted_absent: true,
     disable_credit: false,
@@ -46,6 +51,7 @@ types = [
 
   {
     name: 'Mourning',
+    name_ja: 'Japanese Mourning',
     color_code: '#7d7d7d',
     counted_absent: true,
     disable_credit: false,
@@ -55,6 +61,7 @@ types = [
 
   {
     name: 'Absent',
+    name_ja: 'Japanese Absent',
     color_code: '#e60033',
     counted_absent: true,
     disable_credit: true,
@@ -62,16 +69,19 @@ types = [
     auto_credit: false
   }
 ]
-japanese_attendance_types = ['Japanese Present', 'Japanese Present for Credit',
-                             'Japanese Excused', 'Japanese Illness',
-                             'Japanese Injury', 'Japanese Mourning',
-                             'Japanese Absent'
-                            ]
 
-types.each_with_index do |type, index|
+
+types.each do |type|
   I18n.locale = :en
-  attendance_type = Gaku::AttendanceType.where(type).first_or_create!
+  attendance_type = Gaku::AttendanceType.create!(
+                                                  name:           type[:name],
+                                                  color_code:     type[:color_code],
+                                                  counted_absent: type[:counted_absent],
+                                                  disable_credit: type[:disable_credit],
+                                                  credit_rate:    type[:credit_rate],
+                                                  auto_credit:    type[:auto_credit]
+                                                )
 
   I18n.locale = :ja
-  attendance_type.update_attributes(name: japanese_attendance_types[index])
+  attendance_type.update_attributes(name: type[:name_ja])
 end

data/core/db/default/gaku/commute_method_types.rb

@@ -1,29 +1,21 @@
 # -*- encoding: utf-8 -*-
 
-#names = %w(Unknown Walking Bicycle Train Bus Car Metro)
-
-#names.each do |name|
-#	Gaku::CommuteMethodType.where(name: name).first_or_create!
-#end
-
-# -*- encoding: utf-8 -*-
-# Array format ['en commute_method_type', 'ja commute_method_type', 'active?']
 commute_method_types = [
-  ['Unknown',  '不明'],
-  ['Walking',  '歩行'],
-  ['Bicycle',  '自転車'],
-  ['Train',    '列車'],
-  ['Bus',      'バス'],
-  ['Car',      '車'],
-  ['Metro',    '地下鉄']
+  { name: 'Unknown',  name_ja: '不明' },
+  { name: 'Walking',  name_ja: '歩行' },
+  { name: 'Bicycle',  name_ja: '自転車' },
+  { name: 'Train',    name_ja: '列車' },
+  { name: 'Bus',      name_ja: 'バス' },
+  { name: 'Car',      name_ja: '車' },
+  { name: 'Metro',    name_ja: '地下鉄'}
 ]
 
+
+
 commute_method_types.each do |type|
   I18n.locale = :en
-  commute_method_type = Gaku::CommuteMethodType.find_or_create_by_name(type[0])
+  commute_method_type = Gaku::CommuteMethodType.create!(name: type[:name])
 
   I18n.locale = :ja
-  commute_method_type.update_attributes(name: type[1])
-end
-
-I18n.locale = nil
+  commute_method_type.update_attributes(name: type[:name_ja])
+end

data/core/db/default/gaku/enrollment_status.rb

@@ -1,37 +1,40 @@
 # -*- encoding: utf-8 -*-
-# Array format ['en status', 'ja status', 'active?']
+
 statuses = [
-	['applicant',           'Applicant', 		          '志願', 			  false ], #DO NOT CHANGE ORDER
-	['admitted',            'Admitted', 					    '入学',    			true	],
-	['enrolled',            'Enrolled',					      '在学',				  true	],
-	['transferred_in',      'Transfered In',			    '転入',			  	true	],
-	['transferred_out',     'Transfered Out',		      '転出',			    false	],
-	['course_transfer_in',  'Course Transfer In',			'編入',				  true	],
-	['course_transfer_out', 'Course Transfer Out',		'編出',			    false	],
-	['visiting',            'Visiting',					      '留学',				  true	],
-	['re_admitted',         'Re-Admitted',				    '再入学',				true	],
-	['for_credit_exchange', 'For-Credit Exchange',	  '単位認定留学',	true	],
-	['non_credit_exchange', 'Non-Credit Exchange',	  '休学留学',			true	],
-	['repeat',              'Repeat',                	'留年',			    true	],
-	['held_back',           'Held Back',	            '原級留置',			true	],
- ['inactive',            'Inactive',					      '休学',					false	],
-	['graduated',           'Graduated',					      '卒業',					false	],
-	['re_enrolled',         'Re-Enrolled', 			      '復学', 				true	],
-	['suspended',           'Suspended', 				      '退学', 				false	],
-	['expelled',            'Expelled',					      '停学', 				false	],
-	['dropped_out',         'Dropped Out',				      '自主退学', 		false	],
-	['terminal_leave',      'Terminal Leave',		      '除籍', 				false	],
-	['on_leave',            'On Leave', 					      '一時自主退学', false	],
-	['extended_absence',    'Extended Absence', 	      '長期自主退学', false	],
-	['deleted',             'Deleted', 					      '削除' , 				false	]
+  { code: 'applicant', name: 'Applicant', name_ja: '志願', active: false },
+  { code: 'admitted',  name: 'Admitted',  name_ja: '入学', active: true },
+  { code: 'enrolled',  name: 'Enrolled',  name_ja: '在学', active: true },
+  { code: 'transferred_in', name: 'Transfered In', name_ja: '転入', active: true },
+  { code: 'transferred_out', name: 'Transfered Out', name_ja: '転出', active: false },
+  { code: 'course_transfer_in', name: 'Course Transfer In', name_ja: '編入', active: true },
+  { code: 'course_transfer_out', name: 'Course Transfer Out', name_ja:  '編出', active: false },
+  { code: 'visiting',  name: 'Visiting',  name_ja: '留学', active: true },
+  { code: 're_admitted', name: 'Re-Admitted',  name_ja: '再入学', active: true },
+  { code: 'for_credit_exchange', name: 'For-Credit Exchange', name_ja: '単位認定留学', active: true },
+  { code: 'non_credit_exchange', name: 'Non-Credit Exchange', name_ja: '休学留学', active: true },
+  { code: 'repeat', name: 'Repeat',  name_ja: '留年', active: true },
+  { code: 'held_back', name: 'Held Back', name_ja: '原級留置', active: true },
+  { code: 'inactive', name: 'Inactive', name_ja: '休学', active: false },
+  { code: 'graduated', name: 'Graduated', name_ja: '卒業', active: false },
+  { code: 're_enrolled', name: 'Re-Enrolled', name_ja: '復学', active: true },
+  { code: 'suspended', name: 'Suspended', name_ja: '退学', active: false },
+  { code: 'expelled', name: 'Expelled', name_ja: '停学', active: false },
+  { code: 'dropped_out', name: 'Dropped Out', name_ja: '自主退学', active: false },
+  { code: 'terminal_leave', name: 'Terminal Leave',  name_ja: '除籍', active: false },
+  { code: 'on_leave', name: 'On Leave', name_ja: '一時自主退学', active: false },
+  { code: 'extended_absence', name: 'Extended Absence',  name_ja: '長期自主退学', active: false },
+  { code: 'deleted', name: 'Deleted',  name_ja: '削除' , active: false }
 ]
 
 statuses.each do |status|
-	I18n.locale = :en
-	es = Gaku::EnrollmentStatus.where(code: status[0], name: status[1], active: status[3], immutable: true).first_or_create!
-
-	I18n.locale = :ja
-	es.update_attribute(:name,  status[2])
-end
+  I18n.locale = :en
+  es = Gaku::EnrollmentStatus.create(
+                                      code: status[:code],
+                                      name: status[:name],
+                                      active: status[:active],
+                                      immutable: true
+                                    )
 
-I18n.locale = nil
+  I18n.locale = :ja
+  es.update_attribute(:name,  status[:name_ja])
+end

data/core/db/default/gaku/scholarship_statuses.rb

@@ -1,19 +1,22 @@
 # -*- encoding: utf-8 -*-
-# Array format ['en scholarship_status', 'ja scholarship_status', 'default']
+
 scholarship_statuses = [
-  ['Self Paid',                   '自己支払い',       true ],
-  ['Government Scholarship',      '政府奨学金',       false],
-  ['School Scholarship',          '学校の奨学金',     false],
-  ['Organizational Scholarship',  '組織の奨学金',     false],
-  ['Charity Scholarship',         'チャリティー奨学金',  false],
+  { name: 'Self Paid',                  name_ja: '自己支払い',       default: true },
+  { name: 'Government Scholarship',     name_ja: '政府奨学金',       default: false },
+  { name: 'School Scholarship',         name_ja: '学校の奨学金',     default: false },
+  { name: 'Organizational Scholarship', name_ja: '組織の奨学金',     default: false },
+  { name: 'Charity Scholarship',        name_ja: 'チャリティー奨学金', default: false }
 ]
 
 scholarship_statuses.each do |status|
   I18n.locale = :en
-  scholarship_status = Gaku::ScholarshipStatus.where(name: status[0], default: status[2]).first_or_create!
+  scholarship_status = Gaku::ScholarshipStatus.create!(
+                                                        name: status[:name],
+                                                        default: status[:default]
+                                                      )
 
   I18n.locale = :ja
-  scholarship_status.update_attribute(:name,  status[1])
+  scholarship_status.update_attribute(:name,  status[:name_ja])
 end
 
 I18n.locale = nil

data/core/db/migrate/20120202111850_translated_tables.rb

@@ -0,0 +1,52 @@
+class TranslatedTables < ActiveRecord::Migration
+
+  def up
+    create_table :gaku_attendance_types do |t|
+      t.string   :name
+      t.string   :color_code
+      t.boolean  :counted_absent
+      t.boolean  :disable_credit
+      t.float    :credit_rate
+      t.boolean  :auto_credit
+      t.timestamps
+    end
+    Gaku::AttendanceType.create_translation_table! name: :string
+
+    create_table :gaku_commute_method_types do |t|
+      t.string   :name
+      t.timestamps
+    end
+    Gaku::CommuteMethodType.create_translation_table! name: :string
+
+    create_table :gaku_enrollment_statuses do |t|
+      t.string   :code
+      t.string   :name
+      t.boolean  :active
+      t.boolean  :immutable
+      t.timestamps
+    end
+    Gaku::EnrollmentStatus.create_translation_table! name: :string
+
+    create_table :gaku_scholarship_statuses do |t|
+      t.string   :name
+      t.boolean  :default
+      t.timestamps
+    end
+    Gaku::ScholarshipStatus.create_translation_table! name: :string
+  end
+
+  def down
+    drop_table :gaku_attendance_types
+    Gaku::AttendanceType.drop_translation_table!
+
+    drop_table :gaku_commute_method_types
+    Gaku::CommuteMethodType.drop_translation_table!
+
+    drop_table :gaku_enrollment_statuses
+    Gaku::EnrollmentStatus.drop_translation_table!
+
+    drop_table :gaku_scholarship_statuses
+    Gaku::ScholarshipStatus.drop_translation_table!
+  end
+
+end

data/core/db/migrate/{20120202111850_gaku_core.rb → 20131014065028_gaku_core.rb}

@@ -59,28 +59,6 @@ class GakuCore < ActiveRecord::Migration
       t.datetime 'asset_updated_at'
     end
 
-    create_table 'gaku_attendance_type_translations' do |t|
-      t.integer  'gaku_attendance_type_id', null: false
-      t.string   'locale',                  null: false
-      t.datetime 'created_at'
-      t.datetime 'updated_at'
-      t.string   'name'
-    end
-
-    add_index 'gaku_attendance_type_translations', ['gaku_attendance_type_id'], name: 'index_144d49f40337496bacec02aefc694f93f07d0581', using: :btree
-    add_index 'gaku_attendance_type_translations', ['locale'], name: 'index_gaku_attendance_type_translations_on_locale', using: :btree
-
-    create_table 'gaku_attendance_types' do |t|
-      t.string   'name'
-      t.string   'color_code'
-      t.boolean  'counted_absent'
-      t.boolean  'disable_credit'
-      t.float    'credit_rate'
-      t.boolean  'auto_credit'
-      t.datetime 'created_at'
-      t.datetime 'updated_at'
-    end
-
     create_table 'gaku_attendances' do |t|
       t.text     'reason'
       t.integer  'attendancable_id'
@@ -130,23 +108,6 @@ class GakuCore < ActiveRecord::Migration
       t.integer  'notes_count', default: 0
     end
 
-    create_table 'gaku_commute_method_type_translations' do |t|
-      t.integer  'gaku_commute_method_type_id', null: false
-      t.string   'locale',                      null: false
-      t.datetime 'created_at'
-      t.datetime 'updated_at'
-      t.string   'name'
-    end
-
-    add_index 'gaku_commute_method_type_translations', ['gaku_commute_method_type_id'], name: 'index_27960af5d7e19e965cc26c8f98c7d21e3a0ce580', using: :btree
-    add_index 'gaku_commute_method_type_translations', ['locale'], name: 'index_gaku_commute_method_type_translations_on_locale', using: :btree
-
-    create_table 'gaku_commute_method_types' do |t|
-      t.string   'name'
-      t.datetime 'created_at'
-      t.datetime 'updated_at'
-    end
-
     create_table 'gaku_contact_types' do |t|
       t.string 'name'
     end
@@ -203,26 +164,6 @@ class GakuCore < ActiveRecord::Migration
       t.integer  'students_count', default: 0
     end
 
-    create_table 'gaku_enrollment_status_translations' do |t|
-      t.integer  'gaku_enrollment_status_id', null: false
-      t.string   'locale',                    null: false
-      t.datetime 'created_at'
-      t.datetime 'updated_at'
-      t.string   'name'
-    end
-
-    add_index 'gaku_enrollment_status_translations', ['gaku_enrollment_status_id'], name: 'index_7865fd45090cea7b7810b5288a698bba41d45b8e', using: :btree
-    add_index 'gaku_enrollment_status_translations', ['locale'], name: 'index_gaku_enrollment_status_translations_on_locale', using: :btree
-
-    create_table 'gaku_enrollment_statuses' do |t|
-      t.string   'code'
-      t.string   'name'
-      t.boolean  'active'
-      t.boolean  'immutable'
-      t.datetime 'created_at'
-      t.datetime 'updated_at'
-    end
-
     create_table 'gaku_exam_portion_scores' do |t|
       t.float    'score'
       t.string   'entry_number'
@@ -368,15 +309,6 @@ class GakuCore < ActiveRecord::Migration
       t.integer  'contacts_count',       default: 0
     end
 
-    create_table 'gaku_import_files' do |t|
-      t.string   'context'
-      t.string   'importer_type'
-      t.string   'data_file_file_name'
-      t.string   'data_file_content_type'
-      t.integer  'data_file_file_size'
-      t.datetime 'data_file_updated_at'
-    end
-
     create_table 'gaku_installs' do |t|
       t.string   'email',                  default: '', null: false
       t.string   'encrypted_password',     default: '', null: false
@@ -476,24 +408,6 @@ class GakuCore < ActiveRecord::Migration
       t.datetime 'updated_at'
     end
 
-    create_table 'gaku_scholarship_status_translations' do |t|
-      t.integer  'gaku_scholarship_status_id', null: false
-      t.string   'locale',                     null: false
-      t.datetime 'created_at'
-      t.datetime 'updated_at'
-      t.string   'name'
-    end
-
-    add_index 'gaku_scholarship_status_translations', ['gaku_scholarship_status_id'], name: 'index_fd3bb92292a989ddcdc49aabf021ceb1ce5f0d04', using: :btree
-    add_index 'gaku_scholarship_status_translations', ['locale'], name: 'index_gaku_scholarship_status_translations_on_locale', using: :btree
-
-    create_table 'gaku_scholarship_statuses' do |t|
-      t.string   'name'
-      t.datetime 'created_at'
-      t.datetime 'updated_at'
-      t.boolean  'default'
-    end
-
     create_table 'gaku_school_histories' do |t|
       t.date     'beginning'
       t.date     'ending'

data/core/gaku_core.gemspec

@@ -20,56 +20,59 @@ Gem::Specification.new do |s|
   s.requirements << 'postgres'
   s.requirements << 'redis'
 
-  s.add_dependency 'rails', '~> 4.0.0'
-  s.add_dependency 'coffee-rails', '~> 4.0.0'
-  s.add_dependency 'sass-rails',   '~> 4.0.0'
-  s.add_dependency 'uglifier',     '~> 1.3'
+  s.add_dependency 'rails',                          '~> 4.0.0'
+  s.add_dependency 'rails-i18n',                     '~> 4.0.0'
+  s.add_dependency 'coffee-rails',                   '~> 4.0.0'
+  s.add_dependency 'sass-rails',                     '~> 4.0.0'
+  s.add_dependency 'uglifier'
   s.add_dependency 'turbolinks'
 
   s.add_dependency 'pg'
 
-  s.add_dependency 'slim', '~> 2.0.1'
-  s.add_dependency 'inherited_resources'
-  s.add_dependency 'responders'
-  s.add_dependency 'paper_trail', '3.0.0.beta1'
-  s.add_dependency 'globalize3'
-  s.add_dependency 'draper', '~> 1.0'
-  s.add_dependency 'paperclip'
-  s.add_dependency 'ransack', '~> 1.0'
-  s.add_dependency 'kaminari'
+  s.add_dependency 'slim',                           '~> 2.0'
+  s.add_dependency 'inherited_resources',            '~> 1.4'
+  s.add_dependency 'responders',                     '~> 1.0'
+  s.add_dependency 'paper_trail',                    '3.0.0.beta1'
+  s.add_dependency 'globalize',                      '~> 4.0.0.alpha.1'
+  s.add_dependency 'draper',                         '~> 1.0'
+  s.add_dependency 'paperclip',                      '~> 3.5'
+  s.add_dependency 'ransack',                        '~> 1.0'
+  s.add_dependency 'kaminari',                       '~> 0.14'
 
-  s.add_dependency 'devise', '~> 3.0.0'
-  s.add_dependency 'devise-i18n'
-  s.add_dependency 'cancan'
+  s.add_dependency 'devise',                         '~> 3.0.0'
+  s.add_dependency 'devise-i18n',                    '~> 0.9'
+  s.add_dependency 'cancan',                         '~> 1.6.10'
 
   s.add_dependency 'rails4_client_side_validations', '0.0.3'
-  s.add_dependency 'gaku_forms', '0.1.5'
-  s.add_dependency 'gaku_nested_forms', '0.1.0'
+  s.add_dependency 'gaku_forms',                     '0.1.5'
+  s.add_dependency 'gaku_nested_forms',              '0.1.0'
   s.add_dependency 'nested_form'
-  s.add_dependency 'gaku_helpers', '0.0.7'
+  s.add_dependency 'gaku_helpers',                   '0.0.7'
 
-  s.add_dependency 'rails-i18n'
-  s.add_dependency 'i18n-js'
+  s.add_dependency 'jquery-rails',                   '~> 3'
+  s.add_dependency 'jquery-ui-rails',                '~> 4'
+  s.add_dependency 'jquery-minicolors-rails',        '2.1.1'
+  s.add_dependency 'bootstrap-sass',                 '~> 2.3'
+  s.add_dependency 'bootstrap-datepicker-rails',     '~> 1.1'
+  s.add_dependency 'i18n-js',                        '~> 2.1'
+  s.add_dependency 'eco',                            '~> 1'
+  s.add_dependency 'underscore-rails',               '~> 1.5'
+  s.add_dependency 'momentjs-rails',                 '~> 2.2'
 
-  s.add_dependency 'underscore-rails'
-  s.add_dependency 'momentjs-rails'
-  s.add_dependency 'jquery-rails'
-  s.add_dependency 'jquery-ui-rails'
-  s.add_dependency 'jquery-minicolors-rails', '2.1.1'
-  s.add_dependency 'eco'
-  s.add_dependency 'bootstrap-sass'
-  s.add_dependency 'bootstrap-datepicker-rails'
-
-  #spreadsheet handling
-  s.add_dependency 'roo'
-  s.add_dependency 'gen_sheet'
-  s.add_dependency 'thinreports-rails'
+  s.add_dependency 'thinreports-rails',              '~> 0.1'
+  s.add_dependency 'localeapp'
+  s.add_dependency 'highline',                       '1.6.11'
+  s.add_dependency 'rubyzip',                        '0.9.9'
+  s.add_dependency 'ffaker',                         '~> 1.19.0'
+  s.add_dependency 'rake-progressbar'
 
-  s.add_dependency 'highline', '1.6.11'
-  s.add_dependency 'rubyzip', '0.9.9'
 
-  s.add_dependency 'sidekiq'
-  s.add_dependency 'sinatra'
-  s.add_dependency 'rake-progressbar'
-  s.add_dependency 'localeapp'
+  s.add_development_dependency 'rspec-rails',              '~> 2.14'
+  s.add_development_dependency 'factory_girl_rails',       '~> 4.2.1'
+  s.add_development_dependency 'capybara',                 '1.1.3'
+  s.add_development_dependency 'database_cleaner',         '~> 1.1.1'
+  s.add_development_dependency 'selenium',                 '~> 0.2.10'
+  s.add_development_dependency 'poltergeist',              '~> 1.0.3'
+  s.add_development_dependency 'handy_controller_helpers', '0.0.3'
+  s.add_development_dependency 'shoulda-matchers',         '~> 2.4.0'
 end