clever 2.0.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afa9a572f90c44164b42ee5c3d61522f119f2038
-  data.tar.gz: 13046566c22e54742f43f4a6e2b92a401469b442
+  metadata.gz: 2ff0b41f8f5609493aaf2935de074f048f4deb32
+  data.tar.gz: 0630556066c95480e23759940dc631369deef2e9
 SHA512:
-  metadata.gz: c49230be4ad472948ecf37f740961d709039c54aae2c1b776ef5bb93b593ba9d4377bdc9c5ddf59cdce4130600f76e0f43d55d3c54792a4e2e41ceac9a6a2a6d
-  data.tar.gz: 1587fcfbb2685a93c115e04f1a92947a5607df94dbfb7baf69203be3cd6403e2ef74e406ecab215dd7732e837d4e25ea84a164e2c56c7fab6b63dad9c7dbccac
+  metadata.gz: c469ccfd3a5e2eef2575686cd2704822cba36532a458b9910e87bbb908ce6df7cce0ab58acf78fe5afb92902706920d3cdaa3ca22ab2e8e65934dec7e4a34e61
+  data.tar.gz: dbb555be80c9b63fc4c2d1600dd0e6906a36a1c69de88817c92eed90904a2d219fb3c4501c7548c3fb1226526aab75ab06abfc67eb7e80c690399fbefd528a44

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clever (2.0.1)
+    clever (2.3.2)
       faraday
       faraday_middleware
 

data/lib/clever/client.rb

@@ -3,7 +3,7 @@
 module Clever
   class Client
     attr_accessor :app_id, :app_token, :sync_id, :logger,
-                  :vendor_key, :vendor_secret, :username_source
+                  :vendor_key, :vendor_secret, :username_source, :staff_username_source
 
     attr_reader :api_url, :tokens_endpoint
 
@@ -86,6 +86,7 @@ module Clever
           'period' => section.period,
           'course_number' => course&.number,
           'grades' => section.grades,
+          'subjects' => section.subjects,
           'term_name' => term&.name,
           'term_start_date' => term&.start_date,
           'term_end_date' => term&.end_date
@@ -135,7 +136,8 @@ module Clever
       section.teachers.each do |teacher_uid|
         enrollments[:teacher] << Types::Enrollment.new(
           'classroom_uid' => section.uid,
-          'user_uid' => teacher_uid
+          'user_uid' => teacher_uid,
+          'primary' => section.primary_teacher_uid == teacher_uid
         )
       end
     end

data/lib/clever/types/base.rb

@@ -10,6 +10,14 @@ module Clever
           variables[key] = value
         end
       end
+
+      def presence(field)
+        field unless blank?(field)
+      end
+
+      def blank?(field)
+        field.nil? || field == ''
+      end
     end
   end
 end

data/lib/clever/types/classroom.rb

@@ -8,6 +8,7 @@ module Clever
                   :period,
                   :course_number,
                   :grades,
+                  :subjects,
                   :provider,
                   :term_name,
                   :term_start_date,
@@ -19,6 +20,7 @@ module Clever
         @period          = attributes['period']
         @course_number   = attributes['course_number']
         @grades          = attributes['grades']
+        @subjects        = attributes['subjects']
         @term_name       = attributes['term_name']
         @term_start_date = attributes['term_start_date']
         @term_end_date   = attributes['term_end_date']

data/lib/clever/types/enrollment.rb

@@ -5,12 +5,14 @@ module Clever
     class Enrollment < Base
       attr_reader :classroom_uid,
                   :user_uid,
-                  :provider
+                  :provider,
+                  :primary
 
       def initialize(attributes = {})
-        @classroom_uid = attributes['classroom_uid']
-        @user_uid      = attributes['user_uid']
-        @provider      = 'clever'
+        @classroom_uid   = attributes['classroom_uid']
+        @user_uid        = attributes['user_uid']
+        @provider        = 'clever'
+        @primary         = attributes.dig('primary') || false
       end
     end
   end

data/lib/clever/types/section.rb

@@ -8,21 +8,25 @@ module Clever
                   :period,
                   :course,
                   :grades,
+                  :subjects,
                   :students,
                   :teachers,
                   :term_id,
-                  :provider
+                  :provider,
+                  :primary_teacher_uid
 
       def initialize(attributes = {}, *)
-        @uid      = attributes['id']
-        @name     = attributes['name']
-        @period   = attributes['period']
-        @course   = attributes['course']
-        @grades   = attributes['grade']
-        @students = attributes['students']
-        @teachers = attributes['teachers']
-        @term_id  = attributes['term_id']
-        @provider = 'clever'
+        @uid                 = attributes['id']
+        @name                = attributes['name']
+        @period              = attributes['period']
+        @course              = attributes['course']
+        @grades              = [presence(attributes['grade'])].compact
+        @subjects            = [presence(attributes['subject'])].compact
+        @students            = attributes['students']
+        @teachers            = attributes['teachers']
+        @term_id             =  attributes['term_id']
+        @provider            = 'clever'
+        @primary_teacher_uid = attributes['teacher']
       end
     end
   end

data/lib/clever/types/student.rb

@@ -37,14 +37,6 @@ module Clever
 
       private
 
-      def presence(field)
-        field unless blank?(field)
-      end
-
-      def blank?(field)
-        field.nil? || field == ''
-      end
-
       def username_from(username_source)
         return if blank?(username_source)
 

data/lib/clever/types/teacher.rb

@@ -9,13 +9,49 @@ module Clever
                   :last_name,
                   :provider
 
-      def initialize(attributes = {}, *)
+      def initialize(attributes = {}, *, client: nil)
         @uid        = attributes['id']
         @email      = attributes['email']
         @first_name = attributes['name']['first']
         @last_name  = attributes['name']['last']
+        @district_username = attributes.dig('credentials', 'district_username')
+        @sis_id            = attributes['sis_id']
+        @username   = username(client)
         @provider   = 'clever'
       end
+
+      def username(client = nil)
+        username_source = client&.staff_username_source
+
+        @username ||= presence(username_from(username_source))
+      end
+
+      def to_h
+        {
+          uid: @uid,
+          email: @email,
+          first_name: @first_name,
+          last_name: @last_name,
+          username: @username,
+          provider: @provider
+        }
+      end
+
+      private
+
+      def username_from(username_source)
+        return if blank?(username_source)
+
+        presence(instance_variable_get("@#{username_source}"))
+      end
+
+      def presence(field)
+        field unless blank?(field)
+      end
+
+      def blank?(field)
+        field.nil? || field == ''
+      end
     end
   end
 end

data/lib/clever/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clever
-  VERSION = '2.0.1'
+  VERSION = '2.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clever
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Robert Julius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday