pupilfirst_xapi 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41967309ba9b114e5e27a040310e2f1a4f280ea292b88d4bb12721a028c77d8f
-  data.tar.gz: a7adcc1bb4d78a14ec281dc16c6d56df50d1479c5a535a6201f0a1678d05b6f9
+  metadata.gz: f4c1f6e893b9a58bb193b6ddcbdf806ae9c341c3ff5527f3a2ba6a528cda7a05
+  data.tar.gz: 87858bf6e6a1b2beaa9bc8a85f9e7bc22424788a8011bc1a476f96fcd52d8370
 SHA512:
-  metadata.gz: 0c9fa1fddf16ffd0d87e431e0b537484af2bc801b5e53675c2db040bea52e67f92cf9193204396bb4952b86c23b8ebafc4086d3520e94416898fe86d171ab833
-  data.tar.gz: 4bc7f0ccd2d9947a73f6f66d0f1a1f4e1feaf87a9bce973f5116556f2665013a5636f5dea770931649b199167f3a1df17155544d0eaa1c124a35b74453a68007
+  metadata.gz: a9a7da4741a9151c9251e7f9a31dc149d303a213fadb94cbdccd9a65578fb21bc7adfadfec168f30d6dbbf614fdb372aeb8ac2a967547628d427c046c0c3d944
+  data.tar.gz: 606c6d2f23faccbc6d30ee80e49b912148a862cc9855ea10814e1d64cd18300ece70469daea7f72093d5dad1cc176a1ddb2b5818a850bb9de9e88ab66982356c

data/lib/pupilfirst_xapi/objects.rb

@@ -4,12 +4,12 @@ require_relative 'objects/target'
 
 module PupilfirstXapi
   module Objects
-    def self.course(course, uri)
-      Course.new.call(course, uri)
+    def self.course(course, uri_for)
+      Course.new.call(course, uri_for)
     end
 
-    def self.target(target, uri)
-      Target.new.call(target, uri)
+    def self.target(target, uri_for)
+      Target.new.call(target, uri_for)
     end
   end
 end

data/lib/pupilfirst_xapi/objects/course.rb

@@ -1,7 +1,9 @@
 module PupilfirstXapi
   module Objects
     class Course
-      def call(course, uri)
+      def call(course, uri_for)
+        uri = uri_for.call(course)
+
         Builder.new(
           id: uri,
           type: 'http://adlnet.gov/expapi/activities/product',

data/lib/pupilfirst_xapi/objects/target.rb

@@ -1,13 +1,20 @@
 module PupilfirstXapi
   module Objects
     class Target
-      def call(target, uri)
+      def call(target, uri_for)
+        course = target.course
+        target_uri = uri_for.call(target)
+        course_uri = uri_for.call(course)
+
         Builder.new(
-          id: uri,
+          id: target_uri,
           type: "http://activitystrea.ms/schema/1.0/task",
           name: target.title,
           description: target.description
-        ).call
+        ).tap do |obj|
+          obj.with_extension('course_id', course_uri)
+          obj.with_extension('course_name', course.name)
+        end.call
       end
     end
   end

data/lib/pupilfirst_xapi/statements/course_completed.rb

@@ -13,7 +13,7 @@ module PupilfirstXapi
         Xapi.create_statement(
           actor: Actors.agent(actor),
           verb: Verbs::COMPLETED,
-          object: Objects.course(course, @uri_for.call(course))
+          object: Objects.course(course, @uri_for)
         )
       end
     end

data/lib/pupilfirst_xapi/statements/course_registered.rb

@@ -13,7 +13,7 @@ module PupilfirstXapi
         Xapi.create_statement(
           actor: Actors.agent(actor),
           verb: Verbs::REGISTERED,
-          object: Objects.course(course, @uri_for.call(course))
+          object: Objects.course(course, @uri_for)
         )
       end
     end

data/lib/pupilfirst_xapi/statements/target_completed.rb

@@ -16,7 +16,7 @@ module PupilfirstXapi
         Xapi.create_statement(
           actor: Actors.agent(actor),
           verb: Verbs::COMPLETED_ASSIGNMENT,
-          object: Objects.target(target, @uri_for.call(target))
+          object: Objects.target(target, @uri_for)
         )
       end
     end

data/lib/pupilfirst_xapi/version.rb

@@ -1,3 +1,3 @@
 module PupilfirstXapi
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/integration_spec.rb

@@ -21,7 +21,9 @@ RSpec.describe "#xapi", type: :job, perform_jobs: true do
     double(:target,
            title: 'Getting Started with Rails',
            description: 'This guide covers getting up and running with Ruby on Rails.',
-           uri: 'https://guides.rubyonrails.org/getting_started.html')
+           uri: 'https://guides.rubyonrails.org/getting_started.html',
+           course: ror_guides
+          )
   }
   let(:good_one) { double(:timeline_event, target: getting_started, passed?: true) }
   let(:bad_one) { double(:timeline_event, target: getting_started, passed?: false) }
@@ -88,7 +90,7 @@ RSpec.describe "#xapi", type: :job, perform_jobs: true do
           'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
           'Authorization'=>'Basic a2V5OnNlY3JldA==',
           'Content-Type'=>'application/json',
-          'User-Agent'=>'Faraday v1.3.0',
+          'User-Agent'=>'Faraday v1.3.1',
           'X-Experience-Api-Version'=>'1.0.1'
         }
       ).to_return(status: 204, body: "", headers: {})

data/spec/outbox_spec.rb

@@ -4,8 +4,8 @@ module PupilfirstXapi
   RSpec.describe Outbox do
     let(:timestamp)   { Time.now }
     let(:john)        { double(:john, name: 'John Doe', email: 'john@doe.com') }
-    let(:course)      { double(:course, name: 'Rails for Begginers', description: 'Seems easy', created_at: 1.week.ago, ends_at: nil) }
-    let(:target)      { double(:target, title: '1st target', description: 'Seems easy') }
+    let(:course)      { double(:course, id: 32, name: 'Rails for Begginers', description: 'Seems easy', created_at: 1.week.ago, ends_at: nil) }
+    let(:target)      { double(:target, title: '1st target', description: 'Seems easy', course: course) }
     let(:good_one)    { double(:timeline_event, target: target, passed?: true) }
     let(:bad_one)     { double(:timeline_event, target: target, passed?: false) }
 

data/spec/statements/target_completed_spec.rb

@@ -4,7 +4,8 @@ module PupilfirstXapi
   module Statements
     RSpec.describe TargetCompleted do
       it do
-        target = double(:target, title: '1st target', description: 'Seems easy')
+        course = double(:course, id: 17, name: 'Rails for Begginers', description: 'Seems easy', created_at: 1.week.ago, ends_at: nil)
+        target = double(:target, title: '1st target', course: course, description: 'Seems easy')
         submission = double(:timeline_event, target: target, passed?: true)
         john   = double(:john, name: 'John Doe', email: 'john@doe.com')
         data = {
@@ -12,7 +13,7 @@ module PupilfirstXapi
           user: { 123 => john },
         }
         repository = ->(klass, resource_id) { data.dig(klass, resource_id) }
-        uri_for = ->(obj) { obj == target ? 'target-1' : nil }
+        uri_for = ->(obj) { obj == target ? 'target-1' : obj == course ? 'course-1' : nil }
 
         xapi = TargetCompleted.new(repository, uri_for).call(actor_id: 123, resource_id: 456)
 
@@ -26,6 +27,10 @@ module PupilfirstXapi
         expect(xapi.object.definition.type).to eq 'http://activitystrea.ms/schema/1.0/task'
         expect(xapi.object.definition.name).to eq({'en-US' => '1st target'})
         expect(xapi.object.definition.description).to eq({'en-US' => 'Seems easy'})
+        expect(xapi.object.definition.extensions).to eq({
+          'course_id'=>'course-1',
+          'course_name'=>'Rails for Begginers'
+        })
       end
 
       it 'no-op when submission is not passed'  do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pupilfirst_xapi
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - GrowthTribe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -117,7 +117,7 @@ files:
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/statements/course_completed_spec.rb
-- spec/statements/course_redistered_spec.rb
+- spec/statements/course_registered_spec.rb
 - spec/statements/target_completed_spec.rb
 homepage: https://github.com/growthtribeacademy/pupilfirst-xapi
 licenses:
@@ -153,5 +153,5 @@ test_files:
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/statements/course_completed_spec.rb
-- spec/statements/course_redistered_spec.rb
+- spec/statements/course_registered_spec.rb
 - spec/statements/target_completed_spec.rb