ims_caliper 0.1.3 → 0.9.0

data/lib/caliper/validators/property_type_check.rb

@@ -1,14 +1,33 @@
+##
+# 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_relative '../entities/lis/person'
-require_relative '../entities/schemadotorg/software_application'
+require_relative '../agent/person'
+require_relative '../schemadotorg/software_application'
+
+#
+# Type check.
+#
 module Caliper
 	module Validators
 		class PropertyTypeCheck
-
 			# whether the object is of wanted target class
 			def is_object_of_type(object, targetClass)
 				return !object.nil? && object.is_a?(targetClass)
 			end
 		end
 	end
-end
+end

data/lib/caliper/validators/session_login_event_validator.rb

@@ -1,15 +1,33 @@
-require_relative 'event_validator'
-require_relative 'error_message'
-require_relative 'property_type_check'
-require_relative 'time_check'
-require_relative '../event/event'
-require_relative '../profiles/profile'
-require_relative '../entities/lis/person'
-require_relative '../entities/digital_resource'
-require_relative '../entities/session'
-require_relative '../entities/schemadotorg/software_application'
+##
+# 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_relative './event_validator'
+require_relative './error_message'
+require_relative './property_type_check'
+require_relative './time_check'
+require_relative '../event/event'
+require_relative '../agent/person'
+require_relative '../digital_resource'
+require_relative '../session/session'
+require_relative '../schemadotorg/software_application'
 
+#
+# Session Login validator
+#
 module Caliper
 	module Validators
 		class SessionLoginEventValidator
@@ -43,52 +61,52 @@ module Caliper
 				else
 					# is event context of Session
 					if (!event.context.equal?(EventType::SESSION))
-						error_message.append_text(event.context + " " + ProfileConformance::CONTEXT_ERROR)
+						error_message.append_text(event.context + " " + Conformance::CONTEXT_ERROR)
 					end
 
 					# is event type of Session
 					if (!event.type.equal?(EventType::SESSION))
-						error_message.append_text(event.type + " " + ProfileConformance::TYPE_ERROR)
+						error_message.append_text(event.type + " " + Conformance::TYPE_ERROR)
 					end
 
 					# is event actor a Person
 					if (!property_check.is_object_of_type(event.actor, Person.class))
-						error_message.append_text(event.actor.class + " " + ProfileConformance::ACTOR_NOT_PERSON)
+						error_message.append_text(event.actor.class + " " + Conformance::ACTOR_NOT_PERSON)
 					end
 
 					# is event object a SoftwareApplication
 					if (!property_check.is_object_of_type(event.object, SoftwareApplication.class))
-						error_message.append_text(event.object.class + " " + ProfileConformance::OBJECT_NOT_SOFTWAREAPP)
+						error_message.append_text(event.object.class + " " + Conformance::OBJECT_NOT_SOFTWAREAPP)
 					end
 
 					# is event target a DigitalResource
 					if (!property_check.is_object_of_type(event.target, DigitalResource.class))
-						error_message.append_text(event.object.class + " " + ProfileConformance::TARGET_NOT_DIGITALRESOURCE)
+						error_message.append_text(event.object.class + " " + Conformance::TARGET_NOT_DIGITALRESOURCE)
 					end
 
 					if (property_check.is_object_of_type(event.generated, Session.class))
 						if (event.generated.started_at_time == 0)
-							error_message.append_text(context + " " + ProfileConformance::STARTEDATTIME_IS_NULL)
+							error_message.append_text(context + " " + Conformance::STARTEDATTIME_IS_NULL)
 						elsif (event.generated.end_at_time != 0)
-							error_message.append_text(context + " " + ProfileConformance::ENDEDATTIME_SET)
+							error_message.append_text(context + " " + Conformance::ENDEDATTIME_SET)
 						end
 					else
-						error_message.append_text(ProfileConformance::GENERATED_NOT_SESSION)
+						error_message.append_text(Conformance::GENERATED_NOT_SESSION)
 					end
 
 					# start time set for event
 					if (!check_started_at_time(event.started_at_time))
-						error_message.append_text(ProfileConformance::STARTEDATTIME_IS_NULL)
+						error_message.append_text(Conformance::STARTEDATTIME_IS_NULL)
 					end
 
 					# also check the event end time
 					if (!check_ended_at_time(event.started_at_time, event.ended_at_time))
-						error_message.append_text(ProfileConformance::TIME_ERROR)
+						error_message.append_text(Conformance::TIME_ERROR)
 					end
 
 					# check duration value
 					if (check_duration(event.duration))
-						error_message.append_text(ProfileConformance::DURATION_INVALID)
+						error_message.append_text(Conformance::DURATION_INVALID)
 					end
 
 					if (error_message.length() > 0)

data/lib/caliper/validators/session_logout_event_validator.rb

@@ -1,15 +1,33 @@
+##
+# 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_relative 'event_validator'
 require_relative 'error_message'
 require_relative 'property_type_check'
 require_relative 'time_check'
 require_relative '../event/event'
-require_relative '../profiles/profile'
-require_relative '../entities/lis/person'
+require_relative '../entities/agent/person'
 require_relative '../entities/digital_resource'
-require_relative '../entities/session'
+require_relative '../entities/session/session'
 require_relative '../entities/schemadotorg/software_application'
 
-
+#
+# Session logout validator.
+#
 module Caliper
 	module Validators
 		class SessionLogoutEventValidator
@@ -47,47 +65,47 @@ module Caliper
 				else
 					# is event context of Session
 					if (!event.context.equal?(EventType::SESSION))
-						error_message.append_text(event.context + " " + ProfileConformance::CONTEXT_ERROR)
+						error_message.append_text(event.context + " " + Conformance::CONTEXT_ERROR)
 					end
 
 					# is event type of Session
 					if (!event.type.equal?(EventType::SESSION))
-						error_message.append_text(event.type + " " + ProfileConformance::TYPE_ERROR)
+						error_message.append_text(event.type + " " + Conformance::TYPE_ERROR)
 					end
 
 					# is event actor a Person
 					if (!property_check.is_object_of_type(event.actor, Person.class))
-						error_message.append_text(event.actor.class + " " + ProfileConformance::ACTOR_NOT_PERSON)
+						error_message.append_text(event.actor.class + " " + Conformance::ACTOR_NOT_PERSON)
 					end
 
 					# is event object a SoftwareApplication
 					if (!property_check.is_object_of_type(event.object, SoftwareApplication.class))
-						error_message.append_text(event.object.class + " " + ProfileConformance::OBJECT_NOT_SOFTWAREAPP)
+						error_message.append_text(event.object.class + " " + Conformance::OBJECT_NOT_SOFTWAREAPP)
 					end
 
 					# is event target a DigitalResource
 					if (!property_check.is_object_of_type(event.target, Session.class))
-						error_message.append_text(event.object.class + " " + ProfileConformance::TARGET_NOT_SESSION)
+						error_message.append_text(event.object.class + " " + Conformance::TARGET_NOT_SESSION)
 					end
 
 					# should not be generated
 					if (event.generated)
-						message.appendText(Profile.Conformance.GENERATED_NOT_NULL.violation());
+						message.appendText(Conformance::GENERATED_NOT_NULL);
 					end
 
 					# start time set for event
 					if (!check_started_at_time(event.started_at_time))
-						error_message.append_text(ProfileConformance::STARTEDATTIME_IS_NULL)
+						error_message.append_text(Conformance::STARTEDATTIME_IS_NULL)
 					end
 
 					# also check the event end time
 					if (!check_ended_at_time(event.started_at_time, event.ended_at_time))
-						error_message.append_text(ProfileConformance::TIME_ERROR)
+						error_message.append_text(Conformance::TIME_ERROR)
 					end
 
 					# check duration value
 					if (check_duration(event.duration))
-						error_message.append_text(ProfileConformance::DURATION_INVALID)
+						error_message.append_text(Conformance::DURATION_INVALID)
 					end
 
 					if (error_message.length > 0)

data/lib/caliper/validators/time_check.rb

@@ -1,3 +1,23 @@
+##
+# 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/.
+
+#
+# Time check.
+#
 module Caliper
 	module Validators
 		module TimeCheck

data/lib/caliper/version.rb

@@ -1,4 +1,23 @@
-module Caliper
-  VERSION = "0.1.3"
-end
+##
+# 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/.
 
+#
+# Version.
+#
+module Caliper
+  VERSION = "0.9.0"
+end

data/lib/caliper.rb

@@ -1,3 +1,20 @@
+##
+# 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/.
+
 module Caliper
   autoload :Client, "caliper/client"
   
@@ -14,4 +31,4 @@ module Caliper
   module Entities
     autoload :Base, "caliper/entity/base"
   end
-end
+end

data/spec/lib/entities/{lis → agent}/person_spec.rb

@@ -1,11 +1,32 @@
+##
+# 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 'spec_helper.rb'
 require 'require_all'
-require_all 'lib/caliper/entities/*.rb'
-require_all 'lib/caliper/entities/lis/*.rb'
+require 'json_spec'
+require_all 'lib/caliper/entities/agent/person.rb'
 
+#
+# Test Person.
+#
 module Caliper
   module Entities
-    module LIS
+    module Agent
+
       describe Person do
 
         it "should ensure that a Person is correctly created and serialized" do
@@ -19,7 +40,7 @@ module Caliper
           # puts "new student = #{student.to_json}"
 
           # Compare JSON ouput
-          file = File.read('spec/lib/entities/lis/student.json')
+          file = File.read('spec/lib/entities/agent/student.json')
           data_hash = JSON.parse(file)
           expected_json = data_hash.to_json # convert hash back to JSON string after parse
           student.to_json.should be_json_eql(expected_json)
@@ -30,8 +51,7 @@ module Caliper
 
           expect(student).to eql(des_student)
         end
-
       end
     end
   end
-end
+end

data/spec/lib/entities/entity_spec.rb

@@ -1,3 +1,20 @@
+##
+# 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 'spec_helper.rb'
 require 'require_all'
 require 'json_spec'
@@ -10,9 +27,9 @@ module Caliper
 
       it "should ensure that a base entity is correctly created and serialized" do
         entity = Entity.new
+        entity.id = 'https://some-university.edu/politicalScience/2014/american-revolution-101/assessment1'
         entity.name = 'test'
         entity.description = 'description'
-        entity.id = 'https://some-university.edu/politicalScience/2014/american-revolution-101/assessment1'
         entity.extensions = {'customProp' => 42}
         entity.dateCreated = '2015-03-15T23:09:11.000Z'
         entity.dateModified = '2015-03-15T23:09:11.000Z'
@@ -29,9 +46,7 @@ module Caliper
         des_entity.from_json data_hash
         # puts "Object from JSON = #{des_entity.to_json}"
         expect(entity).to eql(des_entity)
-
       end
-
     end
   end
-end
+end

data/spec/lib/event/annotation_event_bookmark_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 (Bookmarked) is correctly created and serialized' do
+      it 'should ensure that a Bookmarked 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
         bookmark.bookmarkNotes = 'The Intolerable Acts (1774)--bad idea Lord North'
 
         # 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 bookmark event object conforms
         expect(annotation_event).to eql(deser_annotation_event)
-
       end
-
     end
   end
-end
+end

data/spec/lib/event/annotation_event_highlight_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 (Highlight) is correctly created and serialized' do
+      it 'should ensure that a Highlighted 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"
@@ -85,7 +102,7 @@ module Caliper
         highlight.selection = { 'start' => '455', 'end' => '489'}
 
         # 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 = []
@@ -152,9 +169,7 @@ module Caliper
 
         # Ensure that the deserialized highlight event object conforms
         expect(annotation_event).to eql(deser_annotation_event)
-
       end
-
     end
   end
-end
+end

data/spec/lib/event/annotation_event_shared_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 (Shared) is correctly created and serialized' do
+      it 'should ensure that a Shared 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"
@@ -82,13 +99,13 @@ module Caliper
         shared.dateModified = '2015-09-02T11:30:00.000Z'
         shared.annotated = 'https://github.com/readium/readium-js-viewer/book/34843#epubcfi(/4/3/3)'
 
-        classmate1 = Caliper::Entities::LIS::Person.new
+        classmate1 = Caliper::Entities::Agent::Person.new
         classmate1.id = 'https://some-university.edu/students/657585'
         classmate1.hasMembership = []
         classmate1.dateCreated = '2015-08-01T06:00:00.000Z'
         classmate1.dateModified = '2015-09-02T11:30:00.000Z'
 
-        classmate2 = Caliper::Entities::LIS::Person.new
+        classmate2 = Caliper::Entities::Agent::Person.new
         classmate2.id = 'https://some-university.edu/students/667788'
         classmate2.hasMembership = []
         classmate2.dateCreated = '2015-08-01T06:00:00.000Z'
@@ -97,7 +114,7 @@ module Caliper
         shared.withAgents = [classmate1, classmate2]
 
         # 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 = []
@@ -164,9 +181,7 @@ module Caliper
 
         # Ensure that the deserialized shared event object conforms
         expect(annotation_event).to eql(deser_annotation_event)
-
       end
-
     end
   end
-end
+end