openagent 0.7.1 → 0.7.2

data/lib/openagent/client.rb

@@ -91,35 +91,31 @@ module OpenAgent
           wait_period = wait_long
           messages_in_queue = true
           while messages_in_queue
-            get_message do |http_response, doc, status_code|
-              wrap_msg = Message.new
-              MessageRepresenter.new(wrap_msg).from_xml(http_response.body)
+            get_message do |message|
+              if inner = message.inner_message
+                trigger(:receive_message, message)
 
-              if message = wrap_msg.inner_message
-
-                trigger(:receive_message, wrap_msg, http_response)
-
-                if message.response
-                  case status_code
+                if inner.response
+                  case message.status_code
                   when ZIS_SUCCESS then
-                    if message.response.morepackets?
+                    if inner.response.more_packets?
                       wait_period = wait_short
                     else
                       wait_period = wait_long
                     end
                   when ZIS_NO_MESSAGES then
-                    if not message.morepackets?
+                    if not inner.more_packets?
                       wait_period = wait_long
                     end
                   end
                 end
 
                 # We send an Ack for both an Event and a Response
-                if status_code == ZIS_SUCCESS
-                  ack(message.sourceid, message.msgid)
+                if message.status_code == ZIS_SUCCESS
+                  ack(inner.source_id, inner.msg_id)
                 end
               else
-                if status_code == ZIS_NO_MESSAGES
+                if message.status_code == ZIS_NO_MESSAGES
                   messages_in_queue = false
                 end
               end

data/lib/openagent/version.rb

@@ -1,3 +1,3 @@
 module OpenAgent
-  VERSION = '0.7.1' unless defined?(OpenAgent::VERSION)
+  VERSION = '0.7.2' unless defined?(OpenAgent::VERSION)
 end

data/lib/sif/infra/common/message.rb

@@ -25,11 +25,13 @@ module SIF
         rescue NoMethodError
           nil
         end
+
         def response_objects
           inner_message.response.object_data.objects
         rescue NoMethodError
           nil
         end
+
         def type
           if event then :event else :response end
         end
@@ -40,9 +42,22 @@ module SIF
           system_control || unprovide || unregister || unsubscribe
         end
 
+        def source_id
+          content && content.header.source_id
+        end
+
         def msg_id
           content && content.header.msg_id
         end
+
+        def timestamp
+          content && content.header.timestamp
+        end
+
+        def status_code
+          ack && ack.status.code
+        end
+
       end
     end
   end

data/lib/sif/models/common/schedule_info.rb

@@ -7,7 +7,7 @@ module SIF
         attribute :term_info_ref_id
         attribute :teachers, Array[String]
         attribute :section_rooms, Array[String]
-        attribute :meeting_times, Array[String]
+        attribute :meeting_times, Array[MODEL_COMMON::MeetingTime]
       end
     end
   end

data/lib/sif/models/common/school_course_info_override.rb

@@ -10,7 +10,7 @@ module SIF
         attribute :district_course_code
         attribute :subject_area
         attribute :course_title
-        attribute :instruction_level
+        attribute :instructional_level
         attribute :course_credits
       end
     end

data/lib/sif/models/common/street.rb

@@ -13,6 +13,7 @@ module SIF
         attribute :street_name, String
         attribute :street_type, String
         attribute :street_suffix, String
+        attribute :apartment_type, String
         attribute :apartment_number_prefix, String
         attribute :apartment_number, String
         attribute :apartment_number_suffix, String

data/lib/sif/models/groups/sis/personal_representer.rb

@@ -11,7 +11,7 @@ module SIF
           attribute :electronic_ids, Array[MODEL_COMMON::ElectronicId]
           attribute :other_ids, Array[MODEL_COMMON::OtherId]
           attribute :other_names, String
-          attribute :demographics, Array[MODEL_COMMON::Demographics]
+          attribute :demographics, MODEL_COMMON::Demographics
           attribute :addresses, Array[MODEL_COMMON::Address]
           attribute :phone_numbers, Array[MODEL_COMMON::PhoneNumber]
           attribute :emails, Array[MODEL_COMMON::Email]

data/lib/sif/models/groups/sis/school_course_info.rb

@@ -8,7 +8,7 @@ module SIF
           include Virtus.model
           include SISRepresenter
 
-          attribute :school_info_id, String
+          attribute :school_course_info_ref_id, String
           attribute :school_year, String
           attribute :course_code, String
           attribute :state_course_code, String
@@ -16,7 +16,7 @@ module SIF
           attribute :subject_areas, Array[Common::SubjectArea]
           attribute :course_title, String
           attribute :description, String
-          attribute :instruction_level, String
+          attribute :instructional_level, String
           attribute :course_credits, String
           attribute :core_academic_course, String
           attribute :graduation_requirement, String

data/lib/sif/models/groups/sis/section_info.rb

@@ -8,7 +8,9 @@ module SIF
           include Virtus.model
           include SISRepresenter
 
-          attribute :school_course_info, String
+          include SISRepresenter
+
+          attribute :school_course_info_ref_id, String
           attribute :school_year, String
           attribute :local_id, String
           attribute :description, String

data/lib/sif/representations/models/common/school_course_info_override.rb

@@ -8,11 +8,11 @@ module SIF
 
           property :override, :as => 'Override', :attribute => true
           property :course_code, :as => 'CourseCode'
-          property :state_courase_code, :as => 'StateCourseCode'
+          property :state_course_code, :as => 'StateCourseCode'
           property :district_course_code, :as => 'DistrictCourseCode'
           property :subject_area, :as => 'SubjectArea'
           property :course_title, :as => 'CourseTitle'
-          property :instruction_level, :as => 'InstructionLevel'
+          property :instructional_level, :as => 'InstructionalLevel'
           property :course_credits, :as => 'CourseCredits'
         end
       end

data/lib/sif/representations/models/groups/sis/school_course_info.rb

@@ -10,7 +10,7 @@ module SIF
             
             self.representation_wrap = 'SchoolCourseInfo'
 
-            property :school_info_id, :attribute => true, :as => 'SchoolInfoId'
+            property :school_info_ref_id, :attribute => true, :as => 'SchoolInfoRefId'
             property :school_year, :attribute => true, :as => 'SchoolYear'
             property :course_code, :as => 'CourseCode'
             property :state_course_code, :as => 'StateCourseCode'
@@ -20,7 +20,7 @@ module SIF
                        :decorator => REPR_COMMON::SubjectArea
             property :course_title, :as => 'CourseTitle'
             property :description, :as => 'Description'
-            property :instruction_level, :as => 'InstructionLevel'
+            property :instructional_level, :as => 'InstructionalLevel'
             property :course_credits, :as => 'CourseCredits'
             property :core_academic_course, :as => 'CoreAcademicCourse'
             property :graduation_requirement, :as => 'GraduationRequirement'

data/lib/sif/representations/models/groups/sis/section_info.rb

@@ -7,7 +7,7 @@ module SIF
             include SISRepresenter
             self.representation_wrap = 'SectionInfo'
 
-            property :school_course_info, :attribute => true, :as => 'SchoolCourseInfoRefId'
+            property :school_course_info_ref_id, :attribute => true, :as => 'SchoolCourseInfoRefId'
             property :school_year, :attribute => true, :as => 'SchoolYear'
             property :local_id, :as => 'LocalId'
             property :description, :as => 'Description'

data/spec/fixtures/sif/school_course_info.xml

@@ -0,0 +1,21 @@
+<SchoolCourseInfo RefId="9D75101A8C3D00AA001A0000A2E35B35" SchoolInfoRefId="101A8C3D00AA001A0000A2E35B359D75" SchoolYear="2006">
+  <CourseCode>CS101</CourseCode>
+  <StateCourseCode>08-001</StateCourseCode>
+  <DistrictCourseCode>CS101</DistrictCourseCode>
+  <SubjectAreaList>
+    <SubjectArea>
+      <Code>05</Code>
+      <OtherCodeList>
+        <OtherCode Codeset="Text">Graphic Arts</OtherCode>
+      </OtherCodeList>
+    </SubjectArea>
+  </SubjectAreaList>
+  <CourseTitle>Gif, JPeg, or Png: What's the Difference?</CourseTitle>
+  <Description>Explore the various types of files related to graphic arts.</Description>
+  <InstructionalLevel>
+    <Code>0571</Code>
+  </InstructionalLevel>
+  <CourseCredits Type="0585">2</CourseCredits>
+  <CoreAcademicCourse>No</CoreAcademicCourse>
+  <GraduationRequirement>No</GraduationRequirement>
+</SchoolCourseInfo>