gaku_core 0.1.1 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (195) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/gaku/core_controller.rb +3 -8
  3. data/app/decorators/gaku/course_decorator.rb +1 -2
  4. data/app/decorators/gaku/guardian_decorator.rb +1 -1
  5. data/app/decorators/gaku/person_decorator.rb +8 -12
  6. data/app/decorators/gaku/student_decorator.rb +0 -2
  7. data/app/decorators/gaku/teacher_decorator.rb +1 -1
  8. data/app/models/concerns/addresses.rb +6 -6
  9. data/app/models/concerns/contacts.rb +6 -6
  10. data/app/models/concerns/enrollmentable.rb +9 -0
  11. data/app/models/concerns/gradable.rb +14 -0
  12. data/app/models/concerns/notes.rb +1 -2
  13. data/app/models/concerns/pagination.rb +1 -2
  14. data/app/models/concerns/person.rb +0 -2
  15. data/app/models/concerns/picture.rb +1 -3
  16. data/app/models/concerns/semesterable.rb +12 -0
  17. data/app/models/concerns/student_reviewable.rb +7 -0
  18. data/app/models/gaku/ability.rb +2 -4
  19. data/app/models/gaku/address.rb +11 -10
  20. data/app/models/gaku/admin_ability.rb +0 -1
  21. data/app/models/gaku/assignment.rb +0 -2
  22. data/app/models/gaku/assignment_score.rb +0 -1
  23. data/app/models/gaku/attachment.rb +1 -4
  24. data/app/models/gaku/attendance.rb +0 -2
  25. data/app/models/gaku/attendance_type.rb +0 -2
  26. data/app/models/gaku/badge.rb +0 -2
  27. data/app/models/gaku/badge_type.rb +0 -1
  28. data/app/models/gaku/class_group.rb +13 -13
  29. data/app/models/gaku/commute_method_type.rb +0 -2
  30. data/app/models/gaku/contact.rb +6 -36
  31. data/app/models/gaku/contact_type.rb +0 -2
  32. data/app/models/gaku/country.rb +0 -3
  33. data/app/models/gaku/course.rb +11 -25
  34. data/app/models/gaku/course_group.rb +0 -2
  35. data/app/models/gaku/course_group_enrollment.rb +3 -4
  36. data/app/models/gaku/department.rb +0 -2
  37. data/app/models/gaku/enrollment.rb +85 -0
  38. data/app/models/gaku/enrollment_status.rb +0 -2
  39. data/app/models/gaku/exam.rb +17 -22
  40. data/app/models/gaku/exam_portion.rb +2 -6
  41. data/app/models/gaku/exam_portion_score.rb +0 -2
  42. data/app/models/gaku/exam_schedule.rb +0 -1
  43. data/app/models/gaku/exam_session.rb +14 -0
  44. data/app/models/gaku/exam_syllabus.rb +2 -6
  45. data/app/models/gaku/external_school_record.rb +1 -9
  46. data/app/models/gaku/extracurricular_activity.rb +1 -2
  47. data/app/models/gaku/faculty.rb +0 -2
  48. data/app/models/gaku/grading_method.rb +14 -2
  49. data/app/models/gaku/grading_method_connector.rb +35 -0
  50. data/app/models/gaku/grading_method_set.rb +6 -4
  51. data/app/models/gaku/grading_method_set_item.rb +4 -5
  52. data/app/models/gaku/guardian.rb +1 -3
  53. data/app/models/gaku/install.rb +0 -2
  54. data/app/models/gaku/lesson.rb +0 -1
  55. data/app/models/gaku/lesson_plan.rb +0 -2
  56. data/app/models/gaku/level.rb +0 -2
  57. data/app/models/gaku/preset.rb +18 -18
  58. data/app/models/gaku/program.rb +0 -2
  59. data/app/models/gaku/program_level.rb +0 -2
  60. data/app/models/gaku/program_specialty.rb +0 -2
  61. data/app/models/gaku/program_syllabus.rb +0 -2
  62. data/app/models/gaku/role.rb +0 -2
  63. data/app/models/gaku/schedule.rb +0 -1
  64. data/app/models/gaku/scholarship_status.rb +0 -2
  65. data/app/models/gaku/school.rb +0 -2
  66. data/app/models/gaku/school_role.rb +0 -2
  67. data/app/models/gaku/school_year.rb +4 -2
  68. data/app/models/gaku/semester.rb +21 -6
  69. data/app/models/gaku/semester_attendance.rb +14 -0
  70. data/app/models/gaku/semester_connector.rb +27 -0
  71. data/app/models/gaku/simple_grade.rb +0 -2
  72. data/app/models/gaku/simple_grade_type.rb +0 -1
  73. data/app/models/gaku/specialty.rb +0 -2
  74. data/app/models/gaku/state.rb +0 -3
  75. data/app/models/gaku/student.rb +47 -45
  76. data/app/models/gaku/student_exam_session.rb +11 -0
  77. data/app/models/gaku/student_guardian.rb +0 -2
  78. data/app/models/gaku/student_review.rb +11 -0
  79. data/app/models/gaku/student_review_category.rb +13 -0
  80. data/app/models/gaku/student_specialty.rb +2 -5
  81. data/app/models/gaku/syllabus.rb +0 -4
  82. data/app/models/gaku/teacher.rb +0 -2
  83. data/app/models/gaku/template.rb +7 -9
  84. data/app/models/gaku/user.rb +10 -22
  85. data/app/models/gaku/user_role.rb +0 -2
  86. data/app/services/gaku/contact_creation.rb +49 -0
  87. data/app/services/gaku/contact_updation.rb +41 -0
  88. data/app/services/gaku/student_selection.rb +57 -0
  89. data/app/services/gaku/user_creator.rb +31 -0
  90. data/config/initializers/devise.rb +1 -1
  91. data/config/initializers/redis.rb +5 -0
  92. data/config/locales/en.yml +79 -15
  93. data/config/routes.rb +5 -10
  94. data/db/default/gaku/attendance_types.rb +14 -16
  95. data/db/default/gaku/commute_method_types.rb +2 -4
  96. data/db/default/gaku/enrollment_status.rb +3 -3
  97. data/db/default/gaku/master_school.rb +7 -6
  98. data/db/default/gaku/presets.rb +6 -9
  99. data/db/default/gaku/scholarship_statuses.rb +1 -1
  100. data/db/migrate/20140128141752_change_grading_methods_arguments_field.rb +5 -0
  101. data/db/migrate/20140213113405_create_grading_method_connectors_table.rb +9 -0
  102. data/db/migrate/20140304094422_create_gaku_exam_sessions_table.rb +10 -0
  103. data/db/migrate/20140304101025_create_gaku_student_exam_session_table.rb +8 -0
  104. data/db/migrate/20140325073941_add_time_format_24_to_presets_table.rb +5 -0
  105. data/db/migrate/20140408111314_remove_semester_join_tables.rb +6 -0
  106. data/db/migrate/20140408111358_create_semester_connectors_table.rb +8 -0
  107. data/db/migrate/20140423093155_create_enrollments_table.rb +11 -0
  108. data/db/migrate/20140423100114_clean_enrollments_join_models.rb +8 -0
  109. data/db/migrate/20140429112725_add_counters_to_enrollmentable.rb +11 -0
  110. data/db/migrate/20140604104210_rename_method_to_grading_method.rb +5 -0
  111. data/db/migrate/20140604113045_add_default_value_to_curved.rb +5 -0
  112. data/db/migrate/20140610091053_add_seat_number_to_enrollments.rb +5 -0
  113. data/db/migrate/20140701104700_change_hstore_to_string_criteria.rb +5 -0
  114. data/db/migrate/20140715135152_create_semester_attendance_table.rb +16 -0
  115. data/db/migrate/20140718105226_create_student_review_categories_table.rb +13 -0
  116. data/db/migrate/20140728121353_create_student_review_table.rb +12 -0
  117. data/db/seeds.rb +1 -1
  118. data/lib/gaku/core.rb +2 -1
  119. data/lib/gaku/core/engine.rb +7 -5
  120. data/lib/gaku/core/url_helpers.rb +1 -1
  121. data/lib/gaku/grading/collection/base_method.rb +30 -0
  122. data/lib/gaku/grading/collection/calculations.rb +36 -0
  123. data/lib/gaku/grading/collection/interval.rb +55 -0
  124. data/lib/gaku/grading/collection/ordinal.rb +10 -0
  125. data/lib/gaku/grading/collection/percentage.rb +10 -0
  126. data/lib/gaku/grading/collection/result.rb +18 -0
  127. data/lib/gaku/grading/collection/score.rb +10 -0
  128. data/lib/gaku/grading/single/base_method.rb +30 -0
  129. data/lib/gaku/grading/single/calculations.rb +42 -0
  130. data/lib/gaku/grading/single/interval.rb +7 -0
  131. data/lib/gaku/grading/single/ordinal.rb +30 -0
  132. data/lib/gaku/grading/single/pass_fail.rb +2 -0
  133. data/lib/gaku/grading/single/percentage.rb +26 -0
  134. data/lib/gaku/grading/single/ratio.rb +2 -0
  135. data/lib/gaku/grading/single/result.rb +18 -0
  136. data/lib/gaku/grading/single/score.rb +15 -0
  137. data/lib/gaku/migrations.rb +1 -1
  138. data/lib/gaku/streamer/sse.rb +5 -5
  139. data/lib/gaku/testing/auth_helpers.rb +6 -2
  140. data/lib/gaku/testing/common_rake.rb +9 -3
  141. data/lib/gaku/testing/controller_helpers.rb +17 -12
  142. data/lib/gaku/testing/coverage.rb +1 -1
  143. data/lib/gaku/testing/deferred_garbage_collection.rb +3 -3
  144. data/lib/gaku/testing/factories/attachment_factory.rb +0 -1
  145. data/lib/gaku/testing/factories/attendance_type_factory.rb +1 -1
  146. data/lib/gaku/testing/factories/class_group_factory.rb +12 -1
  147. data/lib/gaku/testing/factories/contact_creation_factory.rb +18 -0
  148. data/lib/gaku/testing/factories/course_enrollment_factory.rb +9 -9
  149. data/lib/gaku/testing/factories/course_factory.rb +2 -4
  150. data/lib/gaku/testing/factories/course_group_factory.rb +2 -4
  151. data/lib/gaku/testing/factories/enrollment_factory.rb +10 -0
  152. data/lib/gaku/testing/factories/exam_factory.rb +1 -1
  153. data/lib/gaku/testing/factories/exam_portion_factory.rb +2 -4
  154. data/lib/gaku/testing/factories/exam_score_factory.rb +1 -1
  155. data/lib/gaku/testing/factories/exam_session_factory.rb +14 -0
  156. data/lib/gaku/testing/factories/extracurricular_activity_factory.rb +1 -1
  157. data/lib/gaku/testing/factories/grading_method_connector_factory.rb +11 -0
  158. data/lib/gaku/testing/factories/grading_method_factory.rb +3 -2
  159. data/lib/gaku/testing/factories/guardian_factory.rb +2 -4
  160. data/lib/gaku/testing/factories/lesson_plan_factory.rb +2 -2
  161. data/lib/gaku/testing/factories/preset_factory.rb +7 -7
  162. data/lib/gaku/testing/factories/program_factory.rb +0 -1
  163. data/lib/gaku/testing/factories/school_factory.rb +3 -3
  164. data/lib/gaku/testing/factories/semester_attendance_factory.rb +8 -0
  165. data/lib/gaku/testing/factories/semester_connectors_factory.rb +11 -0
  166. data/lib/gaku/testing/factories/semester_factory.rb +16 -0
  167. data/lib/gaku/testing/factories/simple_grade_type_factory.rb +1 -1
  168. data/lib/gaku/testing/factories/state_factory.rb +2 -1
  169. data/lib/gaku/testing/factories/student_exam_session_factory.rb +8 -0
  170. data/lib/gaku/testing/factories/student_factory.rb +15 -5
  171. data/lib/gaku/testing/factories/student_review_category_factory.rb +7 -0
  172. data/lib/gaku/testing/factories/student_review_factory.rb +13 -0
  173. data/lib/gaku/testing/factories/teacher_factory.rb +1 -1
  174. data/lib/gaku/testing/factories/template_factory.rb +5 -7
  175. data/lib/gaku/testing/factories/traits.rb +32 -4
  176. data/lib/gaku/testing/factories/user_factory.rb +0 -1
  177. data/lib/gaku_core.rb +1 -1
  178. data/lib/generators/gaku/dummy/dummy_generator.rb +5 -4
  179. data/lib/generators/gaku/install/install_generator.rb +16 -14
  180. data/lib/tasks/admin_user.rake +2 -1
  181. metadata +310 -264
  182. data/app/models/gaku/class_group_course_enrollment.rb +0 -17
  183. data/app/models/gaku/class_group_enrollment.rb +0 -31
  184. data/app/models/gaku/course_enrollment.rb +0 -23
  185. data/app/models/gaku/disposal.rb +0 -45
  186. data/app/models/gaku/extracurricular_activity_enrollment.rb +0 -15
  187. data/app/models/gaku/semester_class_group.rb +0 -21
  188. data/app/models/gaku/semester_course.rb +0 -21
  189. data/lib/gaku/grading/calculations.rb +0 -279
  190. data/lib/gaku/grading/grade.rb +0 -17
  191. data/lib/gaku/grading/japanese_hs_standard.rb +0 -8
  192. data/lib/gaku/testing/factories/class_group_course_enrollment_factory.rb +0 -8
  193. data/lib/gaku/testing/factories/class_group_enrollment_factory.rb +0 -9
  194. data/lib/gaku/testing/factories/semester_class_group_factory.rb +0 -8
  195. data/lib/gaku/testing/factories/semester_course.rb +0 -8
@@ -0,0 +1,36 @@
1
+ module Gaku
2
+ module Grading
3
+ module Collection
4
+ class Calculations
5
+
6
+ attr_reader :grading_methods, :students, :exam
7
+
8
+ def initialize(grading_method, students, exam)
9
+ @exam = exam
10
+ @students = students
11
+ @grading_methods = grading_method
12
+ end
13
+
14
+ def calculate
15
+ {}.tap do |hash|
16
+ @grading_methods.each do |grading_method|
17
+ grading = grading_types[grading_method.grading_type].constantize.new(@exam, @students, grading_method.criteria)
18
+ hash[grading_method.id] = grading.grade
19
+ end
20
+ end
21
+ end
22
+
23
+ private
24
+
25
+ def grading_types
26
+ ActiveSupport::HashWithIndifferentAccess.new(
27
+ score: 'Gaku::Grading::Collection::Score',
28
+ percentage: 'Gaku::Grading::Collection::Percentage',
29
+ ordinal: 'Gaku::Grading::Collection::Ordinal',
30
+ interval: 'Gaku::Grading::Collection::Interval'
31
+ )
32
+ end
33
+ end
34
+ end
35
+ end
36
+ end
@@ -0,0 +1,55 @@
1
+ class Gaku::Grading::Collection::Interval < Gaku::Grading::Collection::BaseMethod
2
+
3
+ def grade_exam
4
+
5
+ @scores = students_with_scores
6
+
7
+ formated_student_results.each do |student|
8
+ @result << Gaku::Grading::Single::Interval.new(@gradable, student).grade_exam
9
+ end
10
+
11
+ @result
12
+ end
13
+
14
+ private
15
+
16
+ def student_positions
17
+ criteria.map {|key, value| [key, ( @scores.count * (value.to_f/100)).ceil] }.to_h
18
+ end
19
+
20
+ def students_by_score
21
+ @scores.group_by(&:last).sort.reverse.map{|a| a.last.map(&:first)}
22
+ end
23
+
24
+
25
+ def interval_results
26
+ @students_by_score = students_by_score
27
+ student_positions.each_with_object(Hash.new{|h, k| h[k] = []}) do |( key, value), hash|
28
+
29
+ while value > hash[key].length
30
+ break if @students_by_score.empty?
31
+ hash[key].push(*@students_by_score.shift)
32
+ end
33
+
34
+ end
35
+ end
36
+
37
+ def score_results
38
+ Gaku::Grading::Collection::Score.new(@gradable, @students).grade
39
+ end
40
+
41
+ def students_with_scores
42
+ score_results['student_results'].each_with_object({}) do |student_result, h|
43
+ h[student_result['id']] = student_result['score']
44
+ end.reject {|_student_id, score| score.nil? }
45
+ end
46
+
47
+ def students_without_scores
48
+ score_results['student_results'].select {|results| results['score'].nil? }.map {|x| [x['id'], x['score']]}
49
+ end
50
+
51
+ def formated_student_results
52
+ interval_results.flat_map {|k, v| v.map { |x| [x, k] } }.push *students_without_scores
53
+ end
54
+
55
+ end
@@ -0,0 +1,10 @@
1
+ class Gaku::Grading::Collection::Ordinal < Gaku::Grading::Collection::BaseMethod
2
+
3
+ def grade_exam
4
+ @students.each do |student|
5
+ @result << Gaku::Grading::Single::Ordinal.new(@gradable, student, criteria).grade_exam
6
+ end
7
+ @result
8
+ end
9
+
10
+ end
@@ -0,0 +1,10 @@
1
+ class Gaku::Grading::Collection::Percentage < Gaku::Grading::Collection::BaseMethod
2
+
3
+ def grade_exam
4
+ @students.each do |student|
5
+ @result << Gaku::Grading::Single::Percentage.new(@gradable, student).grade_exam
6
+ end
7
+ @result
8
+ end
9
+
10
+ end
@@ -0,0 +1,18 @@
1
+ module Gaku
2
+ module Grading
3
+ module Collection
4
+ class Result
5
+
6
+ def initialize(exam_id, result)
7
+ @exam_id = exam_id
8
+ @result = result
9
+ end
10
+
11
+ def as_json
12
+ { exam_id: @exam_id, student_results: @result }.as_json
13
+ end
14
+
15
+ end
16
+ end
17
+ end
18
+ end
@@ -0,0 +1,10 @@
1
+ class Gaku::Grading::Collection::Score < Gaku::Grading::Collection::BaseMethod
2
+
3
+ def grade_exam
4
+ @students.each do |student|
5
+ @result << Gaku::Grading::Single::Score.new(@gradable, student).grade_exam
6
+ end
7
+ @result
8
+ end
9
+
10
+ end
@@ -0,0 +1,30 @@
1
+ module Gaku
2
+ module Grading
3
+ module Single
4
+ class BaseMethod
5
+ attr_reader :gradable, :gradable_type, :student, :criteria, :result
6
+
7
+ # Pass a gradable object [exam or assignment] and students
8
+ def initialize(gradable, student, criteria = nil)
9
+ @gradable = gradable
10
+ @student = student
11
+ @criteria = criteria
12
+ @result = {}
13
+ end
14
+
15
+ # Obtain graded hash of results
16
+ def grade
17
+ case @gradable
18
+ when Gaku::Exam
19
+ grade_exam
20
+ when Gaku::Assignment
21
+ #grade_assignment
22
+ end
23
+
24
+ Gaku::Grading::Single::Result.new(@gradable.id, @result).as_json
25
+ end
26
+
27
+ end
28
+ end
29
+ end
30
+ end
@@ -0,0 +1,42 @@
1
+ module Gaku
2
+ module Grading
3
+ module Single
4
+ class Calculations
5
+
6
+ attr_reader :grading_methods, :student, :exam, :collection_students
7
+
8
+ def initialize(grading_methods, student, exam, collection_students = nil)
9
+ @exam = exam
10
+ @student = student
11
+ @grading_methods = grading_methods
12
+ @collection_students = collection_students
13
+ end
14
+
15
+ def calculate
16
+ {}.tap do |hash|
17
+ @grading_methods.each do |grading_method|
18
+ if grading_method.interval?
19
+ grading = Gaku::Grading::Collection::Interval.new(@exam, collection_students, grading_method.criteria )
20
+ hash[grading_method.id] = grading.grade
21
+ else
22
+ grading = grading_types[grading_method.grading_type].constantize.new(@exam, @student, grading_method.criteria)
23
+ hash[grading_method.id] = grading.grade
24
+ end
25
+ end
26
+ end
27
+
28
+ end
29
+
30
+ private
31
+
32
+ def grading_types
33
+ ActiveSupport::HashWithIndifferentAccess.new(
34
+ score: 'Gaku::Grading::Single::Score',
35
+ percentage: 'Gaku::Grading::Single::Percentage',
36
+ ordinal: 'Gaku::Grading::Single::Ordinal'
37
+ )
38
+ end
39
+ end
40
+ end
41
+ end
42
+ end
@@ -0,0 +1,7 @@
1
+ class Gaku::Grading::Single::Interval < Gaku::Grading::Single::BaseMethod
2
+
3
+ def grade_exam
4
+ @result = { id: student.first, score: student.last }
5
+ end
6
+
7
+ end
@@ -0,0 +1,30 @@
1
+ class Gaku::Grading::Single::Ordinal < Gaku::Grading::Single::BaseMethod
2
+
3
+ attr_accessor :criteria
4
+
5
+ def grade_exam
6
+ exam = @gradable
7
+
8
+ percentage = Gaku::Grading::Single::Percentage.new(exam, @student).grade
9
+ @result = { id: @student.id, score: ordinal(percentage['score']) }
10
+ end
11
+
12
+ private
13
+
14
+ def ordinal(percentage)
15
+ if percentage
16
+ criteria.sort_by(&:last).reverse.find do |grade, min_points|
17
+ percentage >= min_points.to_i
18
+ end.first
19
+ end
20
+ end
21
+
22
+ def criteria
23
+ if @criteria.values.include? '0'
24
+ @criteria
25
+ else
26
+ @criteria.merge('' => '0')
27
+ end
28
+ end
29
+
30
+ end
@@ -0,0 +1,2 @@
1
+ class Gaku::Grading::Single::PassFail < Gaku::Grading::Single::BaseMethod
2
+ end
@@ -0,0 +1,26 @@
1
+ class Gaku::Grading::Single::Percentage < Gaku::Grading::Single::BaseMethod
2
+
3
+ attr_reader :scores
4
+
5
+ def grade_exam
6
+ exam = @gradable
7
+
8
+ @scores = []
9
+ @max_score = exam.max_score
10
+
11
+ exam.exam_portions.each_with_index do |exam_portion, index|
12
+ ep_score = @student.exam_portion_scores.where(exam_portion_id: exam_portion.id).first_or_create!
13
+ @scores << ep_score.score if ep_score.score
14
+ end
15
+
16
+ @result = { id: @student.id, score: formated_score }
17
+ end
18
+
19
+ def score
20
+ @scores.inject(:+) / @max_score unless @scores.blank?
21
+ end
22
+
23
+ def formated_score
24
+ score.try(:*, 100).try(:round, 3)
25
+ end
26
+ end
@@ -0,0 +1,2 @@
1
+ class Gaku::Grading::Single::Ratio < Gaku::Grading::Single::BaseMethod
2
+ end
@@ -0,0 +1,18 @@
1
+ module Gaku
2
+ module Grading
3
+ module Single
4
+ class Result
5
+
6
+ def initialize(exam_id, result)
7
+ @exam_id = exam_id
8
+ @result = result
9
+ end
10
+
11
+ def as_json
12
+ @result.merge(exam_id: @exam_id).as_json
13
+ end
14
+
15
+ end
16
+ end
17
+ end
18
+ end
@@ -0,0 +1,15 @@
1
+ class Gaku::Grading::Single::Score < Gaku::Grading::Single::BaseMethod
2
+
3
+ def grade_exam
4
+ @score = nil
5
+ exam = @gradable
6
+
7
+ exam.exam_portions.each_with_index do |exam_portion, index|
8
+ ep_score = @student.exam_portion_scores.where(exam_portion_id: exam_portion.id).first_or_create!
9
+ @score = @score.to_f + ep_score.score if ep_score.score
10
+ end
11
+
12
+ @result = { id: @student.id, score: @score }
13
+ end
14
+
15
+ end
@@ -1,7 +1,7 @@
1
1
  module Gaku
2
2
  module Migrations
3
3
 
4
- def self.included(base)
4
+ def self.included(_base)
5
5
  ActiveRecord::ConnectionAdapters::Table.send :include, TableDefinition
6
6
  ActiveRecord::ConnectionAdapters::TableDefinition.send :include, TableDefinition
7
7
  end
@@ -1,15 +1,15 @@
1
- #change SSE.new with rails SSE object when is released
2
- #https://github.com/rails/rails/blob/master/actionpack/lib/action_controller/metal/live.rb
1
+ # change SSE.new with rails SSE object when is released
2
+ # https://github.com/rails/rails/blob/master/actionpack/lib/action_controller/metal/live.rb
3
3
  require 'json'
4
4
 
5
5
  module Streamer
6
6
  class SSE
7
- def initialize io
7
+ def initialize(io)
8
8
  @io = io
9
9
  end
10
10
 
11
- def write object, options = {}
12
- options.each do |k,v|
11
+ def write(object, options = {})
12
+ options.each do |k, v|
13
13
  @io.write "#{k}: #{v}\n"
14
14
  end
15
15
  @io.write "data: #{object}\n\n"
@@ -12,7 +12,11 @@ module Gaku::Testing::AuthHelpers
12
12
 
13
13
  module Feature
14
14
  def as(user)
15
- login_as create("#{user.to_sym}_user"), scope: :user
15
+ if user.is_a?(Symbol)
16
+ login_as create("#{user.to_sym}_user"), scope: :user
17
+ else
18
+ login_as user, scope: :user
19
+ end
16
20
  end
17
21
  end
18
22
 
@@ -20,6 +24,6 @@ end
20
24
 
21
25
  RSpec.configure do |config|
22
26
  config.include Gaku::Testing::AuthHelpers::Controller, type: :controller
27
+ config.include Gaku::Testing::AuthHelpers::Feature, type: :request
23
28
  config.include Gaku::Testing::AuthHelpers::Feature, type: :feature
24
29
  end
25
-
@@ -4,19 +4,25 @@ end
4
4
 
5
5
  desc 'Generates a dummy app for testing'
6
6
  namespace :common do
7
- task :test_app do |t, args|
7
+ task :test_app do
8
8
 
9
9
  require "#{ENV['LIB_NAME']}"
10
10
 
11
11
  puts ENV['LIB_NAME']
12
12
 
13
13
  Gaku::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--quiet']
14
- Gaku::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--auto-accept', '--migrate=false', '--seed=false', '--sample=false', '--quiet']
14
+ Gaku::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}",
15
+ '--auto-accept',
16
+ '--migrate=false',
17
+ '--seed=false',
18
+ '--sample=false',
19
+ '--quiet'
20
+ ]
15
21
 
16
22
  puts 'Setting up dummy database...'
17
23
  cmd = 'bundle exec rake db:drop db:create db:migrate db:test:prepare RAILS_ENV=test'
18
24
 
19
- if RUBY_PLATFORM =~ /mswin/ #windows
25
+ if RUBY_PLATFORM =~ /mswin/ # windows
20
26
  cmd += ' >nul'
21
27
  else
22
28
  cmd += ' >/dev/null'
@@ -1,7 +1,13 @@
1
1
  module Gaku::Testing::ControllerHelpers
2
2
 
3
+ extend ActiveSupport::Concern
4
+
5
+ included do
6
+ routes { ::Gaku::Core::Engine.routes }
7
+ end
8
+
3
9
  def gaku_get(action, parameters = nil, session = nil, flash = nil)
4
- process_gaku_action(action,'GET', parameters, session, flash)
10
+ process_gaku_action(action, 'GET', parameters, session, flash)
5
11
  end
6
12
 
7
13
  def gaku_post(action, parameters = nil, session = nil, flash = nil)
@@ -49,47 +55,46 @@ module Gaku::Testing::ControllerHelpers
49
55
  end
50
56
 
51
57
  def ensure_not_found
52
- expect(json_response).to eq({ 'error' => 'The resource you were looking for could not be found.' })
58
+ expect(json_response).to eq('error' => 'The resource you were looking for could not be found.')
53
59
  expect(response.status).to eq 404
54
60
  end
55
61
 
56
62
  def ensure_unauthorized
57
- expect(json_response).to eq({ 'error' => 'You need to sign in or sign up before continuing.' })
63
+ expect(json_response).to eq('error' => 'You need to sign in or sign up before continuing.')
58
64
  expect(response.status).to eq 401
59
65
  end
60
66
 
61
- def api_get(action, params={}, session=nil, flash=nil)
67
+ def api_get(action, params = {}, session = nil, flash = nil)
62
68
  api_process(action, params, session, flash, 'GET')
63
69
  end
64
70
 
65
- def api_post(action, params={}, session=nil, flash=nil)
71
+ def api_post(action, params = {}, session = nil, flash = nil)
66
72
  api_process(action, params, session, flash, 'POST')
67
73
  end
68
74
 
69
- def api_put(action, params={}, session=nil, flash=nil)
75
+ def api_put(action, params = {}, session = nil, flash = nil)
70
76
  api_process(action, params, session, flash, 'PUT')
71
77
  end
72
78
 
73
- def api_delete(action, params={}, session=nil, flash=nil)
79
+ def api_delete(action, params = {}, session = nil, flash = nil)
74
80
  api_process(action, params, session, flash, 'DELETE')
75
81
  end
76
82
 
77
- def api_process(action, params={}, session=nil, flash=nil, method='get')
83
+ def api_process(action, params = {}, session = nil, flash = nil, method = 'get')
78
84
  scoping = respond_to?(:resource_scoping) ? resource_scoping : {}
79
85
  process(action, method, params.merge(scoping).reverse_merge!(format: :json, use_route: :gaku), session, flash)
80
86
  end
81
87
 
82
88
  private
83
89
 
84
- def process_gaku_action(action, method = 'GET' ,parameters = nil, session = nil, flash = nil)
90
+ def process_gaku_action(action, method = 'GET', parameters = nil, session = nil, flash = nil)
85
91
  parameters ||= {}
86
- process(action, method, parameters.merge!(use_route: :gaku), session, flash)
92
+ process(action, method, parameters, session, flash)
87
93
  end
88
94
 
89
- def process_js_gaku_action(action, method = 'GET' ,parameters = nil, session = nil, flash = nil)
95
+ def process_js_gaku_action(action, method = 'GET', parameters = nil, session = nil, flash = nil)
90
96
  parameters ||= {}
91
97
  parameters.reverse_merge!(format: :js)
92
- parameters.merge!(use_route: :gaku)
93
98
  xml_http_request(method, action, parameters, session, flash)
94
99
  end
95
100