Merge pull request #557 from codecombat/master

Master into production

app/lib/surface/Camera.coffee

@@ -165,7 +165,8 @@ module.exports = class Camera extends CocoClass
       target = {x: newTargetX, y:newTargetY}
     else
       target = @target
-    @zoomTo target, newZoom, 0
+    if not(newZoom >= MAX_ZOOM or newZoom <= Math.max(@minZoom, MIN_ZOOM))
+      @zoomTo target, newZoom, 0
 
   onMouseDown: (e) ->
     return if @dragDisabled

app/lib/surface/RegionChooser.coffee

@@ -7,7 +7,6 @@ module.exports = class RegionChooser extends CocoClass
     @options.stage.addEventListener 'stagemousedown', @onMouseDown
     @options.stage.addEventListener 'stagemousemove', @onMouseMove
     @options.stage.addEventListener 'stagemouseup', @onMouseUp
-    @options.camera.dragDisabled = true
 
   destroy: ->
     @options.stage.removeEventListener 'stagemousedown', @onMouseDown
@@ -18,6 +17,7 @@ module.exports = class RegionChooser extends CocoClass
   onMouseDown: (e) =>
     return unless key.shift
     @firstPoint = @options.camera.canvasToWorld {x: e.stageX, y: e.stageY}
+    @options.camera.dragDisabled = true
 
   onMouseMove: (e) =>
     return unless @firstPoint
@@ -30,6 +30,7 @@ module.exports = class RegionChooser extends CocoClass
     Backbone.Mediator.publish 'choose-region', points: [@firstPoint, @secondPoint]
     @firstPoint = null
     @secondPoint = null
+    @options.camera.dragDisabled = false
 
   restrictRegion: ->
     RATIO = 1.56876  # 924 / 589

app/views/admin_view.coffee

@@ -29,7 +29,8 @@ module.exports = class AdminView extends View
   espionageSuccess: (model) ->
     storage.save('whoami',model)
     window.location.reload()
+    
   espionageFailure: (jqxhr, status,error)->
     console.log "There was an error entering espionage mode: #{error}"
     
-    
+    

app/views/editor/level/thangs_tab_view.coffee

@@ -146,7 +146,6 @@ module.exports = class ThangsTabView extends View
     @surface.playing = false
     @surface.setWorld @world
     @surface.camera.zoomTo({x:262, y:-164}, 1.66, 0)
-    @surface.camera.dragDisabled = true
 
   destroy: ->
     @selectAddThangType null
@@ -168,6 +167,7 @@ module.exports = class ThangsTabView extends View
 
   onSpriteDragged: (e) ->
     return unless @selectedExtantThang and e.thang?.id is @selectedExtantThang?.id
+    @surface.camera.dragDisabled = true
     {stageX, stageY} = e.originalEvent
     wop = @surface.camera.canvasToWorld x: stageX, y: stageY
     wop.z = @selectedExtantThang.depth / 2
@@ -178,6 +178,7 @@ module.exports = class ThangsTabView extends View
   onSpriteMouseUp: (e) ->
     clearInterval(@movementInterval) if @movementInterval?
     @movementInterval = null
+    @surface.camera.dragDisabled = false
     return unless @selectedExtantThang and e.thang?.id is @selectedExtantThang?.id
     pos = @selectedExtantThang.pos
     physicalOriginal = componentOriginals["physics.Physical"]

app/views/play/ladder/my_matches_tab.coffee

@@ -102,7 +102,7 @@ module.exports = class MyMatchesTabView extends CocoView
     @$el.find('.rank-button').each (i, el) =>
       button = $(el)
       sessionID = button.data('session-id')
-      session = _.find @sessions.models, { id: sessionID }
+      session = _.find @sessions.models, {id: sessionID}
       rankingState = 'unavailable'
       if @readyToRank session
         rankingState = 'rank'
@@ -119,14 +119,14 @@ module.exports = class MyMatchesTabView extends CocoView
   rankSession: (e) ->
     button = $(e.target).closest('.rank-button')
     sessionID = button.data('session-id')
-    session = _.find @sessions.models, { id: sessionID }
+    session = _.find @sessions.models, {id: sessionID}
     return unless @readyToRank(session)
 
     @setRankingButtonText(button, 'submitting')
     success = => @setRankingButtonText(button, 'submitted')
     failure = => @setRankingButtonText(button, 'failed')
 
-    ajaxData = { session: sessionID, levelID: @level.id, originalLevelID: @level.attributes.original, levelMajorVersion: @level.attributes.version.major }
+    ajaxData = {session: sessionID, levelID: @level.id, originalLevelID: @level.attributes.original, levelMajorVersion: @level.attributes.version.major}
     console.log "Posting game for ranking from My Matches view."
     $.ajax '/queue/scoring', {
       type: 'POST'

app/views/play/spectate_view.coffee

@@ -458,10 +458,6 @@ module.exports = class SpectateLevelView extends View
         else
           cb(null, $.parseJSON(jqxhr.responseText))
 
-
-
-
-
   destroy: ()->
     @supermodel?.off 'error', @onLevelLoadError
     @levelLoader?.off 'loaded-all', @onLevelLoaderLoaded

server/commons/queue.coffee

@@ -185,7 +185,8 @@ class MongoQueue extends events.EventEmitter
   subscribe: (eventName, callback) -> @on eventName, callback
   unsubscribe: (eventName, callback) -> @removeListener eventName, callback
 
-
+  totalMessagesInQueue: (callback) -> @Message.count {}, callback
+    
   receiveMessage: (callback) ->
     conditions =
       queue: @queueName

server/queues/scoring.coffee

@@ -24,6 +24,17 @@ connectToScoringQueue = ->
       if error? then throw new Error  "There was an error registering the scoring queue: #{error}"
       scoringTaskQueue = data
       log.info "Connected to scoring task queue!"
+      
+module.exports.messagesInQueueCount = (req, res) ->
+  scoringTaskQueue.totalMessagesInQueue (err, count) ->
+    if err? then return errors.serverError res, "There was an issue finding the Mongoose count:#{err}"
+    response = 
+      point:
+        number: count
+        timestamp: Date.now()
+    res.send(response)
+    res.end()
+
 
 module.exports.addPairwiseTaskToQueueFromRequest = (req, res) ->
   taskPair = req.body.sessions

server/routes/queue.coffee

@@ -9,6 +9,11 @@ module.exports.setup = (app) ->
   #app.post '/queue/scoring/pairwise', (req, res) ->
   #  handler = loadQueueHandler 'scoring'
   #  handler.addPairwiseTaskToQueue req, res
+  
+  app.get '/queue/messagesInQueueCount', (req, res) ->
+    handler = loadQueueHandler 'scoring'
+    handler.messagesInQueueCount req, res
+    
     
   app.all '/queue/*', (req, res) ->
     setResponseHeaderToJSONContentType res

server_setup.coffee

@@ -20,7 +20,7 @@ config = require './server_config'
 #      self.emit('pass',message)
 #    next()
 
-productionLogging = (tokens, req, res)->
+productionLogging = (tokens, req, res) ->
   status = res.statusCode
   color = 32
   if status >= 500 then color = 31