canvas_shim 0.1.6rc → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 6e39a7f405530935baee9428f5dc11f644e0189002d4ea74948ca4dabe88f097
-  data.tar.gz: 86c9afa59179b660525df9865cfd616b54907be79cb3048a35e55eb4055d56d4
+SHA1:
+  metadata.gz: 609839eafaec6666e51e55d0cc8d6edbf03fe6b3
+  data.tar.gz: 3bbd30dc0a3a84a7b71b41d699dfea5d94368e94
 SHA512:
-  metadata.gz: b1136da9362a036361b9b206ac94f851621f203682232bbb9a687b9b8051062828ecf16f0f6ec44b88ce6217295a351cf27242005e99b5acd242f7148e7e9cd8
-  data.tar.gz: 2b1237a669712bb4b8c0b323a8f6fca9dbccd4cd6bf9c91ac20b84aad14a08cd57384644e681d627d2b2bccb84e1c420e1603cd2e13bddff2124a74712d85857
+  metadata.gz: 589f68146ae0b4b3cc2d087d3ae09de8174abc5af2619fd0cd736859001aaf0b09514be2a180dc8a1cab277cb25df15f11c5785a3ad83ef16b6de460e59c0a24
+  data.tar.gz: 9cec254fdf2b4050229c08839c29fd52bc579e30c0ed575c66849148011bef387db8ba699aaabc59f24df0617183bc6e7d758c745224d71add04d650432d8aa0

data/app/services/pipeline_service/commands/publish.rb

@@ -35,7 +35,9 @@ module PipelineService
       end
 
       def post_to_pipeline
-        client.new(@args.merge(object: object)).call
+        client.new(
+          @args.merge(object: object)
+        ).call
       end
     end
   end

data/app/services/pipeline_service/endpoints/pipeline/message_builder.rb

@@ -46,6 +46,7 @@ module PipelineService
         end
 
         def configure_dependencies
+          @message_class = @args[:message_class] || PipelinePublisher::Message
           @fetcher       = @args[:fetcher] || Serializers::Fetcher
           @logger        = @args[:logger] || PipelineService::Logger
           @canvas_domain = ENV['CANVAS_DOMAIN']
@@ -57,11 +58,11 @@ module PipelineService
         end
 
         def build
-          payload.to_hash
+          message_class.new(payload.to_hash)
         end
 
         def noun
-          object.class.to_s.split('::').last.underscore
+          object.class.to_s.underscore
         end
 
         def id

data/app/services/pipeline_service/events/emitter.rb

@@ -1,13 +1,16 @@
 module PipelineService
   module Events
     class Emitter
-      def initialize args={}
+      def initialize(args={})
         @object = args[:object]
         @args = args
-        @responder = @args[:responder] || Events::Responders::SIS
+        @responder  = @args[:responder] || Events::Responders::SIS
+        @event = Events::GradedOutEvent
       end
 
       def call
+        return unless object.is_a?(Enrollment)
+        fetch_serializer
         build_message
         build_responder
         build_subscriptions
@@ -16,19 +19,15 @@ module PipelineService
 
       private
 
-      attr_reader :subscriptions, :object, :responder, :message
-
-      def events
-        {
-          graded_out: Events::GradedOutEvent,
-          grade_changed: Events::GradeChangedEvent
-        }
-      end
+      attr_reader :subscriptions, :object, :responder, :message, :serializer, :event
 
       def build_subscriptions
-        @subscriptions = [:graded_out, :grade_changed].map do |event_name|
-          Events::Subscription.new(event: event_name, responder: responder)
-        end
+        @subscriptions = [
+          Events::Subscription.new(
+            event: :graded_out,
+            responder: responder
+          )
+        ]
       end
 
       def build_responder
@@ -38,13 +37,8 @@ module PipelineService
         )
       end
 
-      def serializer
-        case object
-        when PipelineService::Nouns::UnitGrades
-          Serializers::UnitGrades
-        when Enrollment
-          Serializers::CanvasAPIEnrollment
-        end
+      def fetch_serializer
+        @serializer = Serializers::CanvasAPIEnrollment
       end
 
       def build_message
@@ -53,10 +47,8 @@ module PipelineService
 
       def emit
         subscriptions.each do |subscription|
-          next unless events[subscription.event]
-          events[subscription.event].new(
-            @args.merge(subscription: subscription)
-          ).emit
+          next if subscription.event != :graded_out
+          event.new(@args.merge(subscription: subscription)).emit
         end
       end
     end

data/app/services/pipeline_service/http_client.rb

@@ -11,8 +11,7 @@ module PipelineService
     end
 
     def post(args)
-      message = PipelinePublisher::Message.new(*args)
-      PipelinePublisher::MessagesApi.new.messages_post(message)
+      PipelinePublisher::MessagesApi.new.messages_post(*args)
     end
 
     def get(endpoint, args)

data/app/services/pipeline_service/serializers/fetcher.rb

@@ -6,8 +6,6 @@ module PipelineService
       # Maps any object with a class containing 'enrollment' to the enrollment serializer
       def self.fetch(object:)
         case object.class.to_s
-        when /PipelineService::Nouns::UnitGrades/
-          PipelineService::Serializers::UnitGrades
         when /Enrollment/
           PipelineService::Serializers::Enrollment
         else

data/lib/canvas_shim/engine.rb

@@ -1,15 +1,16 @@
 require 'csv'
+require "rails"
 require 'grape'
 require 'grape-swagger'
 require 'grape-swagger-ui'
 require 'aws-sdk-dynamodb'
+require "pipeline_publisher_ruby"
 require "business"
 require 'httparty'
 require 'aws-sdk-core'
 require 'aws-sdk-s3'
+require 'inst-jobs'
 require 'pg'
-require "pipeline_publisher_ruby"
-
 
 module CanvasShim
   class Engine < ::Rails::Engine

data/lib/canvas_shim/version.rb

@@ -1,3 +1,3 @@
 module CanvasShim
-  VERSION = '0.1.6rc'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: canvas_shim
 version: !ruby/object:Gem::Version
-  version: 0.1.6rc
+  version: 0.1.6
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +70,16 @@ dependencies:
   name: aws-sdk-dynamodb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: pipeline_publisher_ruby
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +123,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: loofah
+  name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 3.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 3.27.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: inst-jobs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A rails engine to be integrated with Canvas
 email:
 - ''
@@ -159,14 +215,12 @@ files:
 - app/services/pipeline_service/endpoints/pipeline.rb
 - app/services/pipeline_service/endpoints/pipeline/message_builder.rb
 - app/services/pipeline_service/events/emitter.rb
-- app/services/pipeline_service/events/grade_changed_event.rb
 - app/services/pipeline_service/events/graded_out_event.rb
 - app/services/pipeline_service/events/http_client.rb
 - app/services/pipeline_service/events/responders/sis.rb
 - app/services/pipeline_service/events/subscription.rb
 - app/services/pipeline_service/http_client.rb
 - app/services/pipeline_service/logger.rb
-- app/services/pipeline_service/nouns/unit_grades.rb
 - app/services/pipeline_service/pipeline_client.rb
 - app/services/pipeline_service/serializers/assignment.rb
 - app/services/pipeline_service/serializers/base_methods.rb
@@ -174,7 +228,6 @@ files:
 - app/services/pipeline_service/serializers/enrollment.rb
 - app/services/pipeline_service/serializers/fetcher.rb
 - app/services/pipeline_service/serializers/submission.rb
-- app/services/pipeline_service/serializers/unit_grades.rb
 - app/services/pipeline_service/serializers/user.rb
 - app/services/settings_service.rb
 - app/services/settings_service/api_docs.yml
@@ -197,11 +250,6 @@ files:
 - app/services/settings_service/student_assignment_repository.rb
 - app/services/settings_service/submission.rb
 - app/services/settings_service/user.rb
-- app/services/units_service/commands/get_unit_grades.rb
-- app/services/units_service/grades_calculator.rb
-- app/services/units_service/queries/get_category_weights.rb
-- app/services/units_service/queries/get_items.rb
-- app/services/units_service/queries/get_submissions.rb
 - app/views/layouts/canvas_shim/application.html.erb
 - config/initializers/hash.rb
 - config/initializers/string.rb
@@ -225,12 +273,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A tool to make it easy to write code that plugs into canvas

data/app/services/pipeline_service/events/grade_changed_event.rb

@@ -1,24 +0,0 @@
-module PipelineService
-  module Events
-    class GradeChangedEvent
-      def initialize args
-        @args = args
-        @subscription = args[:subscription]
-        @object = args[:object]
-        @changes = args[:changes]
-      end
-
-      def emit
-        return unless should_trigger?
-        @subscription.responder.call
-      end
-
-      private
-
-      def should_trigger?
-        return false unless @changes['score']
-        @object.is_a?(PipelineService::Nouns::UnitGrades)
-      end
-    end
-  end
-end

data/app/services/pipeline_service/nouns/unit_grades.rb

@@ -1,13 +0,0 @@
-module PipelineService
-  module Nouns
-    class UnitGrades
-      attr_reader :course, :student, :id, :changes
-      def initialize(submission)
-        @course = submission.assignment.course
-        @student = submission.user
-        @id = submission.id
-        @changes = submission.changes
-      end
-    end
-  end
-end

data/app/services/pipeline_service/serializers/unit_grades.rb

@@ -1,17 +0,0 @@
-module PipelineService
-  module Serializers
-    class UnitGrades
-      def initialize(object:)
-        @course = object.course
-        @student = object.student
-      end
-
-      def call
-        UnitsService::Commands::GetUnitGrades.new(
-          course: @course,
-          student: @student
-        ).call
-      end
-    end
-  end
-end

data/app/services/units_service/commands/get_unit_grades.rb

@@ -1,40 +0,0 @@
-module UnitsService
-  module Commands
-    class GetUnitGrades
-      def initialize(course:, student:)
-        @course = course
-        @student = student
-      end
-
-      def call
-        get_submissions
-        calculate_grades
-      end
-
-      private
-
-      def get_submissions
-        @unit_submissions = UnitsService::Queries::GetSubmissions.new(
-          course: @course,
-          student: @student
-        ).query
-      end
-
-      # {
-      #   course_id: 1,
-      #   student_id: 13,
-      #   units: {
-      #     { id: 1, score: 80 },
-      #     { id: 2, grade: 83 },
-      #     { id: 3, grade: 74 },
-      #     { id: 4, grade: 56 },
-      #     { id: 5, grade: 99 },
-      #     { id: 6, grade: 12 }
-      #   }
-      # }
-      def calculate_grades
-        UnitsService::GradesCalculator.new(@unit_submissions, @course).call
-      end
-    end
-  end
-end

data/app/services/units_service/grades_calculator.rb

@@ -1,39 +0,0 @@
-module UnitsService
-  class GradesCalculator
-    def initialize unit_submissions, course
-      @unit_submissions = unit_submissions
-      @course = course
-    end
-
-    def call
-      result = {}
-
-      @unit_submissions.each do |unit, submissions|
-        next if submissions.count == 0
-        result[unit.id] = weighted_average(submissions)
-      end
-
-      result
-    end
-
-    private
-
-    def weighted_average(submissions)
-      result = {}
-      submissions.group_by do |submission|
-        submission.assignment.assignment_group
-      end.each do |group, submissions|
-        result[group.name] = [] unless result[group]
-        average = submissions.sum(&:score).to_f / submissions.count
-        weight  = category_weights[group.name] / category_weights.values.sum
-        result[group.name] << average * weight
-      end
-
-      result.sum { |r, weighted| weighted.sum }
-    end
-
-    def category_weights
-      Queries::GetCategoryWeights.new(@course).query
-    end
-  end
-end

data/app/services/units_service/queries/get_category_weights.rb

@@ -1,13 +0,0 @@
-module UnitsService
-  module Queries
-    class GetCategoryWeights
-      def initialize(course)
-        @course = course
-      end
-
-      def query
-        @course.assignment_groups.map{|ag| [ag.name, ag.group_weight]}.to_h
-      end
-    end
-  end
-end

data/app/services/units_service/queries/get_items.rb

@@ -1,24 +0,0 @@
-module UnitsService
-  module Queries
-    class GetItems
-      def initialize(course:)
-        @course = course
-        @context_modules = @course.context_modules
-      end
-
-      def query
-        result = {}
-
-        @context_modules.each do |context_module|
-          result[context_module] =
-            context_module.content_tags.select do |ct|
-              ct.content.present? &&
-              ct.content.respond_to?(:submissions) &&
-              ct.content.workflow_state == 'published'
-            end
-        end
-        result
-      end
-    end
-  end
-end

data/app/services/units_service/queries/get_submissions.rb

@@ -1,25 +0,0 @@
-module UnitsService
-  module Queries
-    class GetSubmissions
-      def initialize(course:, student:)
-        @student = student
-        @course = course
-      end
-
-      def query
-        result = {}
-        units.each do |unit, items|
-          items.each do |item|
-            result[unit] = item.content.submissions.where(user_id: @student.id).where("excused is not true")
-          end
-        end
-
-        result
-      end
-
-      def units
-        GetItems.new(course: @course).query
-      end
-    end
-  end
-end