oneroster 1.3.6 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0306c18daaa1cea3ae7e49f18700a4c230181441
-  data.tar.gz: 9ac72dfc6ceee7d40da62b119b227a12316ff45c
+  metadata.gz: 1295abb50254210617e64c5e1da8e0af8210cdc6
+  data.tar.gz: 4f9b52e8420ac4d9013feea4dd6322c5de1a71e2
 SHA512:
-  metadata.gz: ca0e3070091f7a024c5b18048b67ede35e211f76b2741f68673e5c7b416b2413ab37587648b2eac555066ca71eebe746fe9a8b8383aff6ef97bddedf8826f494
-  data.tar.gz: 1635b08056de344c9b2107cc2ed7379d5d6b7661fafaa3ed000f2b1eb8f94568ffc12e12c9fa3358e01bcda7e8bc294aa006725d813f9bd5b10dd64796957482
+  metadata.gz: 1ea266064d17e410069e9fa1980f7020e207ddaec7a815024b66553f16e5e9560f8efb9e120286d4bef9c23de3acde39a20532f0500ffd588ef7f2fee17d0468
+  data.tar.gz: 3e4f32bf681d828b15d4d3412b460baf8e135edd53fd3f4fbbb6d3997153420cd80a620ee70a3e93fc7cef7c1b7fd2a702334a8cadfeda5e4bb5263aa9cb8e21

data/.circleci/config.yml

@@ -6,8 +6,8 @@ defaults: &defaults
 restore_ruby_cache: &restore_ruby_cache
   restore_cache:
     keys:
-      - v1-dependencies-{{ checksum "Gemfile.lock" }}
-      - v1-dependencies-
+      - v2-dependencies-{{ checksum "Gemfile.lock" }}
+      - v2-dependencies-
 setup_rubygems: &setup_rubygems
   run:
     name: Add RubyGems API key
@@ -20,6 +20,9 @@ install_dependencies: &install_dependencies
   run:
     name: Install Dependencies
     command: |
+      echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
+      source $BASH_ENV
+      gem install bundler
       bundle install --jobs=4 --retry=3 --path vendor/bundle
 
 save_ruby_cache: &save_ruby_cache
@@ -59,8 +62,6 @@ run_rspec_tests: &run_rspec_tests
                         $TEST_FILES
       ./tmp/cc-test-reporter format-coverage -t simplecov -o "tmp/codeclimate.json"
 
-
-
 upload_coverage: &upload_coverage
   run:
     name: Upload Coverage

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oneroster (1.3.6)
+    oneroster (2.3.0)
       dry-inflector
       faraday
       faraday_middleware

data/lib/one_roster.rb

@@ -21,19 +21,22 @@ require 'types/classroom'
 require 'types/enrollment'
 require 'types/student'
 require 'types/teacher'
+require 'types/term'
 
 module OneRoster
   class DistrictNotFound < StandardError; end
   class ConnectionError < StandardError; end
 
-  STUDENTS_ENDPOINT    = 'ims/oneroster/v1p1/students'
-  TEACHERS_ENDPOINT    = 'ims/oneroster/v1p1/teachers'
-  COURSES_ENDPOINT     = 'ims/oneroster/v1p1/courses'
-  CLASSES_ENDPOINT     = 'ims/oneroster/v1p1/classes'
-  ENROLLMENTS_ENDPOINT = 'ims/oneroster/v1p1/enrollments'
+  STUDENTS_ENDPOINT          = 'ims/oneroster/v1p1/students'
+  TEACHERS_ENDPOINT          = 'ims/oneroster/v1p1/teachers'
+  COURSES_ENDPOINT           = 'ims/oneroster/v1p1/courses'
+  CLASSES_ENDPOINT           = 'ims/oneroster/v1p1/classes'
+  ENROLLMENTS_ENDPOINT       = 'ims/oneroster/v1p1/enrollments'
+  ACADEMIC_SESSIONS_ENDPOINT = 'ims/oneroster/v1p1/academicSessions'
 
   RESPONSE_TYPE_MAP = {
     'teachers'     => 'users',
+    'academicSessions'        => 'academicSessions',
     'students'     => 'users',
     'courses'      => 'courses',
     'classes'      => 'classes',

data/lib/one_roster/client.rb

@@ -40,22 +40,40 @@ module OneRoster
 
       oneroster_classes = classes
 
+      terms_hash = terms.each_with_object({}) { |term, terms| terms[term.uid] = term }
+
       courses = courses(course_codes, oneroster_classes)
 
       oneroster_classes.each_with_object([]) do |oneroster_class, oneroster_classes|
         course = courses.find { |course| course.uid == oneroster_class.course_uid }
         next unless course
 
+        term = terms_hash[oneroster_class.term_id]
+
         oneroster_classes << Types::Classroom.new(
           'id' => oneroster_class.uid,
           'name' => oneroster_class.title,
           'course_number' => course.course_code,
           'period' => oneroster_class.period,
-          'grades' => oneroster_class.grades
+          'grades' => oneroster_class.grades,
+          'subjects' => oneroster_class.subjects,
+          'term_name' => term&.name,
+          'term_start_date' => term&.start_date,
+          'term_end_date' => term&.end_date
         )
       end
     end
 
+    def terms
+      authenticate
+
+      endpoint = OneRoster::ACADEMIC_SESSIONS_ENDPOINT
+
+      type = Types::Term
+
+      Paginator.fetch(connection, endpoint, :get, type, client: self).force
+    end
+
     def courses(course_codes = [], oneroster_classes = classes)
       authenticate
 

data/lib/one_roster/response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OneRoster
   class Response
     attr_reader :status, :raw_body, :headers

data/lib/one_roster/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OneRoster
-  VERSION = '1.3.6'
+  VERSION = '2.3.0'
 end

data/lib/types/class.rb

@@ -8,7 +8,9 @@ module OneRoster
                   :course_uid,
                   :provider,
                   :period,
-                  :grades
+                  :grades,
+                  :subjects,
+                  :term_id
 
       def initialize(attributes = {}, *)
         @uid        = attributes['sourcedId']
@@ -16,7 +18,9 @@ module OneRoster
         @course_uid = attributes['course']['sourcedId']
         @status     = attributes['status']
         @period     = first_period(attributes) || period_from_code(attributes)
-        @grades     = attributes['grades']
+        @grades     = presence(attributes['grades']) || []
+        @subjects   = presence(attributes['subjects']) || []
+        @term_id    = attributes['terms'][0]['sourcedId']
         @provider   = 'oneroster'
       end
 
@@ -33,6 +37,14 @@ module OneRoster
       def period_from_code(attributes)
         attributes['classCode']&.match(/- Period (\d+) -/) { |m| m[1] }
       end
+
+      def presence(field)
+        field unless blank?(field)
+      end
+
+      def blank?(field)
+        field.nil? || field == ''
+      end
     end
   end
 end

data/lib/types/classroom.rb

@@ -8,15 +8,23 @@ module OneRoster
                   :course_number,
                   :period,
                   :grades,
-                  :provider
+                  :subjects,
+                  :provider,
+                  :term_name,
+                  :term_start_date,
+                  :term_end_date
 
       def initialize(attributes = {})
-        @uid           = attributes['id']
-        @name          = attributes['name']
-        @course_number = attributes['course_number']
-        @period        = attributes['period']
-        @grades        = attributes['grades']
-        @provider      = 'oneroster'
+        @uid             = attributes['id']
+        @name            = attributes['name']
+        @course_number   = attributes['course_number']
+        @period          = attributes['period']
+        @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']
+        @provider        = 'oneroster'
       end
     end
   end

data/lib/types/enrollment.rb

@@ -25,7 +25,7 @@ module OneRoster
         teacher?
       end
 
-      def primary_teacher?
+      def primary
         teacher? && @primary.to_s == 'true'
       end
 
@@ -41,6 +41,7 @@ module OneRoster
         {
           classroom_uid: @classroom_uid,
           user_uid: @user_uid,
+          primary: primary,
           provider: @provider
         }
       end

data/lib/types/term.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module OneRoster
+  module Types
+    class Term < Base
+      attr_reader :uid,
+                  :name,
+                  :start_date,
+                  :end_date
+
+      def initialize(attributes = {}, *)
+        @uid        = attributes['sourcedId']
+        @name       = attributes['title']
+        @start_date = attributes['startDate']
+        @end_date   = attributes['endDate']
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneroster
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 2.3.0
 platform: ruby
 authors:
 - Robert Julius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -243,6 +243,7 @@ files:
 - lib/types/enrollment.rb
 - lib/types/student.rb
 - lib/types/teacher.rb
+- lib/types/term.rb
 - one_roster.gemspec
 homepage: https://github.com/TCI/oneroster
 licenses:
@@ -265,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Wrapper for the OneRoster API.