bright 1.3 → 2.1

data/lib/bright/sis_apis/power_school.rb

@@ -1,8 +1,8 @@
 module Bright
   module SisApi
     class PowerSchool < Base
-      DATE_FORMAT = '%Y-%m-%d'
-      INVALID_SEARCH_CHAR_RE = /[\,\;]/
+      DATE_FORMAT = "%Y-%m-%d"
+      INVALID_SEARCH_CHAR_RE = /[,;]/
 
       @@description = "Connects to the PowerSchool API for accessing student information"
       @@doc_url = "http://psimages.sunnysideschools.org/api-developer-guide-1.6.0/"
@@ -22,30 +22,30 @@ module Bright
       end
 
       def get_student_by_api_id(api_id, params = {})
-        params = self.apply_expansions(params)
-        st_hsh = self.request(:get, "ws/v1/student/#{api_id}", params)
+        params = apply_expansions(params)
+        st_hsh = request(:get, "ws/v1/student/#{api_id}", params)
         Student.new(convert_to_student_data(st_hsh["student"])) if st_hsh and st_hsh["student"]
       end
 
       def get_student(params = {}, options = {})
-        self.get_students(params, options.merge(:per_page => 1, :wrap_in_collection => false)).first
+        get_students(params, options.merge(per_page: 1, wrap_in_collection: false)).first
       end
 
       def get_students(params = {}, options = {})
-        params = self.apply_expansions(params)
-        params = self.apply_options(params, options)
+        params = apply_expansions(params)
+        params = apply_options(params, options)
 
         if options[:wrap_in_collection] != false
-          students_count_response_hash = self.request(:get, 'ws/v1/district/student/count', self.map_student_search_params(params))
+          students_count_response_hash = request(:get, "ws/v1/district/student/count", map_student_search_params(params))
           # {"resource"=>{"count"=>293}}
           total_results = students_count_response_hash["resource"]["count"].to_i if students_count_response_hash["resource"]
         end
 
-        students_response_hash = self.request(:get, 'ws/v1/district/student', self.map_student_search_params(params))
+        students_response_hash = request(:get, "ws/v1/district/student", map_student_search_params(params))
         if students_response_hash and students_response_hash["students"] && students_response_hash["students"]["student"]
           students_hash = [students_response_hash["students"]["student"]].flatten
 
-          students = students_hash.compact.collect {|st_hsh|
+          students = students_hash.compact.collect { |st_hsh|
             Student.new(convert_to_student_data(st_hsh))
           }
 
@@ -54,15 +54,15 @@ module Bright
             load_more_call = proc { |page|
               # pages start at one, so add a page here
               params[:page] = (page + 1)
-              api.get_students(params, {:wrap_in_collection => false})
+              api.get_students(params, {wrap_in_collection: false})
             }
 
             ResponseCollection.new({
-              :seed_page => students,
-              :total => total_results,
-              :per_page => params[:pagesize],
-              :load_more_call => load_more_call,
-              :no_threads => options[:no_threads]
+              seed_page: students,
+              total: total_results,
+              per_page: params[:pagesize],
+              load_more_call: load_more_call,
+              no_threads: options[:no_threads]
             })
           else
             students
@@ -73,13 +73,13 @@ module Bright
       end
 
       def create_student(student, additional_params = {})
-        response = self.request(:post, 'ws/v1/student', self.convert_from_student_data(student, "INSERT", additional_params))
+        response = request(:post, "ws/v1/student", convert_from_student_data(student, "INSERT", additional_params))
         if response["results"] and response["results"]["insert_count"] == 1
           student.api_id = response["results"]["result"]["success_message"]["id"]
 
           # update our local student object with any data the server might have updated
-          nstudent = self.get_student_by_api_id(student.api_id)
-          student.assign_attributes(Hash[Bright::Student.attribute_names.collect{|n| [n, nstudent.send(n)]}].reject{|k,v| v.nil?})
+          nstudent = get_student_by_api_id(student.api_id)
+          student.assign_attributes(Bright::Student.attribute_names.collect { |n| [n, nstudent.send(n)] }.to_h.reject { |k, v| v.nil? })
 
           # enrollment is no longer needed as creation is over
           student.enrollment = nil
@@ -91,10 +91,10 @@ module Bright
       end
 
       def update_student(student, additional_params = {})
-        response = self.request(:post, 'ws/v1/student', self.convert_from_student_data(student, "UPDATE", additional_params))
+        response = request(:post, "ws/v1/student", convert_from_student_data(student, "UPDATE", additional_params))
         if response["results"] and response["results"]["update_count"] == 1
           student.api_id = response["results"]["result"]["success_message"]["id"]
-          self.get_student_by_api_id(student.api_id)
+          get_student_by_api_id(student.api_id)
         else
           puts response.inspect
           student
@@ -106,18 +106,18 @@ module Bright
       end
 
       def get_schools(params = {}, options = {})
-        params = self.apply_options(params, options)
+        params = apply_options(params, options)
 
         if options[:wrap_in_collection] != false
-          schools_count_response_hash = self.request(:get, 'ws/v1/district/school/count', params)
+          schools_count_response_hash = request(:get, "ws/v1/district/school/count", params)
           # {"resource"=>{"count"=>293}}
           total_results = schools_count_response_hash["resource"]["count"].to_i if schools_count_response_hash["resource"]
         end
 
-        schools_response_hash = self.request(:get, 'ws/v1/district/school', params)
+        schools_response_hash = request(:get, "ws/v1/district/school", params)
         schools_hsh = [schools_response_hash["schools"]["school"]].flatten
 
-        schools = schools_hsh.compact.collect {|st_hsh|
+        schools = schools_hsh.compact.collect { |st_hsh|
           School.new(convert_to_school_data(st_hsh))
         }
 
@@ -126,15 +126,15 @@ module Bright
           load_more_call = proc { |page|
             # pages start at one, so add a page here
             params[:page] = (page + 1)
-            api.get_schools(params, {:wrap_in_collection => false})
+            api.get_schools(params, {wrap_in_collection: false})
           }
 
           ResponseCollection.new({
-            :seed_page => schools,
-            :total => total_results,
-            :per_page => params[:pagesize],
-            :load_more_call => load_more_call,
-            :no_threads => options[:no_threads]
+            seed_page: schools,
+            total: total_results,
+            per_page: params[:pagesize],
+            load_more_call: load_more_call,
+            no_threads: options[:no_threads]
           })
         else
           schools
@@ -142,19 +142,19 @@ module Bright
       end
 
       def retrieve_access_token
-        connection = Bright::Connection.new("#{self.connection_options[:uri]}/oauth/access_token/")
-        response = connection.request(:post, "grant_type=client_credentials", self.headers_for_access_token)
+        connection = Bright::Connection.new("#{connection_options[:uri]}/oauth/access_token/")
+        response = connection.request(:post, "grant_type=client_credentials", headers_for_access_token)
         if !response.error?
           response_hash = JSON.parse(response.body)
         end
         if response_hash["access_token"]
-          self.connection_options[:access_token] = response_hash["access_token"]
+          connection_options[:access_token] = response_hash["access_token"]
         end
         response_hash
       end
 
       def request(method, path, params = {})
-        uri  = "#{self.connection_options[:uri]}/#{path}"
+        uri = "#{connection_options[:uri]}/#{path}"
         body = nil
         if method == :get
           query = URI.encode_www_form(params)
@@ -163,10 +163,9 @@ module Bright
           body = JSON.dump(params)
         end
 
-
         response = connection_retry_wrapper {
           connection = Bright::Connection.new(uri)
-          headers = self.headers_for_auth
+          headers = headers_for_auth
           connection.request(method, body, headers)
         }
 
@@ -186,7 +185,7 @@ module Bright
         default_params = {}
 
         q = ""
-        %w(first_name middle_name last_name).each do |f|
+        %w[first_name middle_name last_name].each do |f|
           if fn = params.delete(f.to_sym)
             fn = fn.gsub(INVALID_SEARCH_CHAR_RE, " ").strip
             q += %(name.#{f}==#{fn};)
@@ -202,16 +201,16 @@ module Bright
         end
         params[:q] = q
 
-        default_params.merge(params).reject{|k,v| v.respond_to?(:empty?) ? v.empty? : v.nil?}
+        default_params.merge(params).reject { |k, v| v.respond_to?(:empty?) ? v.empty? : v.nil? }
       end
 
       def convert_to_student_data(attrs)
         cattrs = {}
 
         if attrs["name"]
-          cattrs[:first_name]  = attrs["name"]["first_name"]
+          cattrs[:first_name] = attrs["name"]["first_name"]
           cattrs[:middle_name] = attrs["name"]["middle_name"]
-          cattrs[:last_name]  = attrs["name"]["last_name"]
+          cattrs[:last_name] = attrs["name"]["last_name"]
         end
 
         cattrs[:api_id] = attrs["id"].to_s
@@ -234,17 +233,17 @@ module Bright
           cattrs[:projected_graduation_year] = pg if pg > 0
         end
 
-        #Student Address
+        # Student Address
         begin
-          cattrs[:addresses] = attrs["addresses"].to_a.collect{|a| self.convert_to_address_data(a)}.select{|a| !a[:street].blank?}.uniq{|a| a[:street]} if attrs["addresses"]
+          cattrs[:addresses] = attrs["addresses"].to_a.collect { |a| convert_to_address_data(a) }.select { |a| !a[:street].blank? }.uniq { |a| a[:street] } if attrs["addresses"]
         rescue
         end
 
-        #Ethnicity / Race Info
+        # Ethnicity / Race Info
         if attrs["ethnicity_race"].is_a?(Hash)
           if !(race_hshs = attrs.dig("ethnicity_race", "races")).nil?
-            #this should be an array, but it doesn't appear PS always sends it as one
-            cattrs[:race] = [race_hshs].flatten.map{|race_hsh| race_hsh["district_race_code"]}.compact.uniq
+            # this should be an array, but it doesn't appear PS always sends it as one
+            cattrs[:race] = [race_hshs].flatten.map { |race_hsh| race_hsh["district_race_code"] }.compact.uniq
           end
 
           if !attrs.dig("ethnicity_race", "federal_ethnicity").nil?
@@ -255,16 +254,16 @@ module Bright
           end
         end
 
-        #Contacts Info
-        [1,2].each do |contact_id|
+        # Contacts Info
+        [1, 2].each do |contact_id|
           if !attrs.dig("contact", "emergency_contact_name#{contact_id}").blank? and !attrs.dig("contact", "emergency_phone#{contact_id}").blank?
             cattrs[:contacts] ||= []
             contact_attrs = {
-              :first_name => attrs.dig("contact", "emergency_contact_name#{contact_id}").to_s.split(",").last.strip,
-              :last_name => attrs.dig("contact", "emergency_contact_name#{contact_id}").to_s.split(",").first.strip,
-              :phone_numbers => [
+              first_name: attrs.dig("contact", "emergency_contact_name#{contact_id}").to_s.split(",").last.strip,
+              last_name: attrs.dig("contact", "emergency_contact_name#{contact_id}").to_s.split(",").first.strip,
+              phone_numbers: [
                 {
-                  :phone_number => attrs.dig("contact", "emergency_phone#{contact_id}")
+                  phone_number: attrs.dig("contact", "emergency_phone#{contact_id}")
                 }
               ]
             }
@@ -272,68 +271,67 @@ module Bright
           end
         end
 
-        cattrs.reject{|k,v| v.respond_to?(:empty?) ? v.empty? : v.nil?}
+        cattrs.reject { |k, v| v.respond_to?(:empty?) ? v.empty? : v.nil? }
       end
 
       def convert_from_student_data(student, action = nil, additional_params = {})
         return {} if student.nil?
 
         student_data = {
-          :client_uid => student.client_id,
-          :action => action,
-          :id => student.api_id,
-          :local_id => student.sis_student_id,
-          :state_province_id => student.state_student_id,
-          :name => {
-            :first_name => student.first_name,
-            :middle_name => student.middle_name,
-            :last_name => student.last_name
-          }.reject{|k,v| v.respond_to?(:empty?) ? v.empty? : v.nil?},
-          :demographics => {
+          client_uid: student.client_id,
+          action: action,
+          id: student.api_id,
+          local_id: student.sis_student_id,
+          state_province_id: student.state_student_id,
+          name: {
+            first_name: student.first_name,
+            middle_name: student.middle_name,
+            last_name: student.last_name
+          }.reject { |k, v| v.respond_to?(:empty?) ? v.empty? : v.nil? },
+          demographics: {
             # To avoid a mismatch of attributes, we'll ignore for now
             # :gender => student.gender.to_s[0].to_s.upcase,
-            :birth_date => (student.birth_date ? student.birth_date.strftime(DATE_FORMAT) : nil),
-            :projected_graduation_year => student.projected_graduation_year
-          }.reject{|k,v| v.respond_to?(:empty?) ? v.empty? : v.nil?}
-        }.merge(additional_params).reject{|k,v| v.respond_to?(:empty?) ? v.empty? : v.nil?}
+            birth_date: (student.birth_date ? student.birth_date.strftime(DATE_FORMAT) : nil),
+            projected_graduation_year: student.projected_graduation_year
+          }.reject { |k, v| v.respond_to?(:empty?) ? v.empty? : v.nil? }
+        }.merge(additional_params).reject { |k, v| v.respond_to?(:empty?) ? v.empty? : v.nil? }
 
         # apply enrollment info
         if student.enrollment
-          student_data.merge!(self.convert_from_enrollment_data(student.enrollment))
+          student_data.merge!(convert_from_enrollment_data(student.enrollment))
         end
 
         # apply addresses
         address_data = {}
-        if ph = student.addresses.detect{|a| a.type == "physical"}
-          address_data.merge!(self.convert_from_address_data(ph))
+        if ph = student.addresses.detect { |a| a.type == "physical" }
+          address_data.merge!(convert_from_address_data(ph))
         end
-        if mail = student.addresses.detect{|a| a.type == "mailing"}
-          address_data.merge!(self.convert_from_address_data(mail))
+        if mail = student.addresses.detect { |a| a.type == "mailing" }
+          address_data.merge!(convert_from_address_data(mail))
         end
         if ph.nil? and mail.nil? and any = student.addresses.first
           cany = any.clone
           cany.type = "physical"
-          address_data.merge!(self.convert_from_address_data(cany))
+          address_data.merge!(convert_from_address_data(cany))
         end
         if address_data.size > 0
-          student_data.merge!({:addresses => address_data})
+          student_data.merge!({addresses: address_data})
         end
 
-        {:students => {:student => student_data}}
+        {students: {student: student_data}}
       end
 
       def convert_from_enrollment_data(enrollment)
         return {} if enrollment.nil?
-        {:school_enrollment => {
-            :enroll_status => "A",
-            :entry_date => (enrollment.entry_date || Date.today).strftime(DATE_FORMAT),
-            :entry_comment => enrollment.entry_comment,
-            :exit_date => (enrollment.exit_date || enrollment.entry_date || Date.today).strftime(DATE_FORMAT),
-            :exit_comment => enrollment.exit_comment,
-            :grade_level => enrollment.grade,
-            :school_number => enrollment.school ? enrollment.school.number : nil
-          }.reject{|k,v| v.respond_to?(:empty?) ? v.empty? : v.nil?}
-        }
+        {school_enrollment: {
+          enroll_status: "A",
+          entry_date: (enrollment.entry_date || Date.today).strftime(DATE_FORMAT),
+          entry_comment: enrollment.entry_comment,
+          exit_date: (enrollment.exit_date || enrollment.entry_date || Date.today).strftime(DATE_FORMAT),
+          exit_comment: enrollment.exit_comment,
+          grade_level: enrollment.grade,
+          school_number: enrollment.school ? enrollment.school.number : nil
+        }.reject { |k, v| v.respond_to?(:empty?) ? v.empty? : v.nil? }}
       end
 
       def convert_to_school_data(attrs)
@@ -347,21 +345,21 @@ module Bright
           cattrs[:address] = convert_to_address_data(address_attributes)
         end
         if (phone_number_attributes = attrs.dig("phones", "main", "number"))
-          cattrs[:phone_number] = {:phone_number => phone_number_attributes}
+          cattrs[:phone_number] = {phone_number: phone_number_attributes}
         end
 
-        cattrs.reject{|k,v| v.respond_to?(:empty?) ? v.empty? : v.nil?}
+        cattrs.reject { |k, v| v.respond_to?(:empty?) ? v.empty? : v.nil? }
       end
 
       def convert_from_address_data(address)
         {
-          (address.type || "physcial") => {
-            :street => "#{address.street} #{address.apt}", # powerschool doesn't appear to support passing the apt in the api
-            :city => address.city,
-            :state_province => address.state,
-            :postal_code => address.postal_code,
-            :grid_location => address.geographical_coordinates.to_s.gsub(",", ", ") # make sure there is a comma + space
-          }.reject{|k,v| v.respond_to?(:empty?) ? v.empty? : v.nil?}
+          address.type || "physcial" => {
+            street: "#{address.street} #{address.apt}", # powerschool doesn't appear to support passing the apt in the api
+            city: address.city,
+            state_province: address.state,
+            postal_code: address.postal_code,
+            grid_location: address.geographical_coordinates.to_s.gsub(",", ", ") # make sure there is a comma + space
+          }.reject { |k, v| v.respond_to?(:empty?) ? v.empty? : v.nil? }
         }
       end
 
@@ -388,24 +386,24 @@ module Bright
           cattrs[:latitude], cattrs[:longitude] = lat_lng
         end
 
-        cattrs.reject{|k,v| v.respond_to?(:empty?) ? v.empty? : v.nil?}
+        cattrs.reject { |k, v| v.respond_to?(:empty?) ? v.empty? : v.nil? }
       end
 
       def apply_expansions(params)
-        if self.expansion_options.empty?
-          hsh = self.request(:get, 'ws/v1/district/student', {:pagesize => 1, :q => "local_id==0"})
+        if expansion_options.empty?
+          hsh = request(:get, "ws/v1/district/student", {pagesize: 1, q: "local_id==0"})
           if hsh and hsh["students"]
             self.expansion_options = {
-              :expansions => hsh["students"]["@expansions"].to_s.split(/\,\s?/),
-              :extensions => hsh["students"]["@extensions"].to_s.split(/\,\s?/),
+              expansions: hsh["students"]["@expansions"].to_s.split(/,\s?/),
+              extensions: hsh["students"]["@extensions"].to_s.split(/,\s?/)
             }
           end
         end
 
         params.merge({
-          :expansions => (%w(demographics addresses ethnicity_race phones contact contact_info) & (self.expansion_options[:expansions] || [])).join(","),
-          :extensions => (%w(studentcorefields) & (self.expansion_options[:extensions] || [])).join(",")
-        }.reject{|k,v| v.empty?})
+          expansions: (%w[demographics addresses ethnicity_race phones contact contact_info] & (expansion_options[:expansions] || [])).join(","),
+          extensions: (%w[studentcorefields] & (expansion_options[:extensions] || [])).join(",")
+        }.reject { |k, v| v.empty? })
       end
 
       def apply_options(params, options)
@@ -416,17 +414,17 @@ module Bright
 
       def headers_for_access_token
         {
-          "Authorization" => "Basic #{Base64.strict_encode64("#{self.connection_options[:client_id]}:#{self.connection_options[:client_secret]}")}",
+          "Authorization" => "Basic #{Base64.strict_encode64("#{connection_options[:client_id]}:#{connection_options[:client_secret]}")}",
           "Content-Type" => "application/x-www-form-urlencoded;charset=UTF-8"
         }
       end
 
       def headers_for_auth
-        self.retrieve_access_token if self.connection_options[:access_token].nil?
+        retrieve_access_token if connection_options[:access_token].nil?
         {
-          "Authorization" => "Bearer #{self.connection_options[:access_token]}",
+          "Authorization" => "Bearer #{connection_options[:access_token]}",
           "Accept" => "application/json;charset=UTF-8",
-          "Content-Type" =>"application/json;charset=UTF-8"
+          "Content-Type" => "application/json;charset=UTF-8"
         }
       end
     end

data/lib/bright/sis_apis/synergy.rb

@@ -1,31 +1,29 @@
 module Bright
   module SisApi
     class Synergy < Base
-      
       def get_student_by_api_id(api_id)
         raise NotImplementedError
       end
-      
+
       def get_student(params)
         raise NotImplementedError
       end
-      
+
       def get_students(params)
         raise NotImplementedError
       end
-      
+
       def create_student(student)
         raise NotImplementedError
       end
-      
+
       def update_student(student)
         raise NotImplementedError
       end
-      
+
       def get_schools(params)
         raise NotImplementedError
       end
-      
     end
   end
-end
+end