pupilfirst_xapi 0.3.1 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9af22d07f8c93f261b7174d2e9e7c0718556931f7f09ec7e3efe91a20d6d6fa6
-  data.tar.gz: 5414db57b6f4f3b6851fc6c1c5938cbe918dab54cbdc3e41666e135fa788f6b3
+  metadata.gz: 8f5c38a8fbf57be11cda1429b9cffc1ed6d818ca11a69d220305a2cd0e954125
+  data.tar.gz: c018dae18cd439930c6d70eba6fb60bafe8014d01a5ce2ae5be6ca3d5556f88c
 SHA512:
-  metadata.gz: 5dbadb2c9cbbb1d501162bc3fd325aac8a9f2d44566a870942031fe7dba223292c4afe532a60a21a3eb2afa3393f9adb82277fb073ddb330c7cff8c6fb6482e0
-  data.tar.gz: 8710df83e5839915c2792edb71c9dde22bfb21c52e6aa1ca4b11641e645ee409e30c81011a8b27220d7c84fed0bc4cacf4f34977b1b4272d08aba9ca04d927b4
+  metadata.gz: d3d62b03c85f3610a50d7cb3aa0bbbed2fad9ad4d6c3c9aa67fac48f972a64e9a08fdc6d59cc38a7b75e2400efecd2f555d2d6d960c7c889be617432ea347800
+  data.tar.gz: e525ac790f096b0b70a82727901cc88bacee1aeff9b44ecbca7e227e7d0e52bb2aeb39a3007af0b22b3345f05c54204d930523ec9f374f8d8fdde4650ecc246e

data/lib/pupilfirst_xapi/objects.rb

@@ -1,6 +1,8 @@
 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
@@ -11,5 +13,14 @@ module PupilfirstXapi
     def self.target(target, uri_for)
       Target.new.call(target, uri_for)
     end
+
+    def self.video_start(target, uri_for)
+      VideoStart.new.call(target, uri_for)
+    end
+
+
+    def self.video_end(target, uri_for)
+      VideoEnd.new.call(target, uri_for)
+    end
   end
 end

data/lib/pupilfirst_xapi/objects/course.rb

@@ -10,10 +10,10 @@ module PupilfirstXapi
           name: course.name,
           description: course.description
         ).tap do |obj|
+          obj.with_extension('http://id.tincanapi.com/extension/ending-position', course.targets.count)
           if course.ends_at.present?
             duration = ActiveSupport::Duration.build(course.ends_at - course.created_at).iso8601
             obj.with_extension("http://id.tincanapi.com/extension/planned-duration", duration)
-            obj.with_extension('http://id.tincanapi.com/extension/ending-position', course.targets.count)
           end
         end.call
       end

data/lib/pupilfirst_xapi/objects/video_end.rb

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

data/lib/pupilfirst_xapi/objects/video_start.rb

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

data/lib/pupilfirst_xapi/statements.rb

@@ -1,6 +1,8 @@
 require "pupilfirst_xapi/statements/course_completed"
 require "pupilfirst_xapi/statements/course_registered"
 require "pupilfirst_xapi/statements/target_completed"
+require "pupilfirst_xapi/statements/video_started"
+require "pupilfirst_xapi/statements/video_ended"
 
 module PupilfirstXapi
   module Statements
@@ -17,6 +19,8 @@ module PupilfirstXapi
       :student_added                      => CourseRegistered,
       :submission_graded                  => TargetCompleted,
       :submission_automatically_verified  => TargetCompleted,
+      :video_started                      => VideoStarted,
+      :video_ended                        => VideoEnded
     }
   end
 end

data/lib/pupilfirst_xapi/statements/video_ended.rb

@@ -0,0 +1,20 @@
+module PupilfirstXapi
+  module Statements
+    class VideoEnded
+      def initialize(repository, uri_for)
+        @repository = repository
+        @uri_for = uri_for
+      end
+
+      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(target, @uri_for)
+        )
+      end
+    end
+  end
+end

data/lib/pupilfirst_xapi/statements/video_started.rb

@@ -0,0 +1,20 @@
+module PupilfirstXapi
+  module Statements
+    class VideoStarted
+      def initialize(repository, uri_for)
+        @repository = repository
+        @uri_for = uri_for
+      end
+
+      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(target, @uri_for)
+        )
+      end
+    end
+  end
+end

data/lib/pupilfirst_xapi/verbs.rb

@@ -3,5 +3,7 @@ module PupilfirstXapi
     COMPLETED             = Xapi.create_verb(id: 'http://adlnet.gov/expapi/verbs/completed', name: 'completed')
     COMPLETED_ASSIGNMENT  = Xapi.create_verb(id: 'https://w3id.org/xapi/dod-isd/verbs/completed-assignment', name: 'completed assignment')
     REGISTERED            = Xapi.create_verb(id: 'http://adlnet.gov/expapi/verbs/registered', name: 'registered')
+    VIDEO_STARTED         = Xapi.create_verb(id: 'http://activitystrea.ms/schema/1.0/start', name: 'start')
+    VIDEO_ENDED           = Xapi.create_verb(id: 'http://activitystrea.ms/schema/1.0/consume', name: 'consumed')
   end
 end

data/lib/pupilfirst_xapi/version.rb

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

data/spec/integration_spec.rb

@@ -15,7 +15,12 @@ RSpec.describe "#xapi", type: :job, perform_jobs: true do
            description: 'These guides are designed to make you immediately productive with Rails',
            created_at: Time.new(2021,01,01),
            ends_at: nil,
-           uri: 'https://guides.rubyonrails.org/')
+           uri: 'https://guides.rubyonrails.org/',
+           targets: [
+             double(:target, title: '1st target', description: 'Seems easy'),
+             double(:target, title: '2nd target', description: 'Seems not easy')
+            ]
+          )
   }
   let(:getting_started) {
     double(:target,
@@ -77,6 +82,7 @@ RSpec.describe "#xapi", type: :job, perform_jobs: true do
           name: {'en-US' => 'Ruby on Rails Guides'},
           description: {'en-US' => 'These guides are designed to make you immediately productive with Rails'},
           type: 'http://adlnet.gov/expapi/activities/product',
+          extensions: {"http://id.tincanapi.com/extension/ending-position"=>2}
         },
       },
       timestamp: timestamp.iso8601,
@@ -102,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

data/spec/statements/course_registered_spec.rb

@@ -29,7 +29,9 @@ module PupilfirstXapi
         expect(xapi.object.definition.type).to eq 'http://adlnet.gov/expapi/activities/product'
         expect(xapi.object.definition.name).to eq({'en-US' => 'Rails for Begginers'})
         expect(xapi.object.definition.description).to eq({'en-US' => 'Seems easy'})
-        expect(xapi.object.definition.extensions).to eq nil
+        expect(xapi.object.definition.extensions).to eq ({
+          "http://id.tincanapi.com/extension/ending-position" => 2
+        })
       end
 
       it do

metadata

@@ -1,22 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: pupilfirst_xapi
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.5
 platform: ruby
 authors:
 - GrowthTribe
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.3
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.3.4
@@ -24,9 +21,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.3
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.3.4
@@ -86,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - devs@growthtribe.io
 executables: []
@@ -103,11 +97,15 @@ files:
 - lib/pupilfirst_xapi/objects/builder.rb
 - lib/pupilfirst_xapi/objects/course.rb
 - lib/pupilfirst_xapi/objects/target.rb
+- lib/pupilfirst_xapi/objects/video_end.rb
+- lib/pupilfirst_xapi/objects/video_start.rb
 - lib/pupilfirst_xapi/outbox.rb
 - lib/pupilfirst_xapi/statements.rb
 - lib/pupilfirst_xapi/statements/course_completed.rb
 - lib/pupilfirst_xapi/statements/course_registered.rb
 - lib/pupilfirst_xapi/statements/target_completed.rb
+- lib/pupilfirst_xapi/statements/video_ended.rb
+- lib/pupilfirst_xapi/statements/video_started.rb
 - lib/pupilfirst_xapi/verbs.rb
 - lib/pupilfirst_xapi/version.rb
 - spec/integration_spec.rb
@@ -126,7 +124,7 @@ metadata:
   homepage_uri: https://github.com/growthtribeacademy/pupilfirst-xapi
   source_code_uri: https://github.com/growthtribeacademy/pupilfirst-xapi/pupilfirst_xapi
   changelog_uri: https://github.com/growthtribeacademy/pupilfirst-xapi/pupilfirst_xapi/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -141,17 +139,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: XAPI statements generator and publisher to LRS for Pupilfirst
 test_files:
-- spec/integration_spec.rb
 - spec/objects/builder_spec.rb
-- spec/outbox_job_spec.rb
-- spec/outbox_spec.rb
 - spec/rails_helper.rb
-- spec/spec_helper.rb
+- spec/statements/target_completed_spec.rb
 - spec/statements/course_completed_spec.rb
 - spec/statements/course_registered_spec.rb
-- spec/statements/target_completed_spec.rb
+- spec/spec_helper.rb
+- spec/outbox_spec.rb
+- spec/integration_spec.rb
+- spec/outbox_job_spec.rb