pupilfirst_xapi 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab3ca34388c5e492e15f05a5768d692af65e56c3f088a1a2958143ab2dcf6152
-  data.tar.gz: 80bf4e923f96112d5e1f175f811fcaf1dc7c27709bcd7c937b09eeae4d89c755
+  metadata.gz: 8f5c38a8fbf57be11cda1429b9cffc1ed6d818ca11a69d220305a2cd0e954125
+  data.tar.gz: c018dae18cd439930c6d70eba6fb60bafe8014d01a5ce2ae5be6ca3d5556f88c
 SHA512:
-  metadata.gz: ac920b2427236772f18041c7219405fa05812248cc0745029ab62a72896076fb6335dac990e59783b653a6c7c3c5b922610e74b442c75c7a29d9c9fc6a77cb60
-  data.tar.gz: 3680b27bd76f6e184ffd307dfa50e9b97e27d46f85c19d49c827e430e02a87be75d6cbff741edbb1219fc19f82d8f755165675149eb273321104fb96511f82e4
+  metadata.gz: d3d62b03c85f3610a50d7cb3aa0bbbed2fad9ad4d6c3c9aa67fac48f972a64e9a08fdc6d59cc38a7b75e2400efecd2f555d2d6d960c7c889be617432ea347800
+  data.tar.gz: e525ac790f096b0b70a82727901cc88bacee1aeff9b44ecbca7e227e7d0e52bb2aeb39a3007af0b22b3345f05c54204d930523ec9f374f8d8fdde4650ecc246e

data/lib/pupilfirst_xapi/objects.rb

@@ -2,6 +2,7 @@ require_relative 'objects/builder'
 require_relative 'objects/course'
 require_relative 'objects/target'
 require_relative 'objects/video_start'
+require_relative 'objects/video_end'
 
 module PupilfirstXapi
   module Objects
@@ -13,13 +14,13 @@ module PupilfirstXapi
       Target.new.call(target, uri_for)
     end
 
-    def self.video_start(student, video_id, uri_for)
-      VideoStart.new.call(student, video_id, uri_for)
+    def self.video_start(target, uri_for)
+      VideoStart.new.call(target, uri_for)
     end
 
 
-    def self.video_end(student, video_id, uri_for)
-      VideoEnd.new.call(student, video_id, uri_for)
+    def self.video_end(target, uri_for)
+      VideoEnd.new.call(target, uri_for)
     end
   end
 end

data/lib/pupilfirst_xapi/objects/video_end.rb

@@ -1,15 +1,14 @@
 module PupilfirstXapi
   module Objects
     class VideoEnd
-      def call(student, video_id, uri_for)
-        student_uri = uri_for.call(student)
-        puts video_id
+      def call(target, uri_for)
+        target_uri = uri_for.call(target)
 
         Builder.new(
-          id: student_uri,
+          id: target_uri,
           type: "http://activitystrea.ms/schema/1.0/event",
-          name: student.name,
-          description: "student started video #{video_id}"
+          name: "video in #{target.title}",
+          description: target.description
         ).call
       end
     end

data/lib/pupilfirst_xapi/objects/video_start.rb

@@ -1,15 +1,14 @@
 module PupilfirstXapi
   module Objects
     class VideoStart
-      def call(student, video_id, uri_for)
-        student_uri = uri_for.call(student)
-        puts video_id
+      def call(target, uri_for)
+        target_uri = uri_for.call(target)
 
         Builder.new(
-          id: student_uri,
+          id: target_uri,
           type: "http://activitystrea.ms/schema/1.0/event",
-          name: student.name,
-          description: "student started video #{video_id}"
+          name: "video in #{target.title}",
+          description: target.description
         ).call
       end
     end

data/lib/pupilfirst_xapi/statements/video_ended.rb

@@ -8,10 +8,11 @@ module PupilfirstXapi
 
       def call(actor_id:, resource_id:)
         actor = @repository.call(:user, actor_id)
+        target = @repository.call(:target, resource_id)
         Xapi.create_statement(
           actor: Actors.agent(actor),
           verb: Verbs::VIDEO_ENDED,
-          object: Objects.video_end(actor, resource_id, @uri_for)
+          object: Objects.video_end(target, @uri_for)
         )
       end
     end

data/lib/pupilfirst_xapi/statements/video_started.rb

@@ -8,10 +8,11 @@ module PupilfirstXapi
 
       def call(actor_id:, resource_id:)
         actor = @repository.call(:user, actor_id)
+        target = @repository.call(:target, resource_id)
         Xapi.create_statement(
           actor: Actors.agent(actor),
           verb: Verbs::VIDEO_STARTED,
-          object: Objects.video_start(actor, resource_id, @uri_for)
+          object: Objects.video_start(target, @uri_for)
         )
       end
     end

data/lib/pupilfirst_xapi/version.rb

@@ -1,3 +1,3 @@
 module PupilfirstXapi
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/spec/integration_spec.rb

@@ -108,12 +108,14 @@ RSpec.describe "#xapi", type: :job, perform_jobs: true do
       resource_id: ror_guides.id,
       actor_id: john.id,
     )
-    expect(PupilfirstXapi::Outbox::Job).to have_been_performed.with({
-      event_type: :course_completed,
-      actor_id: 123,
-      resource_id: 1234,
-      timestamp: timestamp,
-    })
+    expect(PupilfirstXapi::Outbox::Job).to have_been_performed.with(
+      hash_including({
+        event_type: :course_completed,
+        actor_id: 123,
+        resource_id: 1234,
+      })
+    )
+
     expect(request).to have_been_requested
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pupilfirst_xapi
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - GrowthTribe