ps_utilities 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 637da17d1d419b00baea629e618529517c09fa7e16f71dd358a850b0978fc599
-  data.tar.gz: a1ec6ced4f33ac5ff849dd48c0f216133e7fe291b1224c8dc082d42c16a66876
+  metadata.gz: d12612f8c4d8b6ce0ee6a52c4d30748c5ca12b1f8414478d0f2164f8aa79295e
+  data.tar.gz: 5e0cbd4742dd42f98679cdea0356f1714e0ae23b878adba319cc1e33c7c901f4
 SHA512:
-  metadata.gz: 062a02dd9e855ad0533da5eb6c735021a0607ea6a4db59d33f063b223d0c3918e99071760bb456b9316f81b58e5daf1e06b977c92fbe02b0aa035a81d2841244
-  data.tar.gz: cca916c4339884397ebf5cc40fd6dcd1f8f0ff6d6a17b3cafdf61f30fccf0584ecab4f6bec7b58c7dc3d476b6168810155780dd3a61832861f9958519f2b3690
+  metadata.gz: eb7bca650ace01f55b015bd52db6385c0b5d9fc1bdd99eac873bc6f9f4aebde2b05d51eb65226f9eab43f379d280daf8e423d03d461660810d7ecead03ed1322
+  data.tar.gz: 44d0548cea631ab20b45d21667c96611321eac42f7f5ef11c21239abde10984ec1f25d013ada635a2c66fede989c11e20927b0be3ed3516dc59bc8a2344ae8e7

data/lib/ps_utilities/connection.rb

@@ -51,8 +51,18 @@ module PsUtilities
       case command
       when nil, :authenticate
         # authenticate            unless token_valid?
+      # when :get
+      #   api(:get, api_path, options)        unless api_path.empty?
+      # when :put
+      #   send(:api, :put, api_path, options) unless api_path.empty?
+      # when :post
+      #   api(, api_path, options)            unless api_path.empty?
       when :get, :put, :post
-        send(command, api_path, options) unless api_path.empty?
+        api(command, api_path, options)         unless api_path.empty?
+      # when :get, :put, :post
+      #   send(command, api_path, options)        unless api_path.empty?
+      # when :get, :put, :post
+      #   send(:api, command, api_path, options)  unless api_path.empty?
       else
         send(command, params)
       end
@@ -60,6 +70,24 @@ module PsUtilities
 
     private
 
+    # options = {query: {}}
+    def api(verb, api_path, options={})
+      count   = 0
+      retries = 3
+      ps_url  = base_uri + api_path
+      options = options.merge(headers)
+      begin
+        HTTParty.send(verb, ps_url, options)
+      rescue Net::ReadTimeout, Net::OpenTimeout
+        if count < retries
+          count += 1
+          retry
+        else
+          { error: "no response (timeout) from URL: #{url}"  }
+        end
+      end
+    end
+
     # options = {query: {}}
     def get(api_path, options={})
       count   = 0

data/lib/ps_utilities/pre_built_get.rb

@@ -3,32 +3,29 @@ module PsUtilities
   module PreBuiltGet
 
     def get_active_students_count(params={})
-      # url = "/ws/v1/district/student/count?q=school_enrollment.enroll_status_code==0"
-      url     = "/ws/v1/district/student/count"
-      options = { query: {"q" => "school_enrollment.enroll_status_code==0"} }
-      get(url, options)
+      # api_path = "/ws/v1/district/student/count?q=school_enrollment.enroll_status_code==0"
+      api_path = "/ws/v1/district/student/count"
+      options  = { query: {"q" => "school_enrollment.enroll_status_code==0"} }
+      get(api_path, options)
     end
 
     def get_active_students_info(params={})
-      # url = "/ws/v1/district/student?q=school_enrollment.enroll_status==a&pagesize=500"
-      url     = "/ws/v1/district/student"
+      # api_path = "/ws/v1/district/student?q=school_enrollment.enroll_status==a&pagesize=500"
+      api_path     = "/ws/v1/district/student"
       options = { query:
                   {"q"        => "school_enrollment.enroll_status_code==0",
-                   "pagesize" => "500"}
-                }
-      get(url, options)
+                   "pagesize" => "500"} }
+      get(api_path, options)
     end
 
-    # las-test.powerschool.com/ws/v1/district/student?expansions=school_enrollment&q=student_username==xxxxx237
     # params = {username: "xxxxxxx"}
     def get_one_student_record(params)
-      # url = "/ws/v1/district/student?expansions=school_enrollment,contact&q=student_username==xxxxxx237"
-      url     = "/ws/v1/district/student"
-      options = { query:
-                  {"q"          => "student_username==#{params[:username]}",
-                   "expansions" => "school_enrollment,contact,contact_info"}
-                }
-      get(url, options)
+      # api_path = "/ws/v1/district/student?expansions=school_enrollment,contact&q=student_username==xxxxxx237"
+      api_path = "/ws/v1/district/student"
+      options  = { query:
+                  { "q"          => "student_username==#{params[:username]}",
+                    "expansions" => "school_enrollment,contact,contact_info"} }
+      get(api_path, options)
     end
 
   end

data/lib/ps_utilities/version.rb

@@ -1,5 +1,5 @@
 module PsUtilities
   module Version
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ps_utilities
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Lee Weisbecker