gaku 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5474503b8dd52288efd403fe8747063aeac22208
-  data.tar.gz: 5ee33d43e57e47d42fcbb4924639f579470c7962
+  metadata.gz: 59cd64203ab111b1fb870b931e9353c54cab08bc
+  data.tar.gz: a73fd03a09e8b864ebff4d417139624a8fac2d92
 SHA512:
-  metadata.gz: 3fcc49533fa2d448820ed37720eb52fe340004e478945104279071e44ae3c2fad2924258f92cd0707c96d180fd220704f6c62d8bceef4708e3f0ebdecedfe14c
-  data.tar.gz: 42de59feb61a93ca0e63ee97278ccd3694b8d3263798fd24085df3cf3b87fb54a70b698d34d034cb0784f8f908ca8e28070ae9d79dba457974bf1126fa09ea07
+  metadata.gz: 2f325c7034f3fcfdecd9b8e7373476a847fe72faa7db8b9854b4bd356712f4f7d6d1cce35c338657c4bb72636cc10db16356b58d1f807ba05edd4d96038f9314
+  data.tar.gz: 597b0c1cae22019f6803504505ac21290476b5749e3252cba57d08a8a1f387fdb6715d873422ff385c8b88e3e10ebd9caadb11fd0ed2c95934ed89e17ee34623

data/.rspec

@@ -1,4 +1,2 @@
 --colour
---format documentation
---profile
---tag ~performance
+--format documentation

data/.travis.yml

@@ -2,22 +2,25 @@ before_script:
   - sh -e /etc/init.d/xvfb start
   - export DISPLAY=:99.0
   - psql -c 'create database gaku_test;' -U postgres
-bundler_args: --without development production
+bundler_args: --without production
 env:
-  - GEM=core DB=postgres
+  - TEST_SUITE=models GEM=core DB=postgres
+  - TEST_SUITE=controllers GEM=core DB=postgres
+  - TEST_SUITE=integration GEM=core DB=postgres
+  - TEST_SUITE=routing GEM=core DB=postgres
+  - TEST_SUITE=requests GEM=core DB=postgres
 before_install:
-  - gem install bundler --pre
+  - travis_retry gem install bundler --pre
   - cd $GEM; export BUNDLE_GEMFILE="`pwd`/Gemfile"
 script:
   - bundle exec rake test_app
-  - SELENIUM=1 I18N=1 bundle exec rspec
+  - SELENIUM=1 I18N=1 bundle exec rspec spec/$TEST_SUITE
 
 notifications:
-  email:
-    - false
+  email: false
   irc:
-    use_notice: true
-    skip_join: true
+    on_success: change
+    on_failure: always
     channels:
       - "irc.freenode.org#gaku"
 rvm:

data/README.md

@@ -66,13 +66,11 @@ Create a new Rails application:
 
 Then add GAKU to your Gemfile:
 ```ruby
-gem 'globalize3',  github: 'globalize/globalize', branch: 'rails4', ref: '82b3b36308677745b261bd147dda00ed4560a25d'
-gem 'gaku', '~> 0.0.2'
+gem 'gaku', '~> 0.0.3'
 ```
 
-Or use the master branch: 
+Or use the master branch:
 ```ruby
-gem 'globalize3',  github: 'globalize/globalize', branch: 'rails4', ref: '82b3b36308677745b261bd147dda00ed4560a25d'
 gem 'gaku', github: 'Genshin/gaku'
 ```
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/core/Guardfile

@@ -1,21 +1,31 @@
-guard 'rspec', :version => 2, :spec_paths => %w(spec),
-  :cli => (File.read('.rspec').split("\n").join(' ') if File.exists?('.rspec')) do
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'bundler' do
+  watch('Gemfile')
+  # Uncomment next line if Gemfile contain `gemspec' command
+  # watch(/^.+\.gemspec/)
+end
+
+guard :rspec do
   watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
   watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch("spec/spec_helper.rb")                        { "spec" }
-  watch("config/routes.rb")
-  watch("app/controllers/application_controller.rb")  { "spec/controllers" }
-  # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
-  watch(%r{^app/assets/javascripts/(.+)/.*\.(js|coffee|erb)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
-end
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
 
-guard 'bundler' do
-  watch('Gemfile')
-  watch(/^.+\.gemspec/)
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
 end
 
 guard :rubocop do

data/core/Rakefile

@@ -4,12 +4,9 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/packagetask'
 require 'rubygems/package_task'
-require 'rspec/core/rake_task'
-require 'rspec/core/runner'
 require 'gaku/testing/common_rake'
 
 Bundler::GemHelper.install_tasks
-RSpec::Core::RakeTask.new
 
 spec = eval(File.read('gaku_core.gemspec'))
 Gem::PackageTask.new(spec) do |p|

data/core/app/controllers/gaku/admin/disposals_controller.rb

@@ -8,74 +8,47 @@ module Gaku
     end
 
     def students
-      @students = Student.deleted
-                         .page(params[:page])
-                         .per(Preset.default_per_page)
+      @students = Disposal.students.page(params[:page])
     end
 
     def teachers
-      @teachers = Teacher.deleted
-                         .page(params[:page])
-                         .per(Preset.default_per_page)
+      @teachers = Disposal.teachers.page(params[:page])
     end
 
     def guardians
-      @guardians = Guardian.deleted
-                           .page(params[:page])
-                           .per(Preset.default_per_page)
+      @guardians = Disposal.guardians.page(params[:page])
     end
 
     def exams
-      @exams = Exam.deleted
-                   .page(params[:page])
-                   .per(Preset.default_per_page)
+      @exams = Disposal.exams.page(params[:page])
     end
 
     def course_groups
-      @course_groups = CourseGroup.deleted
-                                  .page(params[:page])
-                                  .per(Preset.default_per_page)
+      @course_groups = Disposal.course_groups.page(params[:page])
     end
 
     def attachments
-      @attachments = Attachment.includes(:attachable)
-                               .deleted
-                               .page(params[:page])
-                               .per(Preset.default_per_page)
+      @attachments = Disposal.attachments.page(params[:page])
+
     end
 
     def addresses
-      @student_addresses = Address.includes(:addressable, :country)
-                                  .deleted
-                                  .students
-                                  .page(params[:page])
-                                  .per(Preset.default_per_page)
-
-      @teacher_addresses = Address.includes(:addressable, :country)
-                                  .deleted
-                                  .teachers
-                                  .page(params[:page])
-                                  .per(Preset.default_per_page)
-
-      @students_count = Address.deleted.students.count
-      @teachers_count = Address.deleted.teachers.count
+      @student_addresses = Disposal.student_addresses.page(params[:page])
+      @teacher_addresses = Disposal.teacher_addresses.page(params[:page])
+      set_student_and_teacher_count('Gaku::Address')
     end
 
     def contacts
-      @student_contacts = Contact.includes(:contactable, :contact_type)
-                                 .deleted
-                                 .students
-                                 .page(params[:page])
-                                 .per(Preset.default_per_page)
+      @student_contacts = Disposal.student_contacts.page(params[:page])
+      @teacher_contacts = Disposal.teacher_contacts.page(params[:page])
+      set_student_and_teacher_count('Gaku::Contact')
+    end
 
-      @teacher_contacts = Contact.includes(:contactable, :contact_type)
-                                 .deleted
-                                 .teachers
-                                 .page(params[:page]).
-                                 per(Preset.default_per_page)
+    private
 
-      @students_count = Contact.deleted.students.count
-      @teachers_count = Contact.deleted.teachers.count
+    def set_student_and_teacher_count(klass)
+      @students_count = klass.constantize.deleted.students.count
+      @teachers_count = klass.constantize.deleted.teachers.count
     end
 
   end

data/core/app/controllers/gaku/exams_controller.rb

@@ -131,9 +131,9 @@ module Gaku
 
     def find_exams
       if params[:id] != nil
-        @exams = Exam.find_all_by_id(params[:id])
+        @exams = Exam.where(id: params[:id])
       else
-        @exams = @course.syllabus.exams.all
+        @exams = @course.syllabus.exams
       end
     end
   end

data/core/app/controllers/gaku/syllabuses/exams_controller.rb

@@ -37,7 +37,7 @@ module Gaku
     end
 
     def load_data
-      @grading_methods = GradingMethod.all.map { |s| [s.name, s.id] }
+      @grading_methods = GradingMethod.pluck(:name, :id)
     end
 
     def syllabus
@@ -45,7 +45,7 @@ module Gaku
     end
 
     def exam_syllabus
-      @exam_syllabus = ExamSyllabus.find_by_exam_id_and_syllabus_id(params[:id], params[:syllabus_id])
+      @exam_syllabus = ExamSyllabus.find_by(exam_id: params[:id], syllabus_id: params[:syllabus_id])
     end
 
 

data/core/app/models/gaku/address.rb

@@ -18,7 +18,7 @@ module Gaku
 
     default_scope -> { where(deleted: false) }
 
-    validates :address1, :country_id, :city, presence: true
+    validates :address1, :country, :city, presence: true
 
     accepts_nested_attributes_for :country
 

data/core/app/models/gaku/disposal.rb

@@ -0,0 +1,45 @@
+module Gaku
+  class Disposal
+
+    def self.students
+      Student.deleted
+    end
+
+    def self.teachers
+      Teacher.deleted
+    end
+
+    def self.guardians
+      Guardian.deleted
+    end
+
+    def self.exams
+      Exam.deleted
+    end
+
+    def self.course_groups
+      CourseGroup.deleted
+    end
+
+    def self.attachments
+      Attachment.includes(:attachable).deleted
+    end
+
+    def self.student_addresses
+      Address.includes(:addressable, :country).deleted.students
+    end
+
+    def self.teacher_addresses
+      Address.includes(:addressable, :country).deleted.teachers
+    end
+
+    def self.student_contacts
+      Contact.includes(:contactable, :contact_type).deleted.students
+    end
+
+    def self.teacher_contacts
+      Contact.includes(:contactable, :contact_type).deleted.teachers
+    end
+
+  end
+end

data/core/app/models/gaku/exam_portion.rb

@@ -78,7 +78,7 @@ module Gaku
     def refresh_positions
       exam_portions = exam.exam_portions
       exam_portions.pluck(:id).each_with_index do |id, index|
-        exam_portions.update_all({position: index}, {id: id})
+        exam_portions.where(id: id).update_all(position: index)
       end
     end
 

data/core/app/models/gaku/student.rb

@@ -78,11 +78,11 @@ module Gaku
     end
 
     def set_scholarship_status
-      self.scholarship_status = ScholarshipStatus.find_by_default(true)
+      self.scholarship_status = ScholarshipStatus.find_by(default: true)
     end
 
     def active
-      enrollment_status = EnrollmentStatus.find_by_code(enrollment_status_code)
+      enrollment_status = EnrollmentStatus.find_by(code: enrollment_status_code)
       if enrollment_status
         enrollment_status.active?
       else

data/core/app/models/gaku/user.rb

@@ -33,7 +33,7 @@ module Gaku
     end
 
     def role?(role)
-      !!self.roles.find_by_name(role.to_s.camelize)
+      !!self.roles.find_by(name: role.to_s.camelize)
     end
 
     private

data/core/app/models/gaku/versioning/student_version.rb

@@ -21,9 +21,9 @@ module Gaku::Versioning
         when 'enrollment_status_code'
           enrollment_status_code_change(key0, key1)
         when 'commute_method_type_id'
-          commute_method_change(key0, key1)
+          common_change('CommuteMethodType', key0, key1)
         when 'scholarship_status_id'
-          scholarship_status_change(key0, key1)
+          common_change('ScholarshipStatus', key0, key1)
         else
           @human_changes[key] = [key0, key1]
         end
@@ -38,16 +38,11 @@ module Gaku::Versioning
       @human_changes[:enrollment_status] = [from, to]
     end
 
-    def commute_method_change(key0, key1)
-      from = Gaku::CommuteMethodType.find(key0).to_s if key0
-      to = Gaku::CommuteMethodType.find(key1).to_s if key1
-      @human_changes[:commute_method_type] = [from, to]
-    end
-
-    def scholarship_status_change(key0, key1)
-      from = Gaku::ScholarshipStatus.find(key0).to_s if key0
-      to = Gaku::ScholarshipStatus.find(key1).to_s if key1
-      @human_changes[:scholarship_status] = [from, to]
+    def common_change(klass_name, key0, key1)
+      klass = "Gaku::#{klass_name}".constantize
+      from = klass.find(key0).to_s if key0
+      to = klass.find(key1).to_s if key1
+      @human_changes[klass_name.underscore.to_sym] = [from, to]
     end
 
   end

data/core/app/views/gaku/students/index.html.slim

@@ -6,7 +6,7 @@
       = print_count @count, t(:'student.list')
   .pull-right
     = ajax_link_to_new t(:'student.new'), new_student_path, id: "new-student-link"
-    = link_to_import t(:'import'), importer_index_path, id: "import-students-link"
+    = render 'gaku/shared/overrides/students/import_link'
 
 = content_for :new_form do
   #new-student.hide

data/core/app/views/gaku/syllabuses/index.html.slim

@@ -6,7 +6,7 @@
       = print_count @count, t_syllabus_list
   .pull-right
     = ajax_link_to_new t(:'syllabus.new'), [:new, :syllabus], id: "new-syllabus-link"
-    = button t(:'syllabus.import'), "syllabuses/importer", id: "import-syllabuses-link"
+    = render 'gaku/shared/overrides/syllabuses/import_link'
 
 = content_for :new_form do
   #new-syllabus.hide

data/core/config/initializers/active_record.rb

@@ -19,7 +19,7 @@ class ActiveRecord::Associations::HasManyThroughAssociation
   def delete_records(records, method)
     ensure_not_nested
 
-    scope = through_association.scoped.where(construct_join_attributes(*records))
+    scope = through_association.scope.where(construct_join_attributes(*records))
 
     case method
     when :destroy

data/core/config/routes.rb

@@ -1,7 +1,5 @@
 Gaku::Core::Engine.routes.draw do
 
-  mount Sidekiq::Web => '/sidekiq'
-
   concern :addressable do
     resources :addresses do
       member do
@@ -124,7 +122,6 @@ Gaku::Core::Engine.routes.draw do
     resources :exams, controller: 'syllabuses/exams'
     resources :exam_syllabuses, controller: 'syllabuses/exam_syllabuses'
     resources :notes
-    resources :importer, controller: 'syllabuses/importer'
   end
 
   resources :teachers, concerns: %i( addressable contactable ) do
@@ -150,12 +147,7 @@ Gaku::Core::Engine.routes.draw do
       get 'page/:page', action: :index
       get :load_autocomplete_data
 
-      resources :importer, controller: 'students/importer' do
-        collection do
-          get :get_roster
-          get :get_registration_roster
-        end
-      end
+
     end
 
     resources :simple_grades, controller: 'students/simple_grades'