coalescing_panda 4.0.4 → 4.0.5

data/db/migrate/20150506183335_create_coalescing_panda_assignment_groups.rb

@@ -0,0 +1,18 @@
+class CreateCoalescingPandaAssignmentGroups < ActiveRecord::Migration
+  def change
+    create_table :coalescing_panda_assignment_groups do |t|
+      t.belongs_to :coalescing_panda_course, null: false
+      t.belongs_to :context, polymorphic: true
+      t.string :canvas_assignment_group_id
+      t.string :name
+      t.integer :position
+      t.float :group_weight
+      t.string :workflow_state
+
+      t.timestamps
+    end
+
+    add_index :coalescing_panda_assignment_groups, [:coalescing_panda_course_id, :canvas_assignment_group_id], name: :index_assignment_group_course, unique: true
+    add_index :coalescing_panda_assignment_groups, [:canvas_assignment_group_id, :context_id, :context_type], name: :index_assignment_group_context, unique: true
+  end
+end

data/db/migrate/20150506192717_add_assignment_group_id_to_assignments.rb

@@ -0,0 +1,5 @@
+class AddAssignmentGroupIdToAssignments < ActiveRecord::Migration
+  def change
+    add_column :coalescing_panda_assignments, :coalescing_panda_assignment_group_id, :integer
+  end
+end

data/db/migrate/20150526144713_add_account_to_canvas_batches.rb

@@ -0,0 +1,5 @@
+class AddAccountToCanvasBatches < ActiveRecord::Migration
+  def change
+    add_column :coalescing_panda_canvas_batches, :coalescing_panda_lti_account_id, :integer, index: true
+  end
+end

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/db/migrate/20150708192717_add_group_moderator_to_group_memberships.rb

@@ -0,0 +1,5 @@
+class AddGroupModeratorToGroupMemberships < ActiveRecord::Migration
+  def change
+    add_column :coalescing_panda_group_memberships, :moderator, :boolean
+  end
+end

data/db/migrate/20150709192717_add_leader_id_to_groups.rb

@@ -0,0 +1,6 @@
+class AddLeaderIdToGroups < ActiveRecord::Migration
+  def change
+    add_column :coalescing_panda_groups, :leader_id, :integer
+    add_foreign_key :coalescing_panda_groups, :coalescing_panda_users, column: :leader_id, primary_key: "id"
+  end
+end

data/db/migrate/20150714205405_create_coalescing_panda_group_categories.rb

@@ -0,0 +1,16 @@
+class CreateCoalescingPandaGroupCategories < ActiveRecord::Migration
+  def change
+    create_table :coalescing_panda_group_categories do |t|
+      t.belongs_to :context, polymorphic: true
+      t.string :context_type
+      t.integer :canvas_group_category_id
+      t.string :name
+
+      t.timestamps
+    end
+    add_index :coalescing_panda_group_categories, [:context_id, :context_type], name: :index_group_categories_context_and_context_type
+
+    add_column :coalescing_panda_assignments, :coalescing_panda_group_category_id, :integer
+    add_column :coalescing_panda_groups, :coalescing_panda_group_category_id, :integer
+  end
+end

data/lib/coalescing_panda/bearcat_uri.rb

@@ -0,0 +1,20 @@
+class CoalescingPanda::BearcatUri
+  attr_accessor :uri
+
+  def initialize(uri)
+    Rails.logger.info "Parsing Bearcat URI: #{uri}"
+    @uri = URI.parse(uri)
+  end
+
+  def api_domain
+    uri.port.present? ? "#{uri.host}:#{uri.port.to_s}" : uri.host
+  end
+
+  def scheme
+    [uri.scheme, '://'].join
+  end
+
+  def prefix
+    [scheme, api_domain].join
+  end
+end

data/lib/coalescing_panda/controller_helpers.rb

@@ -7,27 +7,21 @@ module CoalescingPanda
       if lti_authorize!(*roles)
         user_id = params['user_id']
         launch_presentation_return_url = @lti_account.settings[:launch_presentation_return_url] || params['launch_presentation_return_url']
-        uri = URI.parse(launch_presentation_return_url)
-        api_domain = uri.host
-        api_domain = "#{api_domain}:#{uri.port.to_s}" if uri.port
-        scheme = uri.scheme + '://'
-        @lti_params = params.to_hash
-        session['user_id'] = user_id
-        session['uri'] = launch_presentation_return_url
-        session['lis_person_sourcedid'] = params['lis_person_sourcedid']
-        session['oauth_consumer_key'] = params['oauth_consumer_key']
-        session['custom_canvas_account_id'] = params['custom_canvas_account_id']
+        launch_presentation_return_url = [BearcatUri.new(request.env["HTTP_REFERER"]).prefix, launch_presentation_return_url].join unless launch_presentation_return_url.include?('http')
+        uri = BearcatUri.new(launch_presentation_return_url)
+        set_session(launch_presentation_return_url)
 
-        if token = CanvasApiAuth.where('user_id = ? and api_domain = ?', user_id, api_domain).pluck(:api_token).first
-          @client = Bearcat::Client.new(token: token, prefix: scheme+api_domain)
+        if token = CanvasApiAuth.where('user_id = ? and api_domain = ?', user_id, uri.api_domain).pluck(:api_token).first
+          @client = Bearcat::Client.new(token: token, prefix: uri.prefix)
         elsif @lti_account = params['oauth_consumer_key'] && LtiAccount.find_by_key(params['oauth_consumer_key'])
           client_id = @lti_account.oauth2_client_id
-          client = Bearcat::Client.new(prefix: scheme+api_domain)
+          client = Bearcat::Client.new(prefix: uri.prefix)
           session['state'] = SecureRandom.hex(32)
-          @canvas_url = client.auth_redirect_url(client_id,
-                                                 coalescing_panda.oauth2_redirect_url({key: params['oauth_consumer_key'],
-                                                                                       user_id: user_id, api_domain: api_domain, state: session['state']}))
+          redirect_url = [coalescing_panda_url, coalescing_panda.oauth2_redirect_path({key: params['oauth_consumer_key'], user_id: user_id, api_domain: uri.api_domain, state: session['state']})].join
+          @canvas_url = client.auth_redirect_url(client_id, redirect_url)
+
           #delete the added params so the original oauth sig still works
+          @lti_params = params.to_hash
           @lti_params.delete('action')
           @lti_params.delete('controller')
           render 'coalescing_panda/oauth2/oauth2', layout: 'coalescing_panda/application'
@@ -35,6 +29,14 @@ module CoalescingPanda
       end
     end
 
+    def set_session(launch_presentation_return_url)
+      session['user_id'] = params['user_id']
+      session['uri'] = launch_presentation_return_url
+      session['lis_person_sourcedid'] = params['lis_person_sourcedid']
+      session['oauth_consumer_key'] = params['oauth_consumer_key']
+      session['custom_canvas_account_id'] = params['custom_canvas_account_id']
+    end
+
     def have_session?
       if params['tool_consumer_instance_guid'] && session['user_id'] != params['user_id']
         reset_session
@@ -43,12 +45,9 @@ module CoalescingPanda
       end
 
       if (session['user_id'] && session['uri'])
-        uri = URI.parse(session['uri'])
-        api_domain = uri.host
-        api_domain = "#{api_domain}:#{uri.port.to_s}" if uri.port
-        scheme = uri.scheme + '://'
-        token = CanvasApiAuth.where('user_id = ? and api_domain = ?', session['user_id'], api_domain).pluck(:api_token).first
-        @client = Bearcat::Client.new(token: token, prefix: scheme+api_domain) if token
+        uri = BearcatUri.new(session['uri'])
+        token = CanvasApiAuth.where('user_id = ? and api_domain = ?', session['user_id'], uri.api_domain).pluck(:api_token).first
+        @client = Bearcat::Client.new(token: token, prefix: uri.prefix) if token
       end
 
       @lti_account = LtiAccount.find_by_key(session['oauth_consumer_key']) if session['oauth_consumer_key']
@@ -67,9 +66,7 @@ module CoalescingPanda
       logger.info 'not authorized on roles' if !authorized
       authorized = authorized && @lti_account.validate_nonce(params['oauth_nonce'], DateTime.strptime(params['oauth_timestamp'], '%s'))
       logger.info 'not authorized on nonce' if !authorized
-      if !authorized
-        render :text => 'Invalid Credentials, please contact your Administrator.', :status => :unauthorized
-      end
+      render :text => 'Invalid Credentials, please contact your Administrator.', :status => :unauthorized unless authorized
       authorized
     end
 

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '4.0.4'
+  VERSION = '4.0.5'
 end

data/spec/dummy/db/schema.rb

@@ -11,14 +11,30 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150210180516) do
+ActiveRecord::Schema.define(version: 20150714205405) do
 
-  create_table "coalescing_panda_assignments", force: true do |t|
-    t.integer  "coalescing_panda_course_id",        null: false
+  create_table "coalescing_panda_assignment_groups", force: :cascade do |t|
+    t.integer  "coalescing_panda_course_id", null: false
+    t.integer  "context_id"
+    t.string   "context_type"
+    t.string   "canvas_assignment_group_id"
     t.string   "name"
-    t.text     "description"
-    t.string   "canvas_assignment_id",              null: false
+    t.integer  "position"
+    t.float    "group_weight"
     t.string   "workflow_state"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "coalescing_panda_assignment_groups", ["canvas_assignment_group_id", "context_id", "context_type"], name: "index_assignment_group_context", unique: true
+  add_index "coalescing_panda_assignment_groups", ["coalescing_panda_course_id", "canvas_assignment_group_id"], name: "index_assignment_group_course", unique: true
+
+  create_table "coalescing_panda_assignments", force: :cascade do |t|
+    t.integer  "coalescing_panda_course_id",                       null: false
+    t.string   "name",                                 limit: 255
+    t.text     "description"
+    t.string   "canvas_assignment_id",                 limit: 255, null: false
+    t.string   "workflow_state",                       limit: 255
     t.float    "points_possible"
     t.datetime "due_at"
     t.datetime "unlock_at"
@@ -29,38 +45,42 @@ ActiveRecord::Schema.define(version: 20150210180516) do
     t.integer  "group_category_id"
     t.boolean  "grade_group_students_individually"
     t.boolean  "published"
+    t.integer  "coalescing_panda_assignment_group_id"
+    t.integer  "coalescing_panda_group_category_id"
   end
 
   add_index "coalescing_panda_assignments", ["coalescing_panda_course_id", "canvas_assignment_id"], name: "index_assignments_course", unique: true
 
-  create_table "coalescing_panda_canvas_api_auths", force: true do |t|
-    t.string   "user_id"
-    t.string   "api_domain"
-    t.string   "api_token"
+  create_table "coalescing_panda_canvas_api_auths", force: :cascade do |t|
+    t.string   "user_id",    limit: 255
+    t.string   "api_domain", limit: 255
+    t.string   "api_token",  limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "coalescing_panda_canvas_batches", force: true do |t|
-    t.float    "percent_complete", default: 0.0
-    t.string   "status"
+  create_table "coalescing_panda_canvas_batches", force: :cascade do |t|
+    t.float    "percent_complete",                            default: 0.0
+    t.string   "status",                          limit: 255
     t.text     "message"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "context_id"
-    t.string   "context_type"
+    t.string   "context_type",                    limit: 255
+    t.integer  "coalescing_panda_lti_account_id"
+    t.text     "options"
   end
 
-  create_table "coalescing_panda_courses", force: true do |t|
-    t.integer  "coalescing_panda_lti_account_id", null: false
+  create_table "coalescing_panda_courses", force: :cascade do |t|
+    t.integer  "coalescing_panda_lti_account_id",             null: false
     t.integer  "coalescing_panda_term_id"
-    t.string   "name"
-    t.string   "canvas_course_id",                null: false
-    t.string   "sis_id"
+    t.string   "name",                            limit: 255
+    t.string   "canvas_course_id",                limit: 255, null: false
+    t.string   "sis_id",                          limit: 255
     t.datetime "start_at"
     t.datetime "conclude_at"
-    t.string   "workflow_state"
-    t.string   "course_code"
+    t.string   "workflow_state",                  limit: 255
+    t.string   "course_code",                     limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -69,13 +89,13 @@ ActiveRecord::Schema.define(version: 20150210180516) do
   add_index "coalescing_panda_courses", ["coalescing_panda_term_id", "canvas_course_id"], name: "index_courses_term", unique: true
   add_index "coalescing_panda_courses", ["sis_id"], name: "index_coalescing_panda_courses_on_sis_id"
 
-  create_table "coalescing_panda_enrollments", force: true do |t|
-    t.integer  "coalescing_panda_user_id",    null: false
-    t.integer  "coalescing_panda_section_id", null: false
-    t.string   "workflow_state"
-    t.string   "sis_id"
-    t.string   "canvas_enrollment_id",        null: false
-    t.string   "enrollment_type"
+  create_table "coalescing_panda_enrollments", force: :cascade do |t|
+    t.integer  "coalescing_panda_user_id",                null: false
+    t.integer  "coalescing_panda_section_id",             null: false
+    t.string   "workflow_state",              limit: 255
+    t.string   "sis_id",                      limit: 255
+    t.string   "canvas_enrollment_id",        limit: 255, null: false
+    t.string   "enrollment_type",             limit: 255
     t.datetime "start_at"
     t.datetime "end_at"
     t.datetime "created_at"
@@ -85,51 +105,69 @@ ActiveRecord::Schema.define(version: 20150210180516) do
   add_index "coalescing_panda_enrollments", ["coalescing_panda_user_id", "coalescing_panda_section_id", "enrollment_type"], name: "index_enrollments_user_and_section", unique: true
   add_index "coalescing_panda_enrollments", ["sis_id"], name: "index_coalescing_panda_enrollments_on_sis_id"
 
-  create_table "coalescing_panda_group_memberships", force: true do |t|
+  create_table "coalescing_panda_group_categories", force: :cascade do |t|
+    t.integer  "context_id"
+    t.string   "context_type"
+    t.integer  "canvas_group_category_id"
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "coalescing_panda_group_categories", ["context_id", "context_type"], name: "index_group_categories_context_and_context_type"
+
+  create_table "coalescing_panda_group_memberships", force: :cascade do |t|
     t.integer  "coalescing_panda_group_id"
     t.integer  "coalescing_panda_user_id"
-    t.string   "canvas_group_membership_id"
-    t.string   "workflow_state"
+    t.string   "canvas_group_membership_id", limit: 255
+    t.string   "workflow_state",             limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "moderator"
   end
 
-  create_table "coalescing_panda_groups", force: true do |t|
+  add_index "coalescing_panda_group_memberships", ["coalescing_panda_group_id", "coalescing_panda_user_id"], name: "index_group_memberships_user_and_group", unique: true
+
+  create_table "coalescing_panda_groups", force: :cascade do |t|
     t.integer  "context_id"
-    t.string   "context_type"
-    t.string   "description"
-    t.string   "group_category_id"
-    t.string   "canvas_group_id"
-    t.string   "name"
+    t.string   "context_type",                       limit: 255
+    t.string   "description",                        limit: 255
+    t.string   "group_category_id",                  limit: 255
+    t.string   "canvas_group_id",                    limit: 255
+    t.string   "name",                               limit: 255
     t.integer  "members_count"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "leader_id"
+    t.integer  "coalescing_panda_group_category_id"
   end
 
-  create_table "coalescing_panda_lti_accounts", force: true do |t|
-    t.string   "name"
-    t.string   "key"
-    t.string   "secret"
-    t.string   "oauth2_client_id"
-    t.string   "oauth2_client_key"
-    t.string   "canvas_account_id"
+  add_index "coalescing_panda_groups", ["context_id", "canvas_group_id"], name: "index_groups_context_and_group_id", unique: true
+
+  create_table "coalescing_panda_lti_accounts", force: :cascade do |t|
+    t.string   "name",              limit: 255
+    t.string   "key",               limit: 255
+    t.string   "secret",            limit: 255
+    t.string   "oauth2_client_id",  limit: 255
+    t.string   "oauth2_client_key", limit: 255
+    t.string   "canvas_account_id", limit: 255
     t.text     "settings"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "coalescing_panda_lti_nonces", force: true do |t|
+  create_table "coalescing_panda_lti_nonces", force: :cascade do |t|
     t.integer  "coalescing_panda_lti_account_id"
-    t.string   "nonce"
+    t.string   "nonce",                           limit: 255
     t.datetime "timestamp"
   end
 
-  create_table "coalescing_panda_sections", force: true do |t|
-    t.integer  "coalescing_panda_course_id", null: false
-    t.string   "name"
-    t.string   "canvas_section_id",          null: false
-    t.string   "sis_id"
-    t.string   "workflow_state"
+  create_table "coalescing_panda_sections", force: :cascade do |t|
+    t.integer  "coalescing_panda_course_id",             null: false
+    t.string   "name",                       limit: 255
+    t.string   "canvas_section_id",          limit: 255, null: false
+    t.string   "sis_id",                     limit: 255
+    t.string   "workflow_state",             limit: 255
     t.datetime "start_at"
     t.datetime "end_at"
     t.datetime "created_at"
@@ -139,22 +177,22 @@ ActiveRecord::Schema.define(version: 20150210180516) do
   add_index "coalescing_panda_sections", ["coalescing_panda_course_id", "canvas_section_id"], name: "index_sections_course", unique: true
   add_index "coalescing_panda_sections", ["sis_id"], name: "index_coalescing_panda_sections_on_sis_id"
 
-  create_table "coalescing_panda_sessions", force: true do |t|
-    t.string   "token"
+  create_table "coalescing_panda_sessions", force: :cascade do |t|
+    t.string   "token",      limit: 255
     t.text     "data"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "coalescing_panda_submissions", force: true do |t|
-    t.integer  "coalescing_panda_user_id",       null: false
-    t.integer  "coalescing_panda_assignment_id", null: false
-    t.string   "url"
-    t.string   "grade"
-    t.string   "score"
+  create_table "coalescing_panda_submissions", force: :cascade do |t|
+    t.integer  "coalescing_panda_user_id",                   null: false
+    t.integer  "coalescing_panda_assignment_id",             null: false
+    t.string   "url",                            limit: 255
+    t.string   "grade",                          limit: 255
+    t.string   "score",                          limit: 255
     t.datetime "submitted_at"
-    t.string   "workflow_state"
-    t.string   "canvas_submission_id",           null: false
+    t.string   "workflow_state",                 limit: 255
+    t.string   "canvas_submission_id",           limit: 255, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -162,15 +200,15 @@ ActiveRecord::Schema.define(version: 20150210180516) do
   add_index "coalescing_panda_submissions", ["canvas_submission_id"], name: "index_coalescing_panda_submissions_on_canvas_submission_id"
   add_index "coalescing_panda_submissions", ["coalescing_panda_user_id", "coalescing_panda_assignment_id", "canvas_submission_id"], name: "index_submissions_user_and_assignment", unique: true
 
-  create_table "coalescing_panda_terms", force: true do |t|
-    t.integer  "coalescing_panda_lti_account_id", null: false
-    t.string   "name"
-    t.string   "code"
-    t.string   "sis_id"
-    t.string   "canvas_term_id",                  null: false
+  create_table "coalescing_panda_terms", force: :cascade do |t|
+    t.integer  "coalescing_panda_lti_account_id",             null: false
+    t.string   "name",                            limit: 255
+    t.string   "code",                            limit: 255
+    t.string   "sis_id",                          limit: 255
+    t.string   "canvas_term_id",                  limit: 255, null: false
     t.datetime "start_at"
     t.datetime "end_at"
-    t.string   "workflow_state"
+    t.string   "workflow_state",                  limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -178,14 +216,14 @@ ActiveRecord::Schema.define(version: 20150210180516) do
   add_index "coalescing_panda_terms", ["canvas_term_id", "coalescing_panda_lti_account_id"], name: "index_terms_account", unique: true
   add_index "coalescing_panda_terms", ["sis_id"], name: "index_coalescing_panda_terms_on_sis_id"
 
-  create_table "coalescing_panda_users", force: true do |t|
-    t.integer  "coalescing_panda_lti_account_id", null: false
-    t.string   "name"
-    t.string   "email"
-    t.string   "roles"
-    t.string   "workflow_state"
-    t.string   "sis_id"
-    t.string   "canvas_user_id",                  null: false
+  create_table "coalescing_panda_users", force: :cascade do |t|
+    t.integer  "coalescing_panda_lti_account_id",             null: false
+    t.string   "name",                            limit: 255
+    t.string   "email",                           limit: 255
+    t.string   "roles",                           limit: 255
+    t.string   "workflow_state",                  limit: 255
+    t.string   "sis_id",                          limit: 255
+    t.string   "canvas_user_id",                  limit: 255, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -193,16 +231,16 @@ ActiveRecord::Schema.define(version: 20150210180516) do
   add_index "coalescing_panda_users", ["coalescing_panda_lti_account_id", "canvas_user_id"], name: "index_users_account", unique: true
   add_index "coalescing_panda_users", ["sis_id"], name: "index_coalescing_panda_users_on_sis_id"
 
-  create_table "delayed_jobs", force: true do |t|
-    t.integer  "priority",   default: 0, null: false
-    t.integer  "attempts",   default: 0, null: false
-    t.text     "handler",                null: false
+  create_table "delayed_jobs", force: :cascade do |t|
+    t.integer  "priority",               default: 0, null: false
+    t.integer  "attempts",               default: 0, null: false
+    t.text     "handler",                            null: false
     t.text     "last_error"
     t.datetime "run_at"
     t.datetime "locked_at"
     t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
+    t.string   "locked_by",  limit: 255
+    t.string   "queue",      limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end