coalescing_panda 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf97da107a89508acdbe4df40bfd0ac9ff589b81
-  data.tar.gz: 846b77dd1fd1e5b3cf13f5be09e341c8bfbe9b18
+  metadata.gz: 22c6676c9d9e90786efa807220f76ff9b2eec393
+  data.tar.gz: 035edddad586577ecb9ec49660559f5d09818004
 SHA512:
-  metadata.gz: 3e35dd5e7cffc6826fe80662b0a791dffebfd37e3cce6cbb69832f89a94ae686ba28bc564ed54cca8ebf857afabc5ac4c2f3aac0b93bf82f16186575735b2bdb
-  data.tar.gz: ff637c79831934cfc8518de83f303a0f5d4f7099d4a0f9fb49cc854b89bbc6e4655f1808f2d651483c8082ac44c7373a7e8c9bf1b1549ec8b4e750561ad0f0fc
+  metadata.gz: 0c4e3fc9c21ca02ea50ef51fc5672f4177372e594572134f24c1a978699876973610648522364acde75734cf2f6bffa443c17ae1725e1568ab67376803c6efbe
+  data.tar.gz: cf8af365aebf0a52ad293840bdbb9af05322f882a6e7c87e7a2633c3ee509fbdb5bb36e29bb954067f40e5f59ecdc20875c6bb632c63e33ea0df757acf7224f2

data/app/assets/javascripts/coalescing_panda/canvas_batch.js.coffee

@@ -23,6 +23,8 @@ window.CoalescingPanda.CanvasBatchProgress = class CanvasBatchProgress
         else if batch && batch.status == 'Error'
           clearIntervalAndBatch(data, batch)
           errorCallback() if errorCallback != undefined
+        else if batch && batch.status == "Canceled"
+          clearIntervalAndBatch(data, batch)
 
       error: (message) ->
         $('#batch-progress').html('Batch status request failed')

data/app/controllers/coalescing_panda/canvas_batches_controller.rb

@@ -7,6 +7,16 @@ module CoalescingPanda
       render @batch
     end
 
+    def retrigger
+      @batch = CanvasBatch.find(params[:id])
+      @batch.status = 'Queued'
+      @batch.save
+      worker = CoalescingPanda::Workers::CourseMiner.new(@batch.context, @batch.options)
+      session[:canvas_batch_id] = worker.batch.id
+      worker.start(true)
+      redirect_to :back
+    end
+
     def clear_batch_session
       session[:canvas_batch_id] = nil
       render nothing: true

data/app/models/coalescing_panda/canvas_batch.rb

@@ -1,5 +1,7 @@
 module CoalescingPanda
   class CanvasBatch < ActiveRecord::Base
+    serialize :options
+
     belongs_to :account, foreign_key: :coalescing_panda_lti_account_id, class_name: 'CoalescingPanda::LtiAccount'
     belongs_to :context, polymorphic: true
 

data/app/models/coalescing_panda/workers/course_miner.rb

@@ -23,16 +23,22 @@ class CoalescingPanda::Workers::CourseMiner
     if batch.present? and RUNNING_STATUSES.include?(batch.status)
       batch
     else
-      account.canvas_batches.create(context: course, status: "Queued")
+      batch = account.canvas_batches.create(context: course, status: "Queued")
     end
+    batch.update_attributes(options: options)
+    batch
   end
 
   def api_client
     @api_client ||= Bearcat::Client.new(prefix: account.settings[:base_url], token: account.settings[:account_admin_api_token])
   end
 
-  def start
-    return unless batch.status == 'Queued'
+  def start(forced = false)
+    unless forced
+      return unless batch.status == 'Queued' # don't start if there is already a running job
+      return unless should_download?
+    end
+
     begin
       batch.update_attributes(status: "Started", percent_complete: 0)
       index = 1
@@ -50,6 +56,14 @@ class CoalescingPanda::Workers::CourseMiner
   end
   handle_asynchronously :start
 
+  def should_download?
+    return true unless account.settings[:canvas_download_interval].present?
+    return true unless last_completed_batch = account.canvas_batches.where(context: course, status: 'Completed').order('updated_at ASC').first
+    should_download = last_completed_batch.updated_at < Time.zone.now - account.settings[:canvas_download_interval].minutes
+    batch.update_attributes(status: 'Canceled') unless should_download
+    should_download
+  end
+
   def process_api_data(key)
     case key
     when :assignment_groups

data/app/views/coalescing_panda/canvas_batches/_canvas_batch.html.haml

@@ -1,20 +1,30 @@
 #batch-info{data: {batch: @batch.to_json}}
--if @batch.status == "Queued"
-  %h6.batch-message-queued Data is queued for download from Canvas.
+- if @batch.status == "Queued"
+  %span.batch-message-queued Data is queued for download from Canvas.
 
--if @batch.status == "Completed"
+- if @batch.status == "Completed"
   .alert.alert-success
     %button.close{"data-dismiss" => "alert", :type => "button"} ×
     %span.batch-message-completed
       Data successfully downloaded from Canvas.
 
--if @batch.status == "Started"
-  %h6.batch-message-started Downloading data from Canvas
+- if @batch.status == "Started"
+  %span.batch-message-started Downloading data from Canvas
   .progress
     .progress-bar{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => "#{@batch.percent_complete}", :role => "progressbar", :style => "width: #{@batch.percent_complete}%;"}
 
--if @batch.status == "Error"
+- if @batch.status == "Error"
   .alert.alert-block.alert-error
     %button.close{"data-dismiss" => "alert", :type => "button"} ×
-    %h6.batch-message-error Data failed to download from Canvas
-    = @batch.message
+    %span.batch-message-error Data failed to download from Canvas
+    = @batch.message
+
+- if @batch.status == "Canceled"
+  .alert.alert-block.alert-info
+    %button.close{"data-dismiss" => "alert", :type => "button"} ×
+    %span.batch-message-retrigger
+      Canvas data last downloaded
+      = @batch.updated_at
+      .pull-right
+        = link_to "Retrigger", retrigger_canvas_batch_path(@batch), method: :post,  class: "btn btn-default"
+      .clearfix

data/app/views/coalescing_panda/canvas_batches/_canvas_batch_flash.html.haml

@@ -1,4 +1,4 @@
 - if current_batch.present?
   - path = CoalescingPanda::Engine.routes.url_helpers.canvas_batch_path(current_batch)
-  -clear_path = CoalescingPanda::Engine.routes.url_helpers.clear_batch_session_path
+  - clear_path = CoalescingPanda::Engine.routes.url_helpers.clear_batch_session_path
   #batch-progress{data: {batch: current_batch.try(:to_json), url: path, clear_path: clear_path} }

data/config/routes.rb

@@ -1,5 +1,7 @@
 CoalescingPanda::Engine.routes.draw do
-  resources :canvas_batches, only: [:show]
+  resources :canvas_batches, only: [:show, :update] do
+    post :retrigger, on: :member
+  end
   post '/canvas_batches/clear_batch_session', as: :clear_batch_session
 
   get '/oauth2/redirect' => 'oauth2#redirect'

data/db/migrate/20150602205257_add_option_to_canvas_batches.rb

@@ -0,0 +1,5 @@
+class AddOptionToCanvasBatches < ActiveRecord::Migration
+  def change
+    add_column :coalescing_panda_canvas_batches, :options, :text
+  end
+end

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '4.1.5'
+  VERSION = '4.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6
 platform: ruby
 authors:
 - Nathan Mills
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -377,6 +377,7 @@ files:
 - db/migrate/20150506183335_create_coalescing_panda_assignment_groups.rb
 - db/migrate/20150506192717_add_assignment_group_id_to_assignments.rb
 - db/migrate/20150526144713_add_account_to_canvas_batches.rb
+- db/migrate/20150602205257_add_option_to_canvas_batches.rb
 - lib/coalescing_panda.rb
 - lib/coalescing_panda/controller_helpers.rb
 - lib/coalescing_panda/engine.rb