treesame commit of origin/stable/2014-07-26

Treesame-Commit-Id: e976a55

Gemfile.d/_before.rb

@@ -23,6 +23,9 @@
 elsif RUBY_VERSION >= "2.1" && RUBY_VERSION < "2.2"
   warn "Ruby 2.1 support is untested"
   ruby RUBY_VERSION, :engine => 'ruby', :engine_version => RUBY_VERSION
+elsif RUBY_VERSION >= "2.2"
+  warn "Ruby newer than 2.1 is very UNSUPPORTED"
+  ruby RUBY_VERSION, :engine => 'ruby', :engine_version => RUBY_VERSION
 else
   ruby '1.9.3', :engine => 'ruby', :engine_version => '1.9.3'
 end
@@ -80,7 +83,12 @@ def _normalize_options(name, version, opts)
   end
 end
 
-platforms :ruby_20, :ruby_21 do
-  gem 'syck', '1.0.1'
-  gem 'iconv', '1.0.3'
+if RUBY_VERSION >= '2.2'
+  gem 'syck', github: 'tenderlove/syck'
+  gem 'iconv', '1.0.4'
+else
+  platforms :ruby_20, :ruby_21 do
+    gem 'syck', '1.0.3'
+    gem 'iconv', '1.0.4'
+  end
 end

Gemfile.d/development.rb

@@ -8,7 +8,7 @@
   if CANVAS_RAILS3
     gem "letter_opener"
   else
-    gem "letter_opener", :git => 'git://github.com/cavi21/letter_opener.git'
+    gem "letter_opener", :github => 'cavi21/letter_opener'
   end
 
   # Option to DISABLE_RUBY_DEBUGGING is helpful IDE-based debugging.
@@ -17,7 +17,11 @@
 
 
   unless ENV['DISABLE_RUBY_DEBUGGING']
-    gem 'byebug', '2.4.1', :platforms => [:ruby_20, :ruby_21]
+    if RUBY_VERSION >= '2.2'
+      gem 'byebug', '3.1.2'
+    end
+    gem 'byebug', '3.1.2', :platforms => [:ruby_20, :ruby_21]
+      gem 'columnize', '0.8.9', :platforms => [:ruby_20, :ruby_21]
     gem 'debugger', '1.6.6', :platforms => :ruby_19
   end
 end

Gemfile.d/other_stuff.rb

@@ -52,14 +52,15 @@
 gem 'diff-lcs', '1.1.3', :require => 'diff/lcs'
 
 gem 'ffi', '1.1.5'
-gem 'hairtrigger', '0.2.3'
-  gem 'ruby2ruby', '2.0.7'
+gem 'hairtrigger', '0.2.9'
+  gem 'ruby2ruby', '2.0.8'
+  gem 'ruby_parser', '3.6.1'
 gem 'hashery', '1.3.0', :require => 'hashery/dictionary'
 gem 'highline', '1.6.1'
 gem 'hoe', '3.8.1'
 gem 'i18n', '0.6.8'
-gem 'i18nema', '0.0.7'
-gem 'icalendar', '1.1.5'
+gem 'i18nema', RUBY_VERSION >= '2.2' ? '0.0.8' : '0.0.7'
+gem 'icalendar', '1.5.4'
 gem 'jammit', '0.6.6'
   gem 'cssmin', '1.0.3'
   gem 'jsmin', '1.0.1'
@@ -71,7 +72,7 @@
 gem 'macaddr', '1.0.0' # macaddr 1.2.0 tries to require 'systemu' which isn't a dependency
 gem 'mail', '2.5.4'
   gem 'treetop', '1.4.15'
-    gem 'polyglot', '0.3.3'
+    gem 'polyglot', '0.3.5'
 gem 'marginalia', '1.1.3', :require => false
 gem 'mime-types', '1.17.2', :require => 'mime/types'
 # attachment_fu (even the current technoweenie one on github) does not work
@@ -90,13 +91,13 @@
 gem 'rdiscount', '1.6.8'
 gem 'ritex', '1.0.1'
 
-gem 'rotp', '1.4.1'
+gem 'rotp', '1.6.1'
 gem 'rqrcode', '0.4.2'
 gem 'rscribd', '1.2.0'
 gem 'net-ldap', '0.3.1', :require => 'net/ldap'
 gem 'ruby-saml-mod', '0.1.29'
 gem 'rubycas-client', '2.3.9'
-gem 'rubyzip', '1.1.1', :require => 'zip'
+gem 'rubyzip', '1.1.0', :require => 'zip', :github => 'rubyzip/rubyzip', :ref => '2697c7ea4fba6dca66acd4793965501b06ea8df6'
 gem 'zip-zip', '0.2' # needed until plugins use the new namespace
 gem 'safe_yaml', '0.9.7', :require => false
 gem 'safe_yaml-instructure', '0.8.0', :require => false
@@ -134,7 +135,6 @@
 gem 'canvas_stringex', :path => 'gems/canvas_stringex'
 gem 'canvas_text_helper', :path => 'gems/canvas_text_helper'
 gem 'canvas_time', :path => 'gems/canvas_time'
-gem 'canvas_unzip', :path => 'gems/canvas_unzip'
 gem 'canvas_uuid', :path => 'gems/canvas_uuid'
 gem 'facebook', :path => 'gems/facebook'
 gem 'google_docs', :path => 'gems/google_docs'

Gemfile.d/sqlite.rb

@@ -1,3 +1,3 @@
 group :sqlite do
-  gem 'sqlite3', '1.3.8'
+  gem 'sqlite3', '1.3.9'
 end

Gemfile.d/test.rb

@@ -4,17 +4,28 @@
   gem 'simplecov-rcov', '0.2.3', :require => false
   gem 'bluecloth', '2.0.10' # for generating api docs
     gem 'redcarpet', '3.0.0'
-  gem 'mocha', '1.0.0.alpha', :require => false
-    gem 'metaclass', '0.0.2'
+  if RUBY_VERSION >= '2.1'
+    gem 'mocha', github: 'eac/mocha', :branch => 'eac/alias_method_fix', :ref => 'bb8813fbb4cc589d7c58073d93983722d61b6919', :require => false
+      gem 'metaclass', '0.0.2'
+  else
+    gem 'mocha', '1.1.0', :require => false
+      gem 'metaclass', '0.0.2'
+  end
   gem 'thin', '1.5.1'
-    gem 'eventmachine', '1.0.3'
+    if RUBY_VERSION >= '2.2'
+      gem 'eventmachine', :github => 'eventmachine/eventmachine'
+    else
+      gem 'eventmachine', '1.0.3'
+    end
+
   if CANVAS_RAILS2
     gem 'rspec', '1.3.2'
     gem 'rspec-rails', '1.3.4'
     gem 'test-unit', '1.2.3'
   else
     gem 'rspec', '2.14.1'
     gem 'rspec-rails', '2.14.1'
+    gem 'once-ler', '0.0.11'
   end
   gem 'sequel', '4.5.0', :require => false
   gem 'selenium-webdriver', '2.42.0'

README.md

@@ -1,9 +1,6 @@
 Canvas LMS
 ======
 
-[![Build
-Status](https://travis-ci.org/instructure/canvas-lms.png?branch=master)](https://travis-ci.org/instructure/canvas-lms)
-
 Canvas is a new, open-source LMS by Instructure Inc. It is released under the
 AGPLv3 license for use by anyone interested in learning more about or using
 learning management systems.

app/coffeescripts/behaviors/SyllabusBehaviors.coffee

@@ -119,7 +119,7 @@ define [
       $('tr.selected').removeClass('selected')
       $row.addClass('selected')
       $('html, body').scrollTo $row
-      $row.find('a').focus()
+      $row.find('a').first().focus()
 
   selectDate = (date) ->
     $('.mini_month .day.selected').removeClass('selected')

app/coffeescripts/behaviors/unread_conversations.coffee

@@ -1,7 +1,6 @@
 define ['jquery'], ($) ->
   $unread = $('#identity .unread-messages-count')
   update = ->
-    return unless document.hidden == false
     $.get('/api/v1/conversations/unread_count').done (response) ->
       $unread.text(response.unread_count)
       $unread.toggle(response.unread_count > 0)

app/coffeescripts/bundles/common.coffee

@@ -29,6 +29,7 @@ require [
   'compiled/behaviors/instructure_inline_media_comment'
   'compiled/behaviors/ping'
   'compiled/behaviors/favicon'
+  'compiled/behaviors/unread_conversations'
 
   # other stuff several bundles use
   'media_comments'

app/coffeescripts/bundles/content_migration.coffee

@@ -200,7 +200,9 @@ require [
                                    fileSizeLimit: ENV.UPLOAD_LIMIT
 
             overwriteAssessmentContent: new OverwriteAssessmentContentView(model: ConverterViewControl.getModel())
-            questionBank:        new QuestionBankView(questionBanks: ENV.QUESTION_BANKS)
+            questionBank:        new QuestionBankView(questionBanks: ENV.QUESTION_BANKS, model: ConverterViewControl.getModel())
+
+
 
 
   registerExternalTool = (et) ->

app/coffeescripts/bundles/conversations_new.coffee

@@ -14,7 +14,6 @@ require [
   'compiled/collections/CourseCollection'
   'compiled/collections/FavoriteCourseCollection'
   'compiled/collections/GroupCollection'
-  'compiled/behaviors/unread_conversations'
   'jquery.disableWhileLoading'
 ], (I18n, $, _, Backbone, Message, MessageCollection, MessageView, MessageListView, MessageDetailView, MessageFormDialog,
  InboxHeaderView, deparam, CourseCollection, FavoriteCourseCollection, GroupCollection) ->

app/coffeescripts/bundles/user_observees.coffee

@@ -0,0 +1,13 @@
+require [
+  'compiled/views/UserObserveesView'
+  'compiled/collections/UserObserveesCollection'
+], (UserObserveesView, UserObserveesCollection) ->
+
+  collection = new UserObserveesCollection
+  collection.user_id = ENV['current_user_id']
+
+  userObservees = new UserObserveesView(collection: collection)
+  userObservees.render()
+  userObservees.$el.appendTo('#content')
+
+  collection.fetch()

app/coffeescripts/collections/OutcomeSummaryCollection.coffee

@@ -67,7 +67,7 @@ define [
       @rawCollections.groups.each (group) =>
         return unless group.get('outcomes').length
         parentObj = group.get('parent_outcome_group')
-        parentId = if parentObj then parentObj.id else group
+        parentId = if parentObj then parentObj.id else group.id
         unless parent = tmp.get(parentId)
           parent = tmp.add(new Section(id: parentId, path: @getPath(parentId)))
         parent.get('groups').add(group)

app/coffeescripts/collections/UserObserveesCollection.coffee

@@ -0,0 +1,6 @@
+define [
+  'compiled/collections/PaginatedCollection'
+], (PaginatedCollection) ->
+
+  class UserObserveesCollection extends PaginatedCollection
+    url: -> "/api/v1/users/#{@user_id}/observees"

app/coffeescripts/ember/quizzes/adapters/application_adapter.coffee

@@ -7,7 +7,7 @@ define [
   DS.ActiveModelAdapter.extend
     ajax: (url, type, options) ->
       options = @ajaxOptions url, type, options
-      ajax(options)
+      ajax.request(options)
 
     headers:
       'Accept': 'application/vnd.api+json'

app/coffeescripts/ember/quizzes/controllers/quiz/message_students_controller.coffee

@@ -58,7 +58,7 @@ define [
     actions:
       submit: ->
         if @get('messageBody')
-          ajax
+          ajax.request
             url: @get('quiz.messageStudentsUrl')
             data: JSON.stringify(
               conversations: [

app/coffeescripts/ember/quizzes/shared/ic-ajax-jsonapi.coffee

@@ -19,4 +19,4 @@ define [
     else
       $.extend(true, options, url: url, opts)
 
-    ajax.call null, newArguments
+    ajax.request newArguments

app/coffeescripts/ember/quizzes/tests/controllers/quiz/statistics/summary/report_generator_controller.spec.coffee

@@ -85,7 +85,7 @@ define [
   emq.test '#pullGeneratedReport: it reloads and auto-downloads', ->
     expect 3
 
-    ajax.defineFixture '/quiz_reports/1?include[]=file', response: {
+    ajax.defineFixture '/quiz_reports/1?include[]=file', textStatus: 'success', response: {
       quiz_reports: [{
         id: 1,
         file: FileFixture
@@ -104,7 +104,7 @@ define [
   emq.test "#pullGeneratedReport: it reloads but doesn't auto-download", ->
     expect 3
 
-    ajax.defineFixture '/quiz_reports/1?include[]=file', response: {
+    ajax.defineFixture '/quiz_reports/1?include[]=file', textStatus: 'success', response: {
       quiz_reports: [{
         id: 1,
         file: FileFixture

app/coffeescripts/ember/quizzes/tests/mixins/queriable_model.spec.coffee

@@ -18,7 +18,7 @@ define [
         SpecModelAdapter: App.ApplicationAdapter.extend({
           # use ic-ajax
           ajax: (url, method) ->
-            ajax({ url: url, type: method })
+            ajax.request({ url: url, type: method })
 
           # use the model's "url" attribute if it's persistent
           buildURL: (type, id) ->
@@ -39,7 +39,7 @@ define [
       run App, 'destroy'
 
   asyncTest '#reload: it uses the query parameters', ->
-    ajax.defineFixture '/api/v1/courses/1/spec_models/1?page=1', response: {
+    ajax.defineFixture '/api/v1/courses/1/spec_models/1?page=1', textStatus: 'success', response: {
       id: 1,
       fruit: 'banana'
     }
@@ -58,7 +58,7 @@ define [
         start()
 
   asyncTest '#reload: it restores the original url', ->
-    ajax.defineFixture '/api/v1/courses/1/spec_models/1?page=1', response: {
+    ajax.defineFixture '/api/v1/courses/1/spec_models/1?page=1', textStatus: 'success', response: {
       id: 1,
       fruit: 'banana'
     }

app/coffeescripts/ember/quizzes/tests/models/progress.spec.coffee

@@ -37,7 +37,7 @@ define [
         # not in the spec...
         adapter = container.lookup 'adapter:progress'
         adapter.ajax = (url, method) ->
-          ajax({ url: url, type: method })
+          ajax.request({ url: url, type: method })
     teardown: ->
       clearTimeout timeout
       run App, 'destroy'
@@ -57,7 +57,6 @@ define [
     ajax.defineFixture '/api/v1/progress/1',
       response: progressFixture(workflow_state: 'completed'),
       jqXHR: {}
-      testStatus: 200
       textStatus: 'success'
 
     run ->
@@ -71,7 +70,6 @@ define [
     ajax.defineFixture '/api/v1/progress/1',
       response: progressFixture(workflow_state: 'failed'),
       jqXHR: {}
-      testStatus: 200
       textStatus: 'success'
 
     run ->