ims_caliper 0.9.3.15 → 1.0.0

data/lib/caliper/entities/reading/epub_chapter.rb

@@ -16,6 +16,7 @@
 # with this program. If not, see http://www.gnu.org/licenses/.
 
 require_relative '../digital_resource'
+require_relative '../digital_resource_type'
 
 #
 # Representation of an EPUB 3 Chapter. A major structural division of a piece of writing.
@@ -28,7 +29,7 @@ module Caliper
 
         def initialize()
 	        super
-          @type = DigitalResourceType::EPUB_CHAPTER
+          @type = Caliper::Entities::DigitalResourceType::EPUB_CHAPTER
         end
       end
     end

data/lib/caliper/entities/reading/epub_part.rb

@@ -16,6 +16,7 @@
 # with this program. If not, see http://www.gnu.org/licenses/.
 
 require_relative '../digital_resource'
+require_relative '../digital_resource_type'
 
 #
 # Representation of an EPUB 3 Part. A major structural division of a piece of writing, typically
@@ -28,7 +29,7 @@ module Caliper
 
         def initialize()
 	        super
-          @type = DigitalResourceType::EPUB_PART
+          @type = Caliper::Entities::DigitalResourceType::EPUB_PART
         end
       end
     end

data/lib/caliper/entities/reading/epub_sub_chapter.rb

@@ -16,6 +16,7 @@
 # with this program. If not, see http://www.gnu.org/licenses/.
 
 require_relative '../digital_resource'
+require_relative '../digital_resource_type'
 
 #
 # Representation of an EPUB 3 subchapter.  A major sub-division of a chapter.
@@ -28,7 +29,7 @@ module Caliper
 
         def initialize()
 	        super
-          @type = DigitalResourceType::EPUB_SUB_CHAPTER
+          @type = Caliper::Entities::DigitalResourceType::EPUB_SUB_CHAPTER
         end
       end
     end

data/lib/caliper/entities/reading/epub_volume.rb

@@ -16,6 +16,7 @@
 # with this program. If not, see http://www.gnu.org/licenses/.
 
 require_relative '../digital_resource'
+require_relative '../digital_resource_type'
 
 #
 #  Public: Representation of an EPUB 3 Volume.  A component of a collection.
@@ -28,7 +29,7 @@ module Caliper
 
         def initialize()
 	        super
-          @type = DigitalResourceType::EPUB_VOLUME
+          @type = Caliper::Entities::DigitalResourceType::EPUB_VOLUME
         end
       end
     end

data/lib/caliper/entities/reading/frame.rb

@@ -15,8 +15,9 @@
 # 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/digital_resource'
-require_relative '../../entities/targetable'
+require_relative '../digital_resource'
+require_relative '../digital_resource_type'
+require_relative '../targetable'
 
 #
 # A Frame
@@ -31,7 +32,7 @@ module Caliper
 
 				def initialize
 					super
-					@type = DigitalResourceType::FRAME
+					@type = Caliper::Entities::DigitalResourceType::FRAME
 					@index = 0
 				end
 			end

data/lib/caliper/entities/reading/web_page.rb

@@ -15,8 +15,9 @@
 # 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/digital_resource"
-require_relative "../../entities/schemadotorg/web_page"
+require_relative '../digital_resource'
+require_relative '../digital_resource_type'
+require_relative '../schemadotorg/web_page'
 
 #
 # Web Page

data/lib/caliper/entities/response/fillin_blank_response.rb

@@ -26,12 +26,12 @@ module Caliper
 	module Entities
 		module Response
 			class FillinBlankResponse < Response
-				attr_accessor :type,
-			                :values
+
+				attr_accessor :values
 
 				def initialize
           super
-					@type = ResponseType::FILLINBLANK
+					@type = Caliper::Entities::Response::ResponseType::FILLINBLANK
 				end
 			end
 		end

data/lib/caliper/entities/response/multiple_choice_response.rb

@@ -25,12 +25,12 @@ module Caliper
 	module Entities
 		module Response
 			class MultipleChoiceResponse < Response
-				attr_accessor :type,
-			                :values
+
+				attr_accessor :values
 
 				def initialize
           super
-					@type = ResponseType::MULTIPLECHOICE
+					@type = Caliper::Entities::Response::ResponseType::MULTIPLECHOICE
 				end
 			end
 		end

data/lib/caliper/entities/response/multiple_response_response.rb

@@ -25,12 +25,12 @@ module Caliper
 	module Entities
 		module Response
 			class MultipleResponseResponse < Response
-				attr_accessor :type,
-			                :values
+
+				attr_accessor :values
 
 				def initialize
           super
-					@type = ResponseType::MULTIPLERESPONSE
+					@type = Caliper::Entities::Response::ResponseType::MULTIPLERESPONSE
 				end
 			end
 		end

data/lib/caliper/entities/response/response.rb

@@ -15,7 +15,8 @@
 # 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 '../entity'
+require_relative '../entity_base'
+require_relative '../entity_type'
 require_relative '../generatable'
 
 #
@@ -24,20 +25,17 @@ require_relative '../generatable'
 module Caliper
 	module Entities
 		module Response
-			class Response < Entity
+			class Response < EntityBase
 				include Caliper::Entities::Generatable
 
-				attr_accessor :type,
-			                :assignable,
-			                :actor,
-			                :attempt,
-			                :startedAtTime,
-			                :endedAtTime,
-			                :duration
+				attr_accessor :assignable, :actor, :attempt, :startedAtTime, :endedAtTime, :duration
 
 				def initialize
           super
-					@type = EntityType::RESPONSE
+					@type = Caliper::Entities::EntityType::RESPONSE
+					@startedAtTime = nil
+					@endedAtTime = nil
+					@duration = nil
 				end
 			end
 		end

data/lib/caliper/entities/response/response_type.rb

@@ -22,11 +22,11 @@ module Caliper
 	module Entities
 		module Response
 			module ResponseType
-				FILLINBLANK = "http://purl.imsglobal.org/caliper/v1/Response/FillinBlank"
-				MULTIPLECHOICE = "http://purl.imsglobal.org/caliper/v1/Response/MultipleChoice"
-				MULTIPLERESPONSE = "http://purl.imsglobal.org/caliper/v1/Response/MultipleResponse"
-				SELECTTEXT = "http://purl.imsglobal.org/caliper/v1/Response/SelectText"
-				TRUEFALSE = "http://purl.imsglobal.org/caliper/v1/Response/TrueFalse"
+				FILLINBLANK = "http://purl.imsglobal.org/caliper/v1/FillinBlankResponse"
+				MULTIPLECHOICE = "http://purl.imsglobal.org/caliper/v1/MultipleChoiceResponse"
+				MULTIPLERESPONSE = "http://purl.imsglobal.org/caliper/v1/MultipleResponseResponse"
+				SELECTTEXT = "http://purl.imsglobal.org/caliper/v1/SelectTextResponse"
+				TRUEFALSE = "http://purl.imsglobal.org/caliper/v1/TrueFalseResponse"
 			end
 		end
 	end

data/lib/caliper/entities/response/select_type_response.rb

@@ -26,12 +26,12 @@ module Caliper
 	module Entities
 		module Response
 			class SelectTextResponse < Response
-				attr_accessor :type,
-			                :values
+
+				attr_accessor :values
 
 				def initialize
           super
-					@type = ResponseType::SELECTTEXT
+					@type = Caliper::Entities::Response::ResponseType::SELECTTEXT
         end
 			end
 		end

data/lib/caliper/entities/response/true_false_response.rb

@@ -26,12 +26,11 @@ module Caliper
 	module Entities
 		module Response
 			class TrueFalseResponse < Response
-				attr_accessor :type,
-			                :values
+				attr_accessor :values
 
 				def initialize
           super
-					@type = ResponseType::TRUEFALSE
+					@type = Caliper::Entities::Response::ResponseType::TRUEFALSE
 				end
 			end
 		end

data/lib/caliper/entities/session/session.rb

@@ -15,7 +15,8 @@
 # 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 '../entity'
+require_relative '../entity_base'
+require_relative '../entity_type'
 require_relative '../generatable'
 require_relative '../targetable'
 
@@ -25,18 +26,18 @@ require_relative '../targetable'
 module Caliper
   module Entities
     module Session
-      class Session < Entity
+      class Session < EntityBase
         include Caliper::Entities::Generatable,
                 Caliper::Entities::Targetable
 
-        attr_accessor :actor,
-                      :startedAtTime,
-                      :endedAtTime,
-                      :duration
+        attr_accessor :actor, :startedAtTime, :endedAtTime, :duration
 
         def initialize
           super
-          @type = EntityType::SESSION
+          @type = Caliper::Entities::EntityType::SESSION
+          @startedAtTime = nil
+          @endedAtTime = nil
+          @duration = nil
         end
       end
     end

data/lib/caliper/{event → events}/annotation_event.rb

@@ -16,18 +16,26 @@
 # with this program. If not, see http://www.gnu.org/licenses/.
 
 require_relative './event'
+require_relative './event_context'
+require_relative './event_type'
 
 #
 # Annotation Event per Caliper Annotation Profile.
 #
 module Caliper
-  module Event
+  module Events
     class AnnotationEvent < Event
+      include Caliper::Events::EventContext
 
       def initialize
         super
-        @context = Caliper::Event::EventContext::ANNOTATION
-        @type = Caliper::Event::EventType::ANNOTATION
+        @type = Caliper::Events::EventType::ANNOTATION
+        @target = nil
+        @generated = nil
+        @edApp = nil
+        @group = nil
+        @membership = nil
+        @federatedSession = nil
       end
     end
   end

data/lib/caliper/{event → events}/assessment_event.rb

@@ -16,23 +16,26 @@
 # with this program. If not, see http://www.gnu.org/licenses/.
 
 require_relative './event'
+require_relative './event_context'
+require_relative './event_type'
 
 #
 # Assessment Event.
 #
 module Caliper
-  module Event
+  module Events
     class AssessmentEvent < Event
-      attr_accessor :context,
-        :type,
-        :action,
-        :object,
-        :target
+      include Caliper::Events::EventContext
 
       def initialize
         super
-        @context = EventContext::ASSESSMENT
-        @type = EventType::ASSESSMENT
+        @type = Caliper::Events::EventType::ASSESSMENT
+        @target = nil
+        @generated = nil
+        @edApp = nil
+        @group = nil
+        @membership = nil
+        @federatedSession = nil
       end
     end
   end

data/lib/caliper/{event → events}/assessment_item_event.rb

@@ -16,23 +16,26 @@
 # with this program. If not, see http://www.gnu.org/licenses/.
 
 require_relative './event'
+require_relative './event_context'
+require_relative './event_type'
 
 #
 # AssessmentItem Event.
 #
 module Caliper
-  module Event
+  module Events
     class AssessmentItemEvent < Event
-      attr_accessor :context,
-        :type,
-        :action,
-        :object,
-        :target
+      include Caliper::Events::EventContext
 
       def initialize
         super
-        @context = EventContext::ASSESSMENT_ITEM
-        @type = EventType::ASSESSMENT_ITEM
+        @type = Caliper::Events::EventType::ASSESSMENT_ITEM
+        @target = nil
+        @generated = nil
+        @edApp = nil
+        @group = nil
+        @membership = nil
+        @federatedSession = nil
       end
     end
   end

data/lib/caliper/{event → events}/assignable_event.rb

@@ -16,23 +16,26 @@
 # with this program. If not, see http://www.gnu.org/licenses/.
 
 require_relative './event'
+require_relative './event_context'
+require_relative './event_type'
 
 #
 # Assignable Event.
 #
 module Caliper
-  module Event
+  module Events
     class AssignableEvent < Event
-      attr_accessor :context,
-        :type,
-        :action,
-        :object,
-        :target
+      include Caliper::Events::EventContext
 
       def initialize
         super
-        @context = EventContext::ASSIGNABLE
-        @type = EventType::ASSIGNABLE
+        @type = Caliper::Events::EventType::ASSIGNABLE
+        @target = nil
+        @generated = nil
+        @edApp = nil
+        @group = nil
+        @membership = nil
+        @federatedSession = nil
       end
     end
   end

data/lib/caliper/{profiles/profile.rb → events/event.rb}

@@ -15,28 +15,28 @@
 # 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 'i18n'
+require 'json'
+require_relative './event_type'
+require_relative './jsonable'
 
 #
-# Base Profile.
+# Base event.
 #
 module Caliper
-  module Profiles
-    module ProfileActions
-      NAVIGATED_TO = "http://purl.imsglobal.org/vocab/caliper/v1/action#NavigatedTo"
-    end
+  module Events
+    class Event
+      include Caliper::Events::Jsonable
 
-    class Profile
-      include ProfileActions
+      attr_accessor :context, :type, :actor, :action, :object, :eventTime
 
       def initialize()
-      end
-
-      def get_navigated_to_action_from_bundle(key)
-        if key.equal? ProfileActions::NAVIGATED_TO
-          return I18n.translate :action
-        end
+        @context = Caliper::Context::Context::CONTEXT
+        @type = Caliper::Events::EventType::EVENT
+        @actor = nil
+        @action = nil
+        @object = nil
+        @eventTime = nil
       end
     end
   end
-end
+end