clever 1.2.5 → 2.3.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2aa09c7aac824c85190007ac587d840a2a1a6405
4
- data.tar.gz: 5215165a0770691ab4cdd48e48c5d24cd8f94728
3
+ metadata.gz: eadea65a93fb58c3c03e4669c9eee742a4d0ca3b
4
+ data.tar.gz: 5cf08d8b4e9c9aa374b522e448ef867fc95db0f6
5
5
  SHA512:
6
- metadata.gz: 2eb28ef44305ad1b53cf35a9e182c5f8673b24aa14363a6c84ff8a70399ff4a3cdd0b918ee144399b00222ffdd41ed464a19304f4a591b2aa644b8e79c9cf0f2
7
- data.tar.gz: 9c518d83cda43403f90d35eef8c853b845584234dab8c6d8c7d846b02656b2238cbc3d311442115dc1cf41a9448827dee0cac2578b46a556742fcf98fb54c9c3
6
+ metadata.gz: 8d8ba0401e1c2076e71b8e633a53d2e388a72b1e4c1bd49ac01d1792e0801002c12d743578be42ba75deacd96355f80c5a4584a49aa6e40ca50e19352de6fed5
7
+ data.tar.gz: 55e3247234f4b6612f6ee9dd90c16773608b5c042042e323f562446341e5f8226cdd582a98c198814a3ad36b94d3c49eb60e1fc661cb55c47ec9e324af258dad
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- clever (1.2.5)
4
+ clever (2.3.0)
5
5
  faraday
6
6
  faraday_middleware
7
7
 
@@ -17,6 +17,7 @@ require 'clever/types/event'
17
17
  require 'clever/types/student'
18
18
  require 'clever/types/section'
19
19
  require 'clever/types/teacher'
20
+ require 'clever/types/term'
20
21
  require 'clever/types/token'
21
22
 
22
23
  module Clever
@@ -27,6 +28,7 @@ module Clever
27
28
  SECTIONS_ENDPOINT = '/v2.0/sections'
28
29
  TEACHERS_ENDPOINT = '/v2.0/teachers'
29
30
  EVENTS_ENDPOINT = '/v1.2/events'
31
+ TERMS_ENDPOINT = '/v2.0/terms'
30
32
  GRADES_ENDPOINT = 'https://grades-api.beta.clever.com/v1/grade'
31
33
 
32
34
  class DistrictNotFound < StandardError; end
@@ -54,7 +54,7 @@ module Clever
54
54
  Paginator.fetch(connection, endpoint, :get, Types::Event, client: self).force
55
55
  end
56
56
 
57
- %i(students courses teachers sections).each do |record_type|
57
+ %i(students courses teachers sections terms).each do |record_type|
58
58
  define_method(record_type) do |record_uids = []|
59
59
  authenticate
60
60
 
@@ -75,14 +75,21 @@ module Clever
75
75
 
76
76
  fetched_courses = courses
77
77
 
78
+ terms_hash = terms.each_with_object({}) { |term, terms| terms[term.uid] = term }
79
+
78
80
  sections.map do |section|
79
81
  course = fetched_courses.find { |clever_course| clever_course.uid == section.course }
82
+ term = terms_hash[section.term_id]
80
83
  Types::Classroom.new(
81
84
  'id' => section.uid,
82
85
  'name' => section.name,
83
86
  'period' => section.period,
84
87
  'course_number' => course&.number,
85
- 'grades' => section.grades
88
+ 'grades' => section.grades,
89
+ 'subjects' => section.subjects,
90
+ 'term_name' => term&.name,
91
+ 'term_start_date' => term&.start_date,
92
+ 'term_end_date' => term&.end_date
86
93
  )
87
94
  end
88
95
  end
@@ -129,7 +136,8 @@ module Clever
129
136
  section.teachers.each do |teacher_uid|
130
137
  enrollments[:teacher] << Types::Enrollment.new(
131
138
  'classroom_uid' => section.uid,
132
- 'user_uid' => teacher_uid
139
+ 'user_uid' => teacher_uid,
140
+ 'primary' => section.primary_teacher_uid == teacher_uid
133
141
  )
134
142
  end
135
143
  end
@@ -10,6 +10,14 @@ module Clever
10
10
  variables[key] = value
11
11
  end
12
12
  end
13
+
14
+ def presence(field)
15
+ field unless blank?(field)
16
+ end
17
+
18
+ def blank?(field)
19
+ field.nil? || field == ''
20
+ end
13
21
  end
14
22
  end
15
23
  end
@@ -8,15 +8,23 @@ module Clever
8
8
  :period,
9
9
  :course_number,
10
10
  :grades,
11
- :provider
11
+ :subjects,
12
+ :provider,
13
+ :term_name,
14
+ :term_start_date,
15
+ :term_end_date
12
16
 
13
17
  def initialize(attributes = {}, *)
14
- @uid = attributes['id']
15
- @name = attributes['name']
16
- @period = attributes['period']
17
- @course_number = attributes['course_number']
18
- @grades = attributes['grades']
19
- @provider = 'clever'
18
+ @uid = attributes['id']
19
+ @name = attributes['name']
20
+ @period = attributes['period']
21
+ @course_number = attributes['course_number']
22
+ @grades = attributes['grades']
23
+ @subjects = attributes['subjects']
24
+ @term_name = attributes['term_name']
25
+ @term_start_date = attributes['term_start_date']
26
+ @term_end_date = attributes['term_end_date']
27
+ @provider = 'clever'
20
28
  end
21
29
  end
22
30
  end
@@ -5,12 +5,14 @@ module Clever
5
5
  class Enrollment < Base
6
6
  attr_reader :classroom_uid,
7
7
  :user_uid,
8
- :provider
8
+ :provider,
9
+ :primary
9
10
 
10
11
  def initialize(attributes = {})
11
- @classroom_uid = attributes['classroom_uid']
12
- @user_uid = attributes['user_uid']
13
- @provider = 'clever'
12
+ @classroom_uid = attributes['classroom_uid']
13
+ @user_uid = attributes['user_uid']
14
+ @provider = 'clever'
15
+ @primary = attributes.dig('primary') || false
14
16
  end
15
17
  end
16
18
  end
@@ -8,19 +8,25 @@ module Clever
8
8
  :period,
9
9
  :course,
10
10
  :grades,
11
+ :subjects,
11
12
  :students,
12
13
  :teachers,
13
- :provider
14
+ :term_id,
15
+ :provider,
16
+ :primary_teacher_uid
14
17
 
15
18
  def initialize(attributes = {}, *)
16
- @uid = attributes['id']
17
- @name = attributes['name']
18
- @period = attributes['period']
19
- @course = attributes['course']
20
- @grades = attributes['grade']
21
- @students = attributes['students']
22
- @teachers = attributes['teachers']
23
- @provider = 'clever'
19
+ @uid = attributes['id']
20
+ @name = attributes['name']
21
+ @period = attributes['period']
22
+ @course = attributes['course']
23
+ @grades = [presence(attributes['grade'])].compact
24
+ @subjects = [presence(attributes['subject'])].compact
25
+ @students = attributes['students']
26
+ @teachers = attributes['teachers']
27
+ @term_id = attributes['term_id']
28
+ @provider = 'clever'
29
+ @primary_teacher_uid = attributes['teacher']
24
30
  end
25
31
  end
26
32
  end
@@ -37,14 +37,6 @@ module Clever
37
37
 
38
38
  private
39
39
 
40
- def presence(field)
41
- field unless blank?(field)
42
- end
43
-
44
- def blank?(field)
45
- field.nil? || field == ''
46
- end
47
-
48
40
  def username_from(username_source)
49
41
  return if blank?(username_source)
50
42
 
@@ -0,0 +1,19 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Clever
4
+ module Types
5
+ class Term < Base
6
+ attr_reader :uid,
7
+ :name,
8
+ :start_date,
9
+ :end_date
10
+
11
+ def initialize(attributes = {}, *)
12
+ @uid = attributes['id']
13
+ @name = attributes['name']
14
+ @start_date = attributes['start_date']
15
+ @end_date = attributes['end_date']
16
+ end
17
+ end
18
+ end
19
+ end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Clever
4
- VERSION = '1.2.5'
4
+ VERSION = '2.3.0'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: clever
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.5
4
+ version: 2.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Robert Julius
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-05-15 00:00:00.000000000 Z
11
+ date: 2020-08-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday
@@ -200,6 +200,7 @@ files:
200
200
  - lib/clever/types/section.rb
201
201
  - lib/clever/types/student.rb
202
202
  - lib/clever/types/teacher.rb
203
+ - lib/clever/types/term.rb
203
204
  - lib/clever/types/token.rb
204
205
  - lib/clever/version.rb
205
206
  homepage: https://github.com/tci/clever
@@ -223,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
223
224
  version: '0'
224
225
  requirements: []
225
226
  rubyforge_project:
226
- rubygems_version: 2.6.11
227
+ rubygems_version: 2.6.13
227
228
  signing_key:
228
229
  specification_version: 4
229
230
  summary: Wrapper for the Clever API.