ims_caliper 0.9.3.15 → 1.0.0

data/spec/lib/{event/assignable_event_spec.rb → events/assignable_activated_event_spec.rb}

@@ -16,25 +16,24 @@
 # 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/actions/assignable_actions.rb'
+require_all 'lib/caliper/entities/entity_base.rb'
 require_all 'lib/caliper/entities/agent/software_application.rb'
 require_all 'lib/caliper/entities/agent/person.rb'
+require_all 'lib/caliper/entities/assessment/assessment.rb'
 require_all 'lib/caliper/entities/lis/membership.rb'
 require_all 'lib/caliper/entities/lis/role.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_all 'lib/caliper/events/assignable_event.rb'
 require 'json_spec'
 
 module Caliper
-  module Event
+  module Events
 
     describe AssignableEvent do
 
@@ -42,104 +41,90 @@ module Caliper
         
         # Actor
         actor = Caliper::Entities::Agent::Person.new
-        actor.id = 'https://some-university.edu/user/554433'
-        actor.dateCreated = '2015-08-01T06:00:00.000Z'
-        actor.dateModified = '2015-09-02T11:30:00.000Z'
+        actor.id = 'https://example.edu/user/554433'
+        actor.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        actor.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # Action
-        action = Caliper::Profiles::AssignableActions::ACTIVATED
+        action = Caliper::Actions::AssignableActions::ACTIVATED
 
         # Object
         assessment = Caliper::Entities::Assessment::Assessment.new
-        assessment.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1"
+        assessment.id = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001"
         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.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
+        assessment.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        assessment.datePublished = Time.utc(2015,8,15,9,30,0).iso8601(3)
         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.dateToActivate = Time.utc(2015,8,16,5,0,0).iso8601(3)
+        assessment.dateToShow = Time.utc(2015,8,16,5,0,0).iso8601(3)
+        assessment.dateToStartOn = Time.utc(2015,8,16,5,0,0).iso8601(3)
+        assessment.dateToSubmit = Time.utc(2015,9,28,11,59,59).iso8601(3)
         assessment.maxAttempts = 2
         assessment.maxSubmits = 2
         assessment.maxScore = 3.0
 
         # 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.id = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001/attempt/5678"
+        attempt.actor = "https://example.edu/user/554433"
+        attempt.assignable = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001"
+        attempt.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
         attempt.count = 1
-        attempt.startedAtTime = "2015-09-15T10:15:00.000Z"
-        attempt.duration = nil
-        attempt.endedAtTime = nil
-        attempt.extensions = {}
-        attempt.name = nil
+        attempt.startedAtTime = Time.utc(2015,9,15,10,15,0).iso8601(3)
 
         # EdApp
         ed_app = Caliper::Entities::Agent::SoftwareApplication.new
-        ed_app.id = 'https://com.sat/super-assessment-tool'
+        ed_app.id = 'https://example.com/super-assessment-tool'
         ed_app.name = 'Super Assessment Tool'
-        ed_app.dateCreated = '2015-08-01T06:00:00.000Z'
-        ed_app.dateModified = nil
+        ed_app.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         # LIS Course Offering
         course = Caliper::Entities::LIS::CourseOffering.new
-        course.id = "https://some-university.edu/politicalScience/2015/american-revolution-101"
+        course.id = "https://example.edu/politicalScience/2015/american-revolution-101"
         course.name = "Political Science 101: The American Revolution"
         course.courseNumber = "POL101"
         course.academicSession = "Fall-2015"
-        course.subOrganizationOf = nil
-        course.dateCreated = '2015-08-01T06:00:00.000Z'
-        course.dateModified = '2015-09-02T11:30:00.000Z'
+        course.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        course.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # LIS Course Section
         section = Caliper::Entities::LIS::CourseSection.new
-        section.id = 'https://some-university.edu/politicalScience/2015/american-revolution-101/section/001'
+        section.id = 'https://example.edu/politicalScience/2015/american-revolution-101/section/001'
         section.name = 'American Revolution 101'
         section.courseNumber = "POL101"
         section.academicSession = "Fall-2015"
-        section.category = nil
         section.subOrganizationOf = course
-        section.dateCreated = '2015-08-01T06:00:00.000Z'
-        section.dateModified = '2015-09-02T11:30:00.000Z'
+        section.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        section.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # LIS Group
         group = Caliper::Entities::LIS::Group.new
-        group.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001/group/001"
+        group.id = "https://example.edu/politicalScience/2015/american-revolution-101/section/001/group/001"
         group.name = "Discussion Group 001"
         group.subOrganizationOf = section
-        group.dateCreated = '2015-08-01T06:00:00.000Z'
-        group.dateModified = nil
+        group.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         membership = Caliper::Entities::LIS::Membership.new
-        membership.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/roster/554433"
+        membership.id = "https://example.edu/politicalScience/2015/american-revolution-101/roster/554433"
         membership.name = "American Revolution 101"
         membership.description = "Roster entry"
-        membership.member = "https://some-university.edu/user/554433"
-        membership.organization = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001"
+        membership.member = "https://example.edu/user/554433"
+        membership.organization = "https://example.edu/politicalScience/2015/american-revolution-101/section/001"
         membership.roles = [Caliper::Entities::LIS::Role::LEARNER]
         membership.status = Caliper::Entities::LIS::Status::ACTIVE
-        membership.dateCreated = "2015-08-01T06:00:00.000Z"
-        membership.dateModified = nil
+        membership.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         # Create the Event
         event = AssignableEvent.new
         event.actor  = actor
         event.action = action
         event.object = assessment
-        event.target = nil
         event.generated = attempt
-        event.startedAtTime = '2015-09-15T10:15:00.000Z'
-        event.endedAtTime = nil
-        event.duration = nil
+        event.eventTime = Time.utc(2015,9,15,10,15,0).iso8601(3)
         event.edApp = ed_app
         event.group = group
         event.membership = membership
-        # puts "Event JSON = #{event.to_json}'"
 
         # Load JSON from caliper-common-fixtures for comparison
         # NOTE - sym link to caliper-common-fixtures needs to exist under spec/fixtures

data/spec/lib/{event/media_event_spec.rb → events/media_paused_video_event_spec.rb}

@@ -16,7 +16,8 @@
 # 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/actions/media_actions.rb'
+require_all 'lib/caliper/entities/entity_base.rb'
 require_all 'lib/caliper/entities/agent/software_application.rb'
 require_all 'lib/caliper/entities/learning_objective.rb'
 require_all 'lib/caliper/entities/agent/person.rb'
@@ -29,12 +30,11 @@ require_all 'lib/caliper/entities/lis/group.rb'
 require_all 'lib/caliper/entities/media/media_object.rb'
 require_all 'lib/caliper/entities/media/video_object.rb'
 require_all 'lib/caliper/entities/media/media_location.rb'
-require_all 'lib/caliper/event/media_event.rb'
-require_all 'lib/caliper/profiles/media_profile.rb'
+require_all 'lib/caliper/events/media_event.rb'
 require 'json_spec'
 
 module Caliper
-  module Event
+  module Events
 
     describe MediaEvent do
 
@@ -42,98 +42,88 @@ module Caliper
 
         # Actor
         actor = Caliper::Entities::Agent::Person.new
-        actor.id = 'https://some-university.edu/user/554433'
-        actor.dateCreated = '2015-08-01T06:00:00.000Z'
-        actor.dateModified = '2015-09-02T11:30:00.000Z'
+        actor.id = 'https://example.edu/user/554433'
+        actor.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        actor.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # Action
-        action = Caliper::Profiles::MediaActions::PAUSED
+        action = Caliper::Actions::MediaActions::PAUSED
 
         # Learning Objective (video.alignedLearningObjective)
         learnObjective = Caliper::Entities::LearningObjective.new
-        learnObjective.id = 'http://americanrevolution.com/personalities/learn'
-        learnObjective.dateCreated = '2015-08-01T06:00:00.000Z'
-        learnObjective.dateModified = nil
+        learnObjective.id = 'https://example.edu/american-revolution-101/personalities/learn'
+        learnObjective.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         # Object
         video = Caliper::Entities::Media::VideoObject.new
-        video.id = 'https://com.sat/super-media-tool/video/video1'
+        video.id = 'https://example.com/super-media-tool/video/1225'
         video.name = 'American Revolution - Key Figures Video'
         video.version = '1.0'
         video.duration = 1420
-        video.dateCreated = '2015-08-01T06:00:00.000Z'
-        video.dateModified = '2015-09-02T11:30:00.000Z'
+        video.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        video.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
         video.alignedLearningObjective = [learnObjective]
 
         # Target coordinates
         target = Caliper::Entities::Media::MediaLocation.new
-        target.id = 'https://com.sat/super-media-tool/video/video1'
+        target.id = 'https://example.com/super-media-tool/video/1225'
         target.version = '1.0'
-        target.dateCreated = '2015-08-01T06:00:00.000Z'
-        target.dateModified = nil
+        target.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
         target.currentTime = 710
 
         # ed_app
         ed_app = Caliper::Entities::Agent::SoftwareApplication.new
-        ed_app.id = 'https://com.sat/super-media-tool'
+        ed_app.id = 'https://example.com/super-media-tool'
         ed_app.name = 'Super Media Tool'
-        ed_app.dateCreated = '2015-08-01T06:00:00.000Z'
-        ed_app.dateModified = '2015-09-02T11:30:00.000Z'
+        ed_app.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        ed_app.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # LIS Course Offering
         course = Caliper::Entities::LIS::CourseOffering.new
-        course.id = "https://some-university.edu/politicalScience/2015/american-revolution-101"
+        course.id = "https://example.edu/politicalScience/2015/american-revolution-101"
         course.name = "Political Science 101: The American Revolution"
         course.courseNumber = "POL101"
         course.academicSession = "Fall-2015"
-        course.subOrganizationOf = nil
-        course.dateCreated = '2015-08-01T06:00:00.000Z'
-        course.dateModified = '2015-09-02T11:30:00.000Z'
+        course.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        course.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # LIS Course Section
         section = Caliper::Entities::LIS::CourseSection.new
-        section.id = 'https://some-university.edu/politicalScience/2015/american-revolution-101/section/001'
+        section.id = 'https://example.edu/politicalScience/2015/american-revolution-101/section/001'
         section.name = 'American Revolution 101'
         section.courseNumber = "POL101"
         section.academicSession = "Fall-2015"
-        section.category = nil
         section.subOrganizationOf = course
-        section.dateCreated = '2015-08-01T06:00:00.000Z'
-        section.dateModified = '2015-09-02T11:30:00.000Z'
+        section.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        section.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # LIS Group
         group = Caliper::Entities::LIS::Group.new
-        group.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001/group/001"
+        group.id = "https://example.edu/politicalScience/2015/american-revolution-101/section/001/group/001"
         group.name = "Discussion Group 001"
         group.subOrganizationOf = section
-        group.dateCreated = '2015-08-01T06:00:00.000Z'
-        group.dateModified = nil
+        group.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         membership = Caliper::Entities::LIS::Membership.new
-        membership.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/roster/554433"
+        membership.id = "https://example.edu/politicalScience/2015/american-revolution-101/roster/554433"
         membership.name = "American Revolution 101"
         membership.description = "Roster entry"
-        membership.member = "https://some-university.edu/user/554433"
-        membership.organization = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001"
+        membership.member = "https://example.edu/user/554433"
+        membership.organization = "https://example.edu/politicalScience/2015/american-revolution-101/section/001"
         membership.roles = [Caliper::Entities::LIS::Role::LEARNER]
         membership.status = Caliper::Entities::LIS::Status::ACTIVE
-        membership.dateCreated = "2015-08-01T06:00:00.000Z"
-        membership.dateModified = nil
+        membership.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         # Create the Event
-        event = Caliper::Event::MediaEvent.new
+        event = Caliper::Events::MediaEvent.new
         event.actor  = actor
         event.action = action
         event.object = video
         event.target = target
-        event.generated = nil
-        event.startedAtTime = '2015-09-15T10:15:00.000Z'
-        event.endedAtTime = nil
-        event.duration = nil
+        event.eventTime = Time.utc(2015,9,15,10,15,0).iso8601(3)
         event.edApp = ed_app
         event.group = group
         event.membership = membership
-        # puts "Event JSON = #{event.to_json}'"
 
         # Load JSON from caliper-common-fixtures for comparison
         # NOTE - sym link to caliper-common-fixtures needs to exist under spec/fixtures
@@ -143,7 +133,7 @@ module Caliper
         expect(event.to_json).to be_json_eql(expected_json)#.excluding("actor", "action", "object", "target", "generated", "ed_app", "group")
 
         # puts "JSON from file = #{data_hash}"
-        deser_event = Caliper::Event::MediaEvent.new
+        deser_event = Caliper::Events::MediaEvent.new
         deser_event.from_json data_hash
         # puts "ReadingEvent from JSON = #{deser_event.to_json}"
 

data/spec/lib/{event/navigated_event_spec.rb → events/navigation_navigated_to_event_spec.rb}

@@ -16,7 +16,8 @@
 # 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/actions/navigation_actions.rb'
+require_all 'lib/caliper/entities/entity_base.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'
@@ -27,12 +28,11 @@ 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_all 'lib/caliper/events/navigation_event.rb'
 require 'json_spec'
 
 module Caliper
-  module Event
+  module Events
 
     describe NavigationEvent do
 
@@ -40,102 +40,93 @@ module Caliper
 
         # Actor
         actor = Caliper::Entities::Agent::Person.new
-        actor.id = 'https://some-university.edu/user/554433'
-        actor.dateCreated = '2015-08-01T06:00:00.000Z'
-        actor.dateModified = '2015-09-02T11:30:00.000Z'
+        actor.id = 'https://example.edu/user/554433'
+        actor.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        actor.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # Action
-        action = Caliper::Profiles::ProfileActions::NAVIGATED_TO
+        action = Caliper::Actions::NavigationActions::NAVIGATED_TO
 
         # Object
         obj = Caliper::Entities::Reading::EPubVolume.new
-        obj.id = 'https://github.com/readium/readium-js-viewer/book/34843#epubcfi(/4/3)'
+        obj.id = 'https://example.com/viewer/book/34843#epubcfi(/4/3)'
         obj.name = 'The Glorious Cause: The American Revolution, 1763-1789 (Oxford History of the United States)'
         obj.version = '2nd ed.'
-        obj.dateCreated = '2015-08-01T06:00:00.000Z'
-        obj.dateModified = '2015-09-02T11:30:00.000Z'
+        obj.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        obj.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # Target frame
         target = Caliper::Entities::Reading::Frame.new
-        target.id = 'https://github.com/readium/readium-js-viewer/book/34843#epubcfi(/4/3/1)'
+        target.id = 'https://example.com/viewer/book/34843#epubcfi(/4/3/1)'
         target.name = 'Key Figures: George Washington'
         target.isPartOf = obj
         target.version = obj.version
         target.index = 1
-        target.dateCreated = '2015-08-01T06:00:00.000Z'
-        target.dateModified = '2015-09-02T11:30:00.000Z'
+        target.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        target.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # NavigatedFrom property (specific to Navigation Event)
         from = Caliper::Entities::Reading::WebPage.new
-        from.id = 'https://some-university.edu/politicalScience/2015/american-revolution-101/index.html'
+        from.id = 'https://example.edu/politicalScience/2015/american-revolution-101/index.html'
         from.name = 'American Revolution 101 Landing Page'
-        from.dateCreated = '2015-08-01T06:00:00.000Z'
-        from.dateModified = '2015-09-02T11:30:00.000Z'
-        from.isPartOf = nil
+        from.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        from.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
         from.version = '1.0'
 
         # EdApp
         ed_app = Caliper::Entities::Agent::SoftwareApplication.new
-        ed_app.id = 'https://github.com/readium/readium-js-viewer'
-        ed_app.name = 'Readium'
-        ed_app.dateCreated = '2015-08-01T06:00:00.000Z'
-        ed_app.dateModified = '2015-09-02T11:30:00.000Z'
+        ed_app.id = 'https://example.com/viewer'
+        ed_app.name = 'ePub'
+        ed_app.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        ed_app.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # LIS Course Offering
         course = Caliper::Entities::LIS::CourseOffering.new
-        course.id = "https://some-university.edu/politicalScience/2015/american-revolution-101"
+        course.id = "https://example.edu/politicalScience/2015/american-revolution-101"
         course.name = "Political Science 101: The American Revolution"
         course.courseNumber = "POL101"
         course.academicSession = "Fall-2015"
-        course.subOrganizationOf = nil
-        course.dateCreated = '2015-08-01T06:00:00.000Z'
-        course.dateModified = '2015-09-02T11:30:00.000Z'
+        course.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        course.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # LIS Course Section
         section = Caliper::Entities::LIS::CourseSection.new
-        section.id = 'https://some-university.edu/politicalScience/2015/american-revolution-101/section/001'
+        section.id = 'https://example.edu/politicalScience/2015/american-revolution-101/section/001'
         section.name = 'American Revolution 101'
         section.courseNumber = "POL101"
         section.academicSession = "Fall-2015"
-        section.category = nil
         section.subOrganizationOf = course
-        section.dateCreated = '2015-08-01T06:00:00.000Z'
-        section.dateModified = '2015-09-02T11:30:00.000Z'
+        section.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        section.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # LIS Group
         group = Caliper::Entities::LIS::Group.new
-        group.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001/group/001"
+        group.id = "https://example.edu/politicalScience/2015/american-revolution-101/section/001/group/001"
         group.name = "Discussion Group 001"
         group.subOrganizationOf = section
-        group.dateCreated = '2015-08-01T06:00:00.000Z'
-        group.dateModified = nil
+        group.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         membership = Caliper::Entities::LIS::Membership.new
-        membership.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/roster/554433"
+        membership.id = "https://example.edu/politicalScience/2015/american-revolution-101/roster/554433"
         membership.name = "American Revolution 101"
         membership.description = "Roster entry"
-        membership.member = "https://some-university.edu/user/554433"
-        membership.organization = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001"
+        membership.member = "https://example.edu/user/554433"
+        membership.organization = "https://example.edu/politicalScience/2015/american-revolution-101/section/001"
         membership.roles = [Caliper::Entities::LIS::Role::LEARNER]
         membership.status = Caliper::Entities::LIS::Status::ACTIVE
-        membership.dateCreated = "2015-08-01T06:00:00.000Z"
-        membership.dateModified = nil
+        membership.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         # Create the Event
-        event = Caliper::Event::NavigationEvent.new
+        event = Caliper::Events::NavigationEvent.new
         event.actor  = actor
         event.action = action
         event.object = obj
         event.target = target
-        event.generated = nil
         event.navigatedFrom = from
-        event.startedAtTime = '2015-09-15T10:15:00.000Z'
-        event.endedAtTime = nil
-        event.duration = nil
+        event.eventTime = Time.utc(2015,9,15,10,15,0).iso8601(3)
         event.edApp = ed_app
         event.group = group
         event.membership = membership
-        # puts "Event JSON = #{event.to_json}'"
 
         # Load JSON from caliper-common-fixtures for comparison
         # NOTE - sym link to caliper-common-fixtures needs to exist under spec/fixtures
@@ -145,7 +136,7 @@ module Caliper
         expect(event.to_json).to be_json_eql(expected_json)#.excluding("actor", "action", "object", "target", "generated", "edApp", "group")
 
         # puts "JSON from file = #{data_hash}"
-        deser_event = Caliper::Event::NavigationEvent.new
+        deser_event = Caliper::Events::NavigationEvent.new
         deser_event.from_json data_hash
         # puts "ReadingEvent from JSON = #{deser_event.to_json}"