ims_caliper 0.1.3 → 0.9.0

data/spec/lib/event/annotation_event_tag_spec.rb

@@ -1,7 +1,24 @@
+##
+# This file is part of IMS Caliper Analytics™ and is licensed to
+# IMS Global Learning Consortium, Inc. (http://www.imsglobal.org)
+# under one or more contributor license agreements.  See the NOTICE
+# file distributed with this work for additional information.
+#
+# IMS Caliper is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, version 3 of the License.
+#
+# IMS Caliper is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with this program. If not, see http://www.gnu.org/licenses/.
+
 require 'require_all'
 require_all 'lib/caliper/entities/entity.rb'
-require_all 'lib/caliper/entities/software_application.rb'
-require_all 'lib/caliper/entities/lis/person.rb'
+require_all 'lib/caliper/entities/agent/software_application.rb'
+require_all 'lib/caliper/entities/agent/person.rb'
 require_all 'lib/caliper/entities/lis/membership.rb'
 require_all 'lib/caliper/entities/lis/roles.rb'
 require_all 'lib/caliper/entities/lis/status.rb'
@@ -19,10 +36,10 @@ module Caliper
 
     describe AnnotationEvent do
 
-      it 'should ensure that a AnnotationEvent (Tagged) is correctly created and serialized' do
+      it 'should ensure that a Tagged AnnotationEvent is correctly created and serialized' do
 
         # The Actor (Person/Student))
-        student = Caliper::Entities::LIS::Person.new
+        student = Caliper::Entities::Agent::Person.new
         student.id = 'https://some-university.edu/user/554433'
         membership1 = Caliper::Entities::LIS::Membership.new
         membership1.id = "https://some-university.edu/membership/001"
@@ -84,7 +101,7 @@ module Caliper
         tag.tags = ["to-read", "1765", "shared-with-project-team"]
 
         # The course that is part of the Learning Context (edApp)
-        edApp = Caliper::Entities::SoftwareApplication.new
+        edApp = Caliper::Entities::Agent::SoftwareApplication.new
         edApp.id = 'https://github.com/readium/readium-js-viewer'
         edApp.name = 'Readium'
         edApp.hasMembership = []
@@ -151,9 +168,7 @@ module Caliper
 
         # Ensure that the deserialized tag event object conforms
         expect(annotation_event).to eql(deser_annotation_event)
-
       end
-
     end
   end
-end
+end

data/spec/lib/event/assessment_event_spec.rb

@@ -1,14 +1,30 @@
+##
+# This file is part of IMS Caliper Analytics™ and is licensed to
+# IMS Global Learning Consortium, Inc. (http://www.imsglobal.org)
+# under one or more contributor license agreements.  See the NOTICE
+# file distributed with this work for additional information.
+#
+# IMS Caliper is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, version 3 of the License.
+#
+# IMS Caliper is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with this program. If not, see http://www.gnu.org/licenses/.
+
 require 'require_all'
 require_all 'lib/caliper/entities/entity.rb'
-require_all 'lib/caliper/entities/software_application.rb'
-require_all 'lib/caliper/entities/lis/person.rb'
+require_all 'lib/caliper/entities/agent/software_application.rb'
+require_all 'lib/caliper/entities/agent/person.rb'
 require_all 'lib/caliper/entities/lis/membership.rb'
 require_all 'lib/caliper/entities/lis/roles.rb'
 require_all 'lib/caliper/entities/lis/status.rb'
 require_all 'lib/caliper/entities/lis/course_section.rb'
 require_all 'lib/caliper/entities/lis/course_offering.rb'
 require_all 'lib/caliper/entities/lis/group.rb'
-require_all 'lib/caliper/entities/reading/epub_volume.rb'
 require_all 'lib/caliper/entities/assessment/assessment.rb'
 require_all 'lib/caliper/entities/assessment/assessment_item.rb'
 require_all 'lib/caliper/entities/assignable/attempt.rb'
@@ -25,7 +41,7 @@ module Caliper
       it 'should ensure that a AssessmentEvent is correctly created and serialized' do
 
         # The Actor  = Person/Student))
-        student = Caliper::Entities::LIS::Person.new
+        student = Caliper::Entities::Agent::Person.new
         student.id = 'https://some-university.edu/user/554433'
         membership1 = Caliper::Entities::LIS::Membership.new
         membership1.id = "https://some-university.edu/membership/001"
@@ -132,7 +148,7 @@ module Caliper
         attempt.name = nil
 
         # The Object (edApp)
-        edApp = Caliper::Entities::SoftwareApplication.new
+        edApp = Caliper::Entities::Agent::SoftwareApplication.new
         edApp.id = 'https://com.sat/super-assessment-tool'
         edApp.name = 'Super Assessment Tool'
         edApp.hasMembership = []
@@ -199,9 +215,7 @@ module Caliper
 
         # Ensure that the deserialized bookmark event object conforms
         expect(assessment_event).to eql(deser_assessment_event)
-
       end
-
     end
   end
-end
+end

data/spec/lib/event/assessment_item_completed_event_spec.rb

@@ -1,14 +1,30 @@
+##
+# This file is part of IMS Caliper Analytics™ and is licensed to
+# IMS Global Learning Consortium, Inc. (http://www.imsglobal.org)
+# under one or more contributor license agreements.  See the NOTICE
+# file distributed with this work for additional information.
+#
+# IMS Caliper is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, version 3 of the License.
+#
+# IMS Caliper is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with this program. If not, see http://www.gnu.org/licenses/.
+
 require 'require_all'
 require_all 'lib/caliper/entities/entity.rb'
-require_all 'lib/caliper/entities/software_application.rb'
-require_all 'lib/caliper/entities/lis/person.rb'
+require_all 'lib/caliper/entities/agent/software_application.rb'
+require_all 'lib/caliper/entities/agent/person.rb'
 require_all 'lib/caliper/entities/lis/membership.rb'
 require_all 'lib/caliper/entities/lis/roles.rb'
 require_all 'lib/caliper/entities/lis/status.rb'
 require_all 'lib/caliper/entities/lis/course_section.rb'
 require_all 'lib/caliper/entities/lis/course_offering.rb'
 require_all 'lib/caliper/entities/lis/group.rb'
-require_all 'lib/caliper/entities/reading/epub_volume.rb'
 require_all 'lib/caliper/entities/assessment/assessment.rb'
 require_all 'lib/caliper/entities/assessment/assessment_item.rb'
 require_all 'lib/caliper/entities/assignable/attempt.rb'
@@ -16,7 +32,7 @@ require_all 'lib/caliper/entities/assignable/assignable_digital_resource.rb'
 require_all 'lib/caliper/entities/response/Response.rb'
 require_all 'lib/caliper/entities/response/fillin_blank_response.rb'
 require_all 'lib/caliper/event/assessment_item_event.rb'
-require_all 'lib/caliper/profiles/assessment_profile.rb'
+require_all 'lib/caliper/profiles/assessment_item_profile.rb'
 require 'json_spec'
 
 module Caliper
@@ -24,10 +40,10 @@ module Caliper
 
     describe AssessmentItemEvent do
 
-      it 'should ensure that a AssessmentItemEvent (Completed) is correctly created and serialized' do
+      it 'should ensure that a Completed AssessmentItemEvent is correctly created and serialized' do
 
         # The Actor  = Person/Student))
-        student = Caliper::Entities::LIS::Person.new
+        student = Caliper::Entities::Agent::Person.new
         student.id = 'https://some-university.edu/user/554433'
         membership1 = Caliper::Entities::LIS::Membership.new
         membership1.id = "https://some-university.edu/membership/001"
@@ -148,7 +164,7 @@ module Caliper
         response.values = ["2 July 1776"]
 
         # The Object (edApp)
-        edApp = Caliper::Entities::SoftwareApplication.new
+        edApp = Caliper::Entities::Agent::SoftwareApplication.new
         edApp.id = 'https://com.sat/super-assessment-tool'
         edApp.name = 'Super Assessment Tool'
         edApp.hasMembership = []
@@ -215,9 +231,7 @@ module Caliper
 
         # Ensure that the deserialized bookmark event object conforms
         expect(assessment_event).to eql(deser_assessment_event)
-
       end
-
     end
   end
-end
+end

data/spec/lib/event/assessment_item_started_event_spec.rb

@@ -1,20 +1,36 @@
+##
+# This file is part of IMS Caliper Analytics™ and is licensed to
+# IMS Global Learning Consortium, Inc. (http://www.imsglobal.org)
+# under one or more contributor license agreements.  See the NOTICE
+# file distributed with this work for additional information.
+#
+# IMS Caliper is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, version 3 of the License.
+#
+# IMS Caliper is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with this program. If not, see http://www.gnu.org/licenses/.
+
 require 'require_all'
 require_all 'lib/caliper/entities/entity.rb'
-require_all 'lib/caliper/entities/software_application.rb'
-require_all 'lib/caliper/entities/lis/person.rb'
+require_all 'lib/caliper/entities/agent/software_application.rb'
+require_all 'lib/caliper/entities/agent/person.rb'
 require_all 'lib/caliper/entities/lis/membership.rb'
 require_all 'lib/caliper/entities/lis/roles.rb'
 require_all 'lib/caliper/entities/lis/status.rb'
 require_all 'lib/caliper/entities/lis/course_section.rb'
 require_all 'lib/caliper/entities/lis/course_offering.rb'
 require_all 'lib/caliper/entities/lis/group.rb'
-require_all 'lib/caliper/entities/reading/epub_volume.rb'
 require_all 'lib/caliper/entities/assessment/assessment.rb'
 require_all 'lib/caliper/entities/assessment/assessment_item.rb'
 require_all 'lib/caliper/entities/assignable/attempt.rb'
 require_all 'lib/caliper/entities/assignable/assignable_digital_resource.rb'
 require_all 'lib/caliper/event/assessment_item_event.rb'
-require_all 'lib/caliper/profiles/assessment_profile.rb'
+require_all 'lib/caliper/profiles/assessment_item_profile.rb'
 require 'json_spec'
 
 module Caliper
@@ -22,10 +38,10 @@ module Caliper
 
     describe AssessmentItemEvent do
 
-      it 'should ensure that a AssessmentItemEvent (Started) is correctly created and serialized' do
+      it 'should ensure that a Started AssessmentItemEvent is correctly created and serialized' do
 
         # The Actor  = Person/Student))
-        student = Caliper::Entities::LIS::Person.new
+        student = Caliper::Entities::Agent::Person.new
         student.id = 'https://some-university.edu/user/554433'
         membership1 = Caliper::Entities::LIS::Membership.new
         membership1.id = "https://some-university.edu/membership/001"
@@ -132,7 +148,7 @@ module Caliper
         attempt.name = nil
 
         # The Object (edApp)
-        edApp = Caliper::Entities::SoftwareApplication.new
+        edApp = Caliper::Entities::Agent::SoftwareApplication.new
         edApp.id = 'https://com.sat/super-assessment-tool'
         edApp.name = 'Super Assessment Tool'
         edApp.hasMembership = []
@@ -199,9 +215,7 @@ module Caliper
 
         # Ensure that the deserialized bookmark event object conforms
         expect(assessment_item_started_event).to eql(deser_assessment_item_started_event)
-
       end
-
     end
   end
-end
+end

data/spec/lib/event/assignable_event_spec.rb

@@ -0,0 +1,225 @@
+##
+# This file is part of IMS Caliper Analytics™ and is licensed to
+# IMS Global Learning Consortium, Inc. (http://www.imsglobal.org)
+# under one or more contributor license agreements.  See the NOTICE
+# file distributed with this work for additional information.
+#
+# IMS Caliper is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, version 3 of the License.
+#
+# IMS Caliper is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with this program. If not, see http://www.gnu.org/licenses/.
+
+require 'require_all'
+require_all 'lib/caliper/entities/entity.rb'
+require_all 'lib/caliper/entities/agent/software_application.rb'
+require_all 'lib/caliper/entities/agent/person.rb'
+require_all 'lib/caliper/entities/lis/membership.rb'
+require_all 'lib/caliper/entities/lis/roles.rb'
+require_all 'lib/caliper/entities/lis/status.rb'
+require_all 'lib/caliper/entities/lis/course_section.rb'
+require_all 'lib/caliper/entities/lis/course_offering.rb'
+require_all 'lib/caliper/entities/lis/group.rb'
+require_all 'lib/caliper/entities/assessment/assessment.rb'
+require_all 'lib/caliper/entities/assessment/assessment_item.rb'
+require_all 'lib/caliper/entities/assignable/attempt.rb'
+require_all 'lib/caliper/entities/assignable/assignable_digital_resource.rb'
+require_all 'lib/caliper/event/assignable_event.rb'
+require_all 'lib/caliper/profiles/assignable_profile.rb'
+require 'json_spec'
+
+module Caliper
+  module Event
+
+    describe AssignableEvent do
+
+      it 'should ensure that an AssignableEvent is correctly created and serialized' do
+
+        # The Actor  = Person/Student))
+        student = Caliper::Entities::Agent::Person.new
+        student.id = 'https://some-university.edu/user/554433'
+
+        membership1 = Caliper::Entities::LIS::Membership.new
+        membership1.id = "https://some-university.edu/membership/001"
+        membership1.member = "https://some-university.edu/user/554433"
+        membership1.organization = "https://some-university.edu/politicalScience/2015/american-revolution-101"
+        membership1.roles = [Caliper::Entities::LIS::Roles::LEARNER]
+        membership1.status = Caliper::Entities::LIS::Status::ACTIVE
+        membership1.dateCreated = "2015-08-01T06:00:00.000Z"
+        membership1.dateModified = nil;
+
+        membership2 = Caliper::Entities::LIS::Membership.new
+        membership2.id = "https://some-university.edu/membership/002"
+        membership2.member = "https://some-university.edu/user/554433"
+        membership2.organization = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001"
+        membership2.roles = [Caliper::Entities::LIS::Roles::LEARNER]
+        membership2.status = Caliper::Entities::LIS::Status::ACTIVE
+        membership2.dateCreated = "2015-08-01T06:00:00.000Z"
+        membership2.dateModified = nil
+
+        membership3 = Caliper::Entities::LIS::Membership.new
+        membership3.id = "https://some-university.edu/membership/003"
+        membership3.member = "https://some-university.edu/user/554433"
+        membership3.organization = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001/group/001"
+        membership3.roles = [Caliper::Entities::LIS::Roles::LEARNER]
+        membership3.status = Caliper::Entities::LIS::Status::ACTIVE
+        membership3.dateCreated = "2015-08-01T06:00:00.000Z"
+        membership3.dateModified = nil
+
+        student.hasMembership = [membership1, membership2, membership3]
+        student.dateCreated = '2015-08-01T06:00:00.000Z'
+        student.dateModified = '2015-09-02T11:30:00.000Z'
+        # puts "new student = #{student.to_json}"
+
+        # The Action
+        action = Caliper::Profiles::AssignableActions::ACTIVATED
+
+        # The Object (Assessment)
+        assessment = Caliper::Entities::Assessment::Assessment.new
+        assessment.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1"
+        assessment.name = "American Revolution - Key Figures Assessment"
+        assessment.dateModified =  '2015-09-02T11:30:00.000Z'
+        assessment.dateCreated =  '2015-08-01T06:00:00.000Z'
+        assessment.datePublished =  '2015-08-15T09:30:00.000Z'
+        assessment.version = "1.0"
+        assessment.dateToActivate = '2015-08-16T05:00:00.000Z'
+        assessment.dateToShow =  '2015-08-16T05:00:00.000Z'
+        assessment.dateToStartOn = "2015-08-16T05:00:00.000Z"
+        assessment.dateToSubmit = "2015-09-28T11:59:59.000Z"
+        assessment.maxAttempts = 2
+        assessment.maxSubmits = 2
+        assessment.maxScore = 3.0
+
+        # The Assessment has three items
+        assessmentItem1 = Caliper::Entities::Assessment::AssessmentItem.new
+        assessmentItem1.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1/item1"
+        assessmentItem1.name = "Assessment Item 1"
+        assessmentItem1.isPartOf = assessment.id
+        assessmentItem1.maxAttempts = 2
+        assessmentItem1.maxSubmits = 2
+        assessmentItem1.maxScore = 1.0
+        assessmentItem1.dateCreated = nil
+        assessmentItem1.dateModified = nil
+        assessmentItem1.version = "1.0"
+        assessmentItem1.isTimeDependent = false
+
+        assessmentItem2 = Caliper::Entities::Assessment::AssessmentItem.new
+        assessmentItem2.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1/item2"
+        assessmentItem2.name = "Assessment Item 2"
+        assessmentItem2.isPartOf = assessment.id
+        assessmentItem2.maxAttempts = 2
+        assessmentItem2.maxSubmits = 2
+        assessmentItem2.maxScore = 1.0
+        assessmentItem2.dateCreated = nil
+        assessmentItem2.dateModified = nil
+        assessmentItem2.version = "1.0"
+        assessmentItem2.isTimeDependent = false
+
+        assessmentItem3 = Caliper::Entities::Assessment::AssessmentItem.new
+        assessmentItem3.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1/item3"
+        assessmentItem3.name = "Assessment Item 3"
+        assessmentItem3.isPartOf = assessment.id
+        assessmentItem3.maxAttempts = 2
+        assessmentItem3.maxSubmits = 2
+        assessmentItem3.maxScore = 1.0
+        assessmentItem3.dateCreated = nil
+        assessmentItem3.dateModified = nil
+        assessmentItem3.version = "1.0"
+        assessmentItem3.isTimeDependent = false
+
+        assessment.assessmentItems = [assessmentItem1, assessmentItem2, assessmentItem3]
+
+        # The Event target
+        target = nil;
+
+        # The generated attempt
+        attempt = Caliper::Entities::Assignable::Attempt.new
+        attempt.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1/attempt1"
+        attempt.actor = "https://some-university.edu/user/554433"
+        attempt.assignable = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1"
+        attempt.dateCreated = "2015-08-01T06:00:00.000Z"
+        attempt.dateModified = nil
+        attempt.count = 1
+        attempt.startedAtTime = "2015-09-15T10:15:00.000Z"
+        attempt.duration = nil
+        attempt.endedAtTime = nil
+        attempt.extensions = {}
+        attempt.name = nil
+
+        # The edApp
+        edApp = Caliper::Entities::Agent::SoftwareApplication.new
+        edApp.id = 'https://com.sat/super-assessment-tool'
+        edApp.name = 'Super Assessment Tool'
+        edApp.hasMembership = []
+        edApp.dateCreated = '2015-08-01T06:00:00.000Z'
+        edApp.dateModified = nil
+
+        #LIS Course Offering
+        courseOffering = Caliper::Entities::LIS::CourseOffering.new
+        courseOffering.id = "https://some-university.edu/politicalScience/2015/american-revolution-101"
+        courseOffering.name = "Political Science 101: The American Revolution"
+        courseOffering.courseNumber = "POL101"
+        courseOffering.academicSession = "Fall-2015"
+        courseOffering.membership = []
+        courseOffering.subOrganizationOf = nil
+        courseOffering.dateCreated = '2015-08-01T06:00:00.000Z'
+        courseOffering.dateModified = '2015-09-02T11:30:00.000Z'
+
+        # The LIS Course Section for the Caliper Event
+        course = Caliper::Entities::LIS::CourseSection.new
+        course.id = 'https://some-university.edu/politicalScience/2015/american-revolution-101/section/001'
+        course.name = 'American Revolution 101'
+        course.courseNumber = "POL101"
+        course.academicSession = "Fall-2015"
+        course.category = nil
+        course.membership = [membership2]
+        course.subOrganizationOf = courseOffering
+        course.dateCreated = '2015-08-01T06:00:00.000Z'
+        course.dateModified = '2015-09-02T11:30:00.000Z'
+
+        # LIS Group
+        group = Caliper::Entities::LIS::Group.new
+        group.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001/group/001"
+        group.name = "Discussion Group 001"
+        group.membership = [membership3]
+        group.subOrganizationOf = course
+        group.dateCreated = '2015-08-01T06:00:00.000Z'
+        group.dateModified = nil
+
+        # The Assignable Event
+        assignable_event = AssignableEvent.new
+        assignable_event.actor  = student
+        assignable_event.action = action
+        assignable_event.object = assessment
+        assignable_event.target = nil
+        assignable_event.generated = attempt
+        assignable_event.edApp  = edApp
+        assignable_event.group = group
+        assignable_event.startedAtTime = '2015-09-15T10:15:00.000Z'
+        assignable_event.endedAtTime = nil
+        assignable_event.duration = nil
+        # puts "Event JSON = #{assignable_event.to_json}'"
+
+        # Load JSON from caliper-common-fixtures for comparison
+        # NOTE - sym link to caliper-common-fixtures needs to exist under spec/fixtures
+        file = File.read('spec/fixtures/caliperAssignableEvent.json')
+        data_hash = JSON.parse(file)
+        expected_json = data_hash.to_json # convert hash back to JSON string after parse
+        assignable_event.to_json.should be_json_eql(expected_json)#.excluding("actor", "action", "object", "target", "generated", "edApp", "group")
+
+        # puts "JSON from file = #{data_hash}"
+        deser_assignable_event = AssignableEvent.new
+        deser_assignable_event.from_json data_hash
+        # puts "AssignableEvent from JSON = #{deser_assignable_event.to_json}"
+
+        # Ensure that the deserialized bookmark event object conforms
+        expect(assignable_event).to eql(deser_assignable_event)
+      end
+    end
+  end
+end

data/spec/lib/event/media_event_spec.rb

@@ -1,8 +1,25 @@
+##
+# This file is part of IMS Caliper Analytics™ and is licensed to
+# IMS Global Learning Consortium, Inc. (http://www.imsglobal.org)
+# under one or more contributor license agreements.  See the NOTICE
+# file distributed with this work for additional information.
+#
+# IMS Caliper is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, version 3 of the License.
+#
+# IMS Caliper is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with this program. If not, see http://www.gnu.org/licenses/.
+
 require 'require_all'
 require_all 'lib/caliper/entities/entity.rb'
-require_all 'lib/caliper/entities/software_application.rb'
+require_all 'lib/caliper/entities/agent/software_application.rb'
 require_all 'lib/caliper/entities/learning_objective.rb'
-require_all 'lib/caliper/entities/lis/person.rb'
+require_all 'lib/caliper/entities/agent/person.rb'
 require_all 'lib/caliper/entities/lis/membership.rb'
 require_all 'lib/caliper/entities/lis/roles.rb'
 require_all 'lib/caliper/entities/lis/status.rb'
@@ -21,10 +38,10 @@ module Caliper
 
     describe MediaEvent do
 
-      it 'should ensure that a Media Event (Video Paused) is correctly created and serialized' do
+      it 'should ensure that a Paused Video MediaObjectEvent is correctly created and serialized' do
 
         # The Actor (Person/Student))
-        student = Caliper::Entities::LIS::Person.new
+        student = Caliper::Entities::Agent::Person.new
         student.id = 'https://some-university.edu/user/554433'
         membership1 = Caliper::Entities::LIS::Membership.new
         membership1.id = "https://some-university.edu/membership/001"
@@ -82,7 +99,7 @@ module Caliper
         videoLocation.currentTime = 710
 
         # The course that is part of the Learning Context (edApp)
-        edApp = Caliper::Entities::SoftwareApplication.new
+        edApp = Caliper::Entities::Agent::SoftwareApplication.new
         edApp.id = 'https://com.sat/super-media-tool'
         edApp.name = 'Super Media Tool'
         edApp.hasMembership = []
@@ -149,9 +166,7 @@ module Caliper
 
         # Ensure that the deserialized shared event object conforms
         expect(media_event).to eql(deser_media_event)
-
       end
-
     end
   end
 end

data/spec/lib/event/navigated_event_spec.rb

@@ -1,8 +1,24 @@
+##
+# This file is part of IMS Caliper Analytics™ and is licensed to
+# IMS Global Learning Consortium, Inc. (http://www.imsglobal.org)
+# under one or more contributor license agreements.  See the NOTICE
+# file distributed with this work for additional information.
+#
+# IMS Caliper is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, version 3 of the License.
+#
+# IMS Caliper is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with this program. If not, see http://www.gnu.org/licenses/.
+
 require 'require_all'
 require_all 'lib/caliper/entities/entity.rb'
-require_all 'lib/caliper/entities/web_page.rb'
-require_all 'lib/caliper/entities/software_application.rb'
-require_all 'lib/caliper/entities/lis/person.rb'
+require_all 'lib/caliper/entities/agent/software_application.rb'
+require_all 'lib/caliper/entities/agent/person.rb'
 require_all 'lib/caliper/entities/lis/membership.rb'
 require_all 'lib/caliper/entities/lis/roles.rb'
 require_all 'lib/caliper/entities/lis/status.rb'
@@ -10,6 +26,7 @@ require_all 'lib/caliper/entities/lis/course_section.rb'
 require_all 'lib/caliper/entities/lis/course_offering.rb'
 require_all 'lib/caliper/entities/lis/group.rb'
 require_all 'lib/caliper/entities/reading/epub_volume.rb'
+require_all 'lib/caliper/entities/reading/web_page.rb'
 require_all 'lib/caliper/event/navigation_event.rb'
 require_all 'lib/caliper/profiles/reading_profile.rb'
 require 'json_spec'
@@ -19,10 +36,10 @@ module Caliper
 
     describe NavigationEvent do
 
-      it 'should ensure that a Navigation Event is correctly created and serialized' do
+      it 'should ensure that a NavigatedTo NavigationEvent is correctly created and serialized' do
 
         # The Actor (Person/Student))
-        student = Caliper::Entities::LIS::Person.new
+        student = Caliper::Entities::Agent::Person.new
         student.id = 'https://some-university.edu/user/554433'
         membership1 = Caliper::Entities::LIS::Membership.new
         membership1.id = "https://some-university.edu/membership/001"
@@ -54,7 +71,7 @@ module Caliper
         # puts "new student = #{student.to_json}"
 
         # The Action
-        action = Caliper::Profiles::ReadingActions::NAVIGATED_TO
+        action = Caliper::Profiles::ProfileActions::NAVIGATED_TO
 
         # The Object navigated (ePub Volume)
         ePubVolume = Caliper::Entities::Reading::EPubVolume.new
@@ -75,7 +92,7 @@ module Caliper
         frame.isPartOf = ePubVolume.id
 
         # The course that is part of the Learning Context (edApp)
-        edApp = Caliper::Entities::SoftwareApplication.new
+        edApp = Caliper::Entities::Agent::SoftwareApplication.new
         edApp.id = 'https://github.com/readium/readium-js-viewer'
         edApp.name = 'Readium'
         edApp.hasMembership = []
@@ -115,7 +132,7 @@ module Caliper
         group.dateModified = nil
 
         # The navigatedFrom property (specific to Navigation Event)
-        fromPage = Caliper::Entities::WebPage.new
+        fromPage = Caliper::Entities::Reading::WebPage.new
         fromPage.id = 'https://some-university.edu/politicalScience/2015/american-revolution-101/index.html'
         fromPage.name = 'American Revolution 101 Landing Page'
         fromPage.dateCreated = '2015-08-01T06:00:00.000Z'
@@ -152,9 +169,7 @@ module Caliper
 
         # Ensure that the deserialized shared event object conforms
         expect(navigated_event).to eql(deser_navigated_event)
-
       end
-
     end
   end
-end
+end