openagent 0.9.8 → 0.9.9

data/lib/openagent/version.rb

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

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

@@ -14,7 +14,15 @@ module SIF
         end
 
         def first_teacher
-          teachers.first || String.new
+          teachers.first
+        end
+
+        def first_nonblank_teacher
+          teachers.find{ |t| !t.nil? and !t.empty? }
+        end
+
+        def teacher
+          first_nonblank_teacher || first_teacher || String.new
         end
       end
     end

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

@@ -26,15 +26,23 @@ module SIF
           end
 
           def first_schedule_info
-            schedule_infos.first || Common::ScheduleInfo.new
+            schedule_infos.first
+          end
+
+          def first_nonblank_schedule_info
+            schedule_infos.find { |si| !si.teachers.empty? }
+          end
+
+          def schedule_info
+            first_nonblank_schedule_info || first_schedule_info || Common::ScheduleInfo.new
           end
 
           def term_info_ref_id
-            first_schedule_info.term_info_ref_id
+            schedule_info.term_info_ref_id
           end
 
           def teacher
-            first_schedule_info.first_teacher if first_schedule_info.first_teacher
+            schedule_info.teacher
           end
         end
       end

data/spec/fixtures/sif/section_info.xml

@@ -1,9 +1,10 @@
 <SectionInfo RefId="D3E34B359D75101A8C3D00AA001A1652" SchoolCourseInfoRefId="A2E35B359D75101A8C3D00AA001A0000" SchoolYear="2006">
   <LocalId>287-1</LocalId>
   <ScheduleInfoList>
+    <ScheduleInfo TermInfoRefId="099BBC3227490063E97403434C5C2207"/>
     <ScheduleInfo TermInfoRefId="099BBC3227490063E97403434C5C2207">
       <TeacherList>
-        <StaffPersonalRefId>A8C3A2E35B359D75101D00AA001A0000</StaffPersonalRefId>
+        <StaffPersonalRefId></StaffPersonalRefId>
         <StaffPersonalRefId>A8C45DC6B3359D75101D00A456BE9000</StaffPersonalRefId>
       </TeacherList>
       <SectionRoomList>

data/spec/sif/representations/xml/section_info_spec.rb

@@ -8,14 +8,18 @@ describe SIF::Representation::Model::Group::SIS::SectionInfo do
     SIF::Representation::Model::Group::SIS::SectionInfo.new(section_info).from_xml(xml)
   end
 
-  it 'parses' do
+  it "uses nonblank teachers in schedule_info" do
+    section_info.teacher.should == 'A8C45DC6B3359D75101D00A456BE9000'
+  end
+
+  it "parses" do
     section_info.ref_id.should == 'D3E34B359D75101A8C3D00AA001A1652'
     section_info.school_course_info_ref_id.should == 'A2E35B359D75101A8C3D00AA001A0000'
     section_info.school_year.should == '2006'
     section_info.local_id.should == '287-1'
 
-    schedule_info = section_info.schedule_infos[0]
-    schedule_info.teachers[0].should == 'A8C3A2E35B359D75101D00AA001A0000'
+    schedule_info = section_info.schedule_infos[1]
+    schedule_info.teachers[0].should == ''
     schedule_info.teachers[1].should == 'A8C45DC6B3359D75101D00A456BE9000'
     schedule_info.section_rooms[0].should == '94785736AB3671090BDD87593A264086'
     meeting_times = schedule_info.meeting_times
@@ -30,7 +34,7 @@ describe SIF::Representation::Model::Group::SIS::SectionInfo do
     meeting_times[4].timetable_day.should == 'F'
     meeting_times[4].timetable_period.should == '6'
 
-    schedule_info = section_info.schedule_infos[1]
+    schedule_info = section_info.schedule_infos[2]
     schedule_info.teachers[0].should == 'CC543E35B359D75101D00AA001A00703'
     schedule_info.section_rooms[0].should == '94785736AB3671090BDD87593A264086'
     meeting_times = schedule_info.meeting_times

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openagent
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
   prerelease: 
 platform: ruby
 authors: