appolo 1.1.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c6bd7fbebc71c62bf43de47bedd14eea09be9ba
-  data.tar.gz: dc11a28359fcfeb8e60b179d85b6b4c4ce601014
+  metadata.gz: 3a8dce19c2f19fd5335d2a1118e9c06a5f706132
+  data.tar.gz: e37dc28eaa44895a5104527f717fea6e32b128c8
 SHA512:
-  metadata.gz: 22989f4723378dc4426fdb03d88e9e873a3d62e46dac472d25187e576ff7aa501cebc48277a1adad66a9ca81c540c2434e0d8275d4fce3e69e34cea6d5d9a6bc
-  data.tar.gz: ac5e0ba1a806812e55609607ec310489b114ae3a437d8fe66c58c2900c1cca0a6dfc86f7762b2856d1567d88bc5b84a17d7117db0cad0994e54d919c3b5e06e3
+  metadata.gz: 170b6d32b06d178eaceb1e64aa8da24a4836c6ffce1862e59be3b6137a47ec8bc9ede5a1a47362701814c90be1abdf3f947102e6cf647b1dd5c3ad8933c6a467
+  data.tar.gz: cfb7f57bc1d21431c20e7df831726933c5cc78e3a8ac2a4a6364064c5c9516684d8c67db8a79ff2a3d42abf829413391024b2ebb19038bdcc33f64bb5f59e091

data/lib/Appolo.rb

@@ -6,7 +6,7 @@ require_relative '../lib/Appolo/Models/main_model/classes'
 require_relative '../lib/Appolo/Models/main_model/program'
 require_relative '../lib/Appolo/Models/main_model/courses'
 require_relative '../lib/Appolo/Models/main_model/lective_semester'
-
+require_relative '../lib/Appolo/Models/result'
 require 'json'
 
 ##
@@ -52,6 +52,11 @@ module Appolo
     end
   end
 
+  def self.build_result(result,error)
+    Result.new(result, error)
+  end
+
+
   public
 
   ##
@@ -69,7 +74,7 @@ module Appolo
       end
       $all_students
     rescue => e
-      nil #TODO - exceptions
+      $all_students
     end
   end
 
@@ -89,7 +94,7 @@ module Appolo
       end
       $all_teachers
     rescue => e
-      nil
+      $all_teachers
     end
   end
 
@@ -109,7 +114,7 @@ module Appolo
       end
       $all_programs
     rescue => e
-      nil
+      $all_programs
     end
   end
 
@@ -129,7 +134,7 @@ module Appolo
       end
       $all_courses
     rescue => e
-      nil
+      $all_courses
     end
   end
 
@@ -149,7 +154,7 @@ module Appolo
       end
       $all_lective_sem
     rescue => e
-      nil
+      $all_lective_sem
     end
   end
 
@@ -169,7 +174,7 @@ module Appolo
       end
       $all_classes
     rescue => e
-      nil
+      $all_classes
     end
   end
 
@@ -177,12 +182,12 @@ module Appolo
   # Return a single instance of Teacher based upon the +id+ given.
 
   def self.get_teacher_by_id(id)
-    return $all_teachers[id] unless $all_teachers.count == 0
+    #return $all_teachers[id] unless $all_teachers.count == 0
     begin
       response = RestClient.get TEACHERS_API_LINK + id.to_s
       Teacher.new(verify_response response)
     rescue => e
-      nil
+      e
     end
   end
 
@@ -191,12 +196,12 @@ module Appolo
   # Return a single instance of Classes based upon the +id+ given.
 
   def self.get_class_by_id(id)
-    return $all_classes[id] unless $all_classes.count == 0
+    #return $all_classes[id] unless $all_classes.count == 0
     begin
       response = RestClient.get CLASSES_API_LINK + id.to_s
       Classes.new(verify_response response)
     rescue => e
-      nil
+     e
     end
   end
 
@@ -204,22 +209,25 @@ module Appolo
   # Return a single instance of Student based upon the +id+ given.
 
   def self.get_student_by_id(id)
-    return $all_students[id] unless $all_students.count == 0
+    #return $all_students[id] unless $all_students.count == 0
     begin
       response = RestClient.get STUDENTS_API_LINK + id.to_s
       Student.new(verify_response response)
     rescue => e
-      nil
+      e
     end
   end
 
+  ##
+  # Return a single instance of program based upon the +id+ given.
+
   def self.get_program_by_id(id)
-    return $all_programs[id] unless $all_programs.count == 0
+    #return $all_programs[id] unless $all_programs.count == 0
     begin
       response = RestClient.get PROGRAMS_API_LINK + id.to_s
       Program.new(verify_response response)
     rescue => e
-      nil
+      e
     end
   end
 

data/lib/Appolo/Models/main_model/student.rb

@@ -12,7 +12,11 @@ class Student < Element
   attr_reader :number, :name, :academic_email, :github_username
   attr_reader :avatar_url, :program, :students
 
-  def initialize(json_str)
+  def initialize(json_str = nil)
+    if json_str.nil?
+      return
+    end
+
     json_data = Appolo.check_json_info json_str
 
     super(json_data[ModelUtils::ID],

data/lib/Appolo/Models/result.rb

@@ -0,0 +1,21 @@
+class Result
+
+  attr_reader :result, :error, :message
+
+  def initialize(result, error)
+    @result = result
+    @error = error
+
+    @message = @error.message unless @error.nil?
+
+  end
+
+  def has_result
+    @result.nil?
+  end
+
+  def to_s
+    "Has Result: #{has_result} Has Error: #{@has_error}"
+  end
+
+end

data/lib/Appolo/version.rb

@@ -1,3 +1,3 @@
 module Appolo
-  VERSION = '1.1.1'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appolo
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Pedro Gabriel
@@ -120,6 +120,7 @@ files:
 - lib/Appolo/Models/main_model/student.rb
 - lib/Appolo/Models/main_model/teacher.rb
 - lib/Appolo/Models/model_utils.rb
+- lib/Appolo/Models/result.rb
 - lib/Appolo/Models/secondary/avatar_url.rb
 - lib/Appolo/Models/secondary/lecture.rb
 - lib/Appolo/Models/secondary/links.rb