ims_caliper 0.9.3.14 → 0.9.3.15

data/spec/lib/event/session_event_timeout_spec.rb

@@ -20,7 +20,7 @@ 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/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'
@@ -37,121 +37,95 @@ module Caliper
 
       it 'should ensure that a TimedOut SessionEvent is correctly created and serialized' do
 
-        # The Actor (Person/Student))
+        # 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'
+
+        # Actor (edApp)
+        actor = ed_app
+
+        # Action
+        action = Caliper::Profiles::SessionActions::TIMED_OUT
+
+        # Object session actor (session.actor)
         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::SessionActions::TIMED_OUT
+        # Object
+        obj = Caliper::Entities::Session::Session.new
+        obj.id = 'https://github.com/readium/session-123456789'
+        obj.name = 'session-123456789'
+        obj.description = nil
+        obj.actor = student
+        obj.startedAtTime = '2015-09-15T10:15:00.000Z'
+        obj.endedAtTime = '2015-09-15T11:05:00.000Z'
+        obj.duration = 'PT3000S'
+        obj.dateCreated = '2015-08-01T06:00:00.000Z'
+        obj.dateModified = '2015-09-02T11:30:00.000Z'
 
-        # The Object (edApp)
-        edApp = Caliper::Entities::Agent::SoftwareApplication.new
-        edApp.id = 'https://github.com/readium/readium-js-viewer'
-        edApp.name = 'Readium'
-        edApp.hasMembership = []
-        edApp.dateCreated = '2015-08-01T06:00:00.000Z'
-        edApp.dateModified = '2015-09-02T11:30:00.000Z'
-
-        # The Target (Session)
-        session = Caliper::Entities::Session::Session.new
-        session.id = 'https://github.com/readium/session-123456789'
-        session.name = 'session-123456789'
-        session.description = nil
-        session.actor = student
-        session.startedAtTime = '2015-09-15T10:15:00.000Z'
-        session.endedAtTime = '2015-09-15T11:05:00.000Z'
-        session.duration = 'PT3000S'
-        session.dateCreated = '2015-08-01T06:00:00.000Z'
-        session.dateModified = '2015-09-02T11:30:00.000Z'
-
-        #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'
+        # LIS Course Offering
+        course = Caliper::Entities::LIS::CourseOffering.new
+        course.id = "https://some-university.edu/politicalScience/2015/american-revolution-101"
+        course.name = "Political Science 101: The American Revolution"
         course.courseNumber = "POL101"
         course.academicSession = "Fall-2015"
-        course.category = nil
-        course.membership = [membership2]
-        course.subOrganizationOf = courseOffering
+        course.subOrganizationOf = nil
         course.dateCreated = '2015-08-01T06:00:00.000Z'
         course.dateModified = '2015-09-02T11:30:00.000Z'
 
+        # LIS Course Section
+        section = Caliper::Entities::LIS::CourseSection.new
+        section.id = 'https://some-university.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'
+
         # 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.subOrganizationOf = section
         group.dateCreated = '2015-08-01T06:00:00.000Z'
         group.dateModified = nil
 
-        # The (Session) Event
-        session_event = SessionEvent.new
-        session_event.actor  = edApp
-        session_event.action = action
-        session_event.object = edApp
-        session_event.target = session
-        session_event.generated = nil
-        session_event.edApp  = edApp
-        session_event.group = group
-        session_event.startedAtTime = '2015-09-15T10:15:00.000Z'
-        session_event.endedAtTime = '2015-09-15T11:05:00.000Z'
-        session_event.duration = 'PT3000S'
-        # puts "Event JSON = #{session_event.to_json}'"
+        # Create the Event
+        event = SessionEvent.new
+        event.actor  = ed_app
+        event.action = action
+        event.object = obj
+        event.target = nil
+        event.generated = nil
+        event.startedAtTime = '2015-09-15T10:15:00.000Z'
+        event.endedAtTime = '2015-09-15T11:05:00.000Z'
+        event.duration = 'PT3000S'
+        event.edApp = ed_app
+        event.group = group
+        event.membership = nil
+        # 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
         file = File.read('spec/fixtures/caliperSessionTimeoutEvent.json')
         data_hash = JSON.parse(file)
         expected_json = data_hash.to_json # convert hash back to JSON string after parse
-        session_event.to_json.should be_json_eql(expected_json)#.excluding("actor", "action", "object", "target", "generated", "edApp", "group")
+        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_session_event = SessionEvent.new
-        deser_session_event.from_json data_hash
-        # puts "SessionEvent from JSON = #{deser_session_event.to_json}"
+        deser_event = SessionEvent.new
+        deser_event.from_json data_hash
+        # puts "SessionEvent from JSON = #{deser_event.to_json}"
 
         # Ensure that the deserialized session event object conforms
-        expect(session_event).to eql(deser_session_event)
+        expect(event).to eql(deser_event)
       end
     end
   end

data/spec/lib/event/viewed_event_spec.rb

@@ -20,7 +20,7 @@ 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/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'
@@ -37,127 +37,109 @@ module Caliper
 
       it 'should ensure that a ViewedEvent 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
+        # 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'
+
+        # Action
         action = Caliper::Profiles::ReadingActions::VIEWED
 
-        # The Object viewed (ePub Volume)
-        ePubVolume = Caliper::Entities::Reading::EPubVolume.new
-        ePubVolume.id = 'https://github.com/readium/readium-js-viewer/book/34843#epubcfi(/4/3)'
-        ePubVolume.name = 'The Glorious Cause: The American Revolution, 1763-1789 (Oxford History of the United States)'
-        ePubVolume.version = '2nd ed.'
-        ePubVolume.dateCreated = '2015-08-01T06:00:00.000Z'
-        ePubVolume.dateModified = '2015-09-02T11:30:00.000Z'
+        # Object
+        obj = Caliper::Entities::Reading::EPubVolume.new
+        obj.id = 'https://github.com/readium/readium-js-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'
 
-        # The Target within the Object (frame)
+        # Target frame
         frame = Caliper::Entities::Reading::Frame.new
         frame.id = 'https://github.com/readium/readium-js-viewer/book/34843#epubcfi(/4/3/1)'
         frame.name = 'Key Figures: George Washington'
-        frame.version = '2nd ed.'
+        frame.isPartOf = obj
+        frame.version = obj.version
+        frame.index = 1
         frame.dateCreated = '2015-08-01T06:00:00.000Z'
         frame.dateModified = '2015-09-02T11:30:00.000Z'
-        frame.index = 1
-        frame.isPartOf = ePubVolume.id
-
-        # The course that is part of the Learning Context (edApp)
-        edApp = Caliper::Entities::Agent::SoftwareApplication.new
-        edApp.id = 'https://github.com/readium/readium-js-viewer'
-        edApp.name = 'Readium'
-        edApp.hasMembership = []
-        edApp.dateCreated = '2015-08-01T06:00:00.000Z'
-        edApp.dateModified = '2015-09-02T11:30:00.000Z'
-
-        #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'
+
+        # 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'
+
+        # LIS Course Offering
+        course = Caliper::Entities::LIS::CourseOffering.new
+        course.id = "https://some-university.edu/politicalScience/2015/american-revolution-101"
+        course.name = "Political Science 101: The American Revolution"
         course.courseNumber = "POL101"
         course.academicSession = "Fall-2015"
-        course.category = nil
-        course.membership = [membership2]
-        course.subOrganizationOf = courseOffering
+        course.subOrganizationOf = nil
         course.dateCreated = '2015-08-01T06:00:00.000Z'
         course.dateModified = '2015-09-02T11:30:00.000Z'
 
+        # LIS Course Section
+        section = Caliper::Entities::LIS::CourseSection.new
+        section.id = 'https://some-university.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'
+
         # 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.subOrganizationOf = section
         group.dateCreated = '2015-08-01T06:00:00.000Z'
         group.dateModified = nil
 
-        # The (Reading::BookmarkReading) Event
-        viewed_event = Caliper::Event::ViewEvent.new
-        viewed_event.actor  = student
-        viewed_event.action = action
-        viewed_event.object = ePubVolume
-        viewed_event.target = frame
-        viewed_event.generated = nil
-        viewed_event.edApp  = edApp
-        viewed_event.group = group
-        viewed_event.startedAtTime = '2015-09-15T10:15:00.000Z'
-        viewed_event.endedAtTime = nil
-        viewed_event.duration = nil
-        # puts "Event JSON = #{viewed_event.to_json}'"
+        membership = Caliper::Entities::LIS::Membership.new
+        membership.id = "https://some-university.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.roles = [Caliper::Entities::LIS::Role::LEARNER]
+        membership.status = Caliper::Entities::LIS::Status::ACTIVE
+        membership.dateCreated = "2015-08-01T06:00:00.000Z"
+        membership.dateModified = nil
+
+        # Create Event
+        event = Caliper::Event::ViewEvent.new
+        event.actor  = actor
+        event.action = action
+        event.object = obj
+        event.target = frame
+        event.generated = nil
+        event.startedAtTime = '2015-09-15T10:15:00.000Z'
+        event.endedAtTime = nil
+        event.duration = nil
+        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
         file = File.read('spec/fixtures/caliperViewEvent.json')
         data_hash = JSON.parse(file)
         expected_json = data_hash.to_json # convert hash back to JSON string after parse
-        viewed_event.to_json.should be_json_eql(expected_json)#.excluding("actor", "action", "object", "target", "generated", "edApp", "group")
+        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_viewed_event = Caliper::Event::ViewEvent.new
-        deser_viewed_event.from_json data_hash
-        # puts "ReadingEvent from JSON = #{deser_viewed_event.to_json}"
+        deser_event = Caliper::Event::ViewEvent.new
+        deser_event.from_json data_hash
+        # puts "ReadingEvent from JSON = #{deser_event.to_json}"
 
         # Ensure that the deserialized shared event object conforms
-        expect(viewed_event).to eql(deser_viewed_event)
+        expect(event).to eql(deser_event)
       end
     end
   end

data/spec/lib/event_helper.rb

@@ -20,7 +20,7 @@ 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/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'
@@ -35,127 +35,107 @@ module Helper
 
   def session_event
 
-    # 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
+    # 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'
+
+    # 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'
+
+    # Action
     action = Caliper::Profiles::SessionActions::LOGGED_IN;
 
-    # The Object (edApp)
-    edApp = Caliper::Entities::Agent::SoftwareApplication.new
-    edApp.id = 'https://github.com/readium/readium-js-viewer'
-    edApp.name = 'Readium'
-    edApp.dateCreated = '2015-08-01T06:00:00.000Z'
-    edApp.dateModified = '2015-09-02T11:30:00.000Z'
-
-    # The Target (Frame)
-    ePubVolume = Caliper::Entities::Reading::EPubVolume.new
-    ePubVolume.id = 'https://github.com/readium/readium-js-viewer/book/34843#epubcfi(/4/3)'
-    ePubVolume.name = 'The Glorious Cause: The American Revolution, 1763-1789 (Oxford History of the United States)'
-    ePubVolume.version = '2nd ed.'
-    ePubVolume.dateCreated = '2015-08-01T06:00:00.000Z'
-    ePubVolume.dateModified = '2015-09-02T11:30:00.000Z'
-
-    frame = Caliper::Entities::Reading::Frame.new
-    frame.id = 'https://github.com/readium/readium-js-viewer/book/34843#epubcfi(/4/3/1)'
-    frame.name = 'Key Figures: George Washington'
-    frame.version = '2nd ed.'
-    frame.dateCreated = '2015-08-01T06:00:00.000Z'
-    frame.dateModified = '2015-09-02T11:30:00.000Z'
-    frame.index = 1
-    frame.isPartOf = ePubVolume
-
-    # The Generated (Session)
-    session = Caliper::Entities::Session::Session.new
-    session.id = 'https://github.com/readium/session-123456789'
-    session.name = 'session-123456789'
-    session.description = nil
-    session.actor = student
-    session.startedAtTime = '2015-09-15T10:15:00.000Z'
-    session.endedAtTime = nil
-    session.duration = nil
-    session.dateCreated = '2015-08-01T06:00:00.000Z'
-    session.dateModified = '2015-09-02T11:30:00.000Z'
-
-    # The LIS Course Section for the Caliper Event
-    edApp = Caliper::Entities::Agent::SoftwareApplication.new
-    edApp.id = 'https://github.com/readium/readium-js-viewer'
-    edApp.name = 'Readium'
-    edApp.hasMembership = []
-    edApp.dateCreated = '2015-08-01T06:00:00.000Z'
-    edApp.dateModified = '2015-09-02T11:30:00.000Z'
-
-    #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'
+    # Object
+    obj = ed_app
+
+    # ePub parent (frame.isPartOf)
+    ePub = Caliper::Entities::Reading::EPubVolume.new
+    ePub.id = 'https://github.com/readium/readium-js-viewer/book/34843#epubcfi(/4/3)'
+    ePub.name = 'The Glorious Cause: The American Revolution, 1763-1789 (Oxford History of the United States)'
+    ePub.version = '2nd ed.'
+    ePub.dateCreated = '2015-08-01T06:00:00.000Z'
+    ePub.dateModified = '2015-09-02T11:30:00.000Z'
+
+    # Target frame
+    target = Caliper::Entities::Reading::Frame.new
+    target.id = 'https://github.com/readium/readium-js-viewer/book/34843#epubcfi(/4/3/1)'
+    target.name = 'Key Figures: George Washington'
+    target.isPartOf = ePub
+    target.version = ePub.version
+    target.index = 1
+    target.dateCreated = '2015-08-01T06:00:00.000Z'
+    target.dateModified = '2015-09-02T11:30:00.000Z'
+
+    # Generated session
+    generated = Caliper::Entities::Session::Session.new
+    generated.id = 'https://github.com/readium/session-123456789'
+    generated.name = 'session-123456789'
+    generated.description = nil
+    generated.actor = actor
+    generated.startedAtTime = '2015-09-15T10:15:00.000Z'
+    generated.endedAtTime = nil
+    generated.duration = nil
+    generated.dateCreated = '2015-08-01T06:00:00.000Z'
+    generated.dateModified = '2015-09-02T11:30:00.000Z'
+
+    # LIS Course Offering
+    course = Caliper::Entities::LIS::CourseOffering.new
+    course.id = "https://some-university.edu/politicalScience/2015/american-revolution-101"
+    course.name = "Political Science 101: The American Revolution"
     course.courseNumber = "POL101"
     course.academicSession = "Fall-2015"
-    course.category = nil
-    course.membership = [membership2]
-    course.subOrganizationOf = courseOffering
+    course.subOrganizationOf = nil
     course.dateCreated = '2015-08-01T06:00:00.000Z'
     course.dateModified = '2015-09-02T11:30:00.000Z'
 
+    # LIS Course Section
+    section = Caliper::Entities::LIS::CourseSection.new
+    section.id = 'https://some-university.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'
+
     # 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.subOrganizationOf = section
     group.dateCreated = '2015-08-01T06:00:00.000Z'
     group.dateModified = nil
 
-    # The (Session) Event
-    session_event = Caliper::Event::SessionEvent.new
-    session_event.actor  = student
-    session_event.action = action
-    session_event.object = edApp
-    session_event.target = frame
-    session_event.generated = session
-    session_event.edApp  = edApp
-    session_event.group = course
-    session_event.startedAtTime = '2015-09-15T10:15:00.000Z'
-    return session_event
+    membership = Caliper::Entities::LIS::Membership.new
+    membership.id = "https://some-university.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.roles = [Caliper::Entities::LIS::Role::LEARNER]
+    membership.status = Caliper::Entities::LIS::Status::ACTIVE
+    membership.dateCreated = "2015-08-01T06:00:00.000Z"
+    membership.dateModified = nil
+
+    # Create the Event
+    event = Caliper::Event::SessionEvent.new
+    event.actor  = actor
+    event.action = action
+    event.object = obj
+    event.target = target
+    event.generated = generated
+    event.startedAtTime = '2015-09-15T10:15:00.000Z'
+    event.edApp  = ed_app
+    event.group = course
+    event.membership = membership
+
+    return event
   end
 end